diff --git a/.coveragerc b/.coveragerc new file mode 100644 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,33 @@ +[run] +omit = + # the bin scripts are not part of the Kallithea web app + kallithea/bin/* + # we ship with no active extensions + kallithea/config/rcextensions/* + # dbmigrate is not a part of the Kallithea web app + kallithea/lib/dbmigrate/* + # the tests themselves should not be part of the coverage report + kallithea/tests/* + # the scm hooks are not run in the kallithea process + kallithea/config/post_receive_tmpl.py + kallithea/config/pre_receive_tmpl.py + +# same omit lines should be present in sections 'run' and 'report' +[report] +omit = + # the bin scripts are not part of the Kallithea web app + kallithea/bin/* + # we ship with no active extensions + kallithea/config/rcextensions/* + # dbmigrate is not a part of the Kallithea web app + kallithea/lib/dbmigrate/* + # the tests themselves should not be part of the coverage report + kallithea/tests/* + # the scm hooks are not run in the kallithea process + kallithea/config/post_receive_tmpl.py + kallithea/config/pre_receive_tmpl.py + +[paths] +source = + kallithea/ + **/workspace/*/kallithea diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -16,12 +16,31 @@ syntax: regexp ^docs/build/ ^docs/_build/ ^data$ -^kallithea/tests/data$ ^sql_dumps/ ^\.settings$ ^\.project$ ^\.pydevproject$ ^\.coverage$ +^kallithea/front-end/node_modules$ +^kallithea/front-end/package-lock\.json$ +^kallithea/front-end/tmp$ +^kallithea/public/codemirror$ +^kallithea/public/css/select2-spinner\.gif$ +^kallithea/public/css/select2\.png$ +^kallithea/public/css/select2x2\.png$ +^kallithea/public/css/style\.css$ +^kallithea/public/css/style\.css\.map$ +^kallithea/public/js/bootstrap\.js$ +^kallithea/public/js/dataTables\.bootstrap\.js$ +^kallithea/public/js/jquery\.atwho\.min\.js$ +^kallithea/public/js/jquery\.caret\.min\.js$ +^kallithea/public/js/jquery\.dataTables\.js$ +^kallithea/public/js/jquery\.flot\.js$ +^kallithea/public/js/jquery\.flot\.selection\.js$ +^kallithea/public/js/jquery\.flot\.time\.js$ +^kallithea/public/js/jquery\.min\.js$ +^kallithea/public/js/select2\.js$ +^theme\.less$ ^kallithea\.db$ ^test\.db$ ^Kallithea\.egg-info$ @@ -29,3 +48,5 @@ syntax: regexp ^fabfile.py ^\.idea$ ^\.cache$ +^\.pytest_cache$ +/__pycache__$ diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -69,3 +69,5 @@ cf635c823ea059cc3a1581b82d8672e46b682384 4cca4cc6a0a97f4c4763317184cd41aca4297630 0.3.5 082c9b8f0f17bd34740eb90c69bdc4c80d4b5b31 0.3.6 a18445b85d407294da0b7f1d8be3bedef5ffdea6 0.3.7 +8db761c407685e7b08b800c947890035b0d67025 0.4.0rc1 +60f726162fd6c515bd819feb423be73cad01d7d3 0.4.0rc2 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 --- a/.travis.yml +++ /dev/null @@ -1,41 +0,0 @@ -language: python -python: - - "2.6" - - "2.7" - -env: - - TEST_DB=sqlite:////tmp/kallithea_test.sqlite - - TEST_DB=mysql://root@127.0.0.1/kallithea_test - - TEST_DB=postgresql://postgres@127.0.0.1/kallithea_test - -services: - - mysql - - postgresql - -# command to install dependencies -before_script: - - mysql -e 'create database kallithea_test;' - - psql -c 'create database kallithea_test;' -U postgres - - git --version - -before_install: - - sudo apt-get remove git - - sudo add-apt-repository ppa:pdoes/ppa -y - - sudo apt-get update -y - - sudo apt-get install git -y - -install: - - pip install mysql-python psycopg2 mock unittest2 - - pip install . --use-mirrors - -# command to run tests -script: nosetests - -notifications: - email: - - ci@kallithea-scm.org - irc: "irc.freenode.org#kallithea" - -branches: - only: - - master diff --git a/CONTRIBUTORS b/CONTRIBUTORS --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,28 +1,51 @@ List of contributors to Kallithea project: + Andrej Shadura 2012 2014-2017 2019 Thomas De Schampheleire 2014-2019 + Étienne Gilli 2015-2017 2019 Mads Kiilerich 2016-2019 + Allan Nordhøy 2017-2019 + Danni Randeris 2019 + Edmund Wong 2019 + Manuel Jacob 2019 + Dominik Ruf 2012 2014-2018 Michal Čihař 2014-2015 2018 Branko Majic 2015 2018 + Chris Rule 2018 + Jesús Sánchez 2018 + Patrick Vane 2018 + Pheng Heong Tan 2018 ssantos 2018 Максим Якимчук 2018 Марс Ямбар 2018 Mads Kiilerich 2012-2017 Unity Technologies 2012-2017 - Andrew Shadura 2012 2014-2017 - Dominik Ruf 2012 2014 2016-2017 - Étienne Gilli 2015 2017 + Søren Løvborg 2015-2017 Sam Jaques 2015 2017 - Allan Nordhøy 2017 + Asterios Dimitriou 2016-2017 + Alessandro Molina 2017 + Anton Schur 2017 Ching-Chen Mao 2017 + Eivind Tagseth 2017 FUJIWARA Katsunori 2017 + Holger Schramm 2017 + Karl Goetz 2017 + Lars Kruse 2017 + Marko Semet 2017 Viktar Vauchkevich 2017 Takumi IINO 2012-2016 - Søren Løvborg 2015-2016 + Jan Heylen 2015-2016 + Robert Martinez 2015-2016 + Robert Rauch 2015-2016 + Angel Ezquerra 2016 Anton Shestakov 2016 Brandon Jones 2016 + Kateryna Musina 2016 Konstantin Veretennicov 2016 + Oscar Curero 2016 Robert James Dennington 2016 + timeless@gmail.com 2016 + YFdyh000 2016 Aras Pranckevičius 2012-2013 2015 Sean Farley 2013-2015 Christian Oyarzun 2014-2015 @@ -37,7 +60,7 @@ List of contributors to Kallithea projec duanhongyi 2015 EriCSN Chang 2015 Grzegorz Krason 2015 - Jan Heylen 2015 + Jiří Suchan 2015 Kazunari Kobayashi 2015 Kevin Bullock 2015 kobanari 2015 @@ -50,11 +73,10 @@ List of contributors to Kallithea projec Nick High 2015 Niemand Jedermann 2015 Peter Vitt 2015 - Robert Martinez 2015 - Robert Rauch 2015 Ronny Pfannschmidt 2015 Tuux 2015 Viktar Palstsiuk 2015 + Ante Ilic 2014 Bradley M. Kuhn 2014 Calinou 2014 Daniel Anderson 2014 diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,212 @@ +def createvirtualenv = '' +def activatevirtualenv = '' + +node { + properties([[$class: 'BuildDiscarderProperty', + strategy: [$class: 'LogRotator', + artifactDaysToKeepStr: '', + artifactNumToKeepStr: '10', + daysToKeepStr: '', + numToKeepStr: '']]]); + if (isUnix()) { + createvirtualenv = 'rm -r $JENKINS_HOME/venv/$JOB_NAME || true && virtualenv $JENKINS_HOME/venv/$JOB_NAME' + activatevirtualenv = '. $JENKINS_HOME/venv/$JOB_NAME/bin/activate' + } else { + createvirtualenv = 'rmdir /s /q %JENKINS_HOME%\\venv\\%JOB_NAME% || true && virtualenv %JENKINS_HOME%\\venv\\%JOB_NAME%' + activatevirtualenv = 'call %JENKINS_HOME%\\venv\\%JOB_NAME%\\Scripts\\activate.bat' + } + + stage('checkout') { + checkout scm + if (isUnix()) { + sh 'hg --config extensions.purge= purge --all' + } else { + bat 'hg --config extensions.purge= purge --all' + } + } + stage('virtual env') { + def virtualenvscript = """$createvirtualenv + $activatevirtualenv + python -m pip install --upgrade pip + pip install --upgrade setuptools + pip install --upgrade pylint + pip install --upgrade pytest-cov + """ + if (isUnix()) { + virtualenvscript += """ + pip install --upgrade python-ldap + pip install --upgrade python-pam + """ + sh virtualenvscript + } else { + bat virtualenvscript + } + } + stage('setup') { + def virtualenvscript = """$activatevirtualenv + pip install --upgrade -e . + pip install -r dev_requirements.txt + python setup.py compile_catalog + """ + if (isUnix()) { + sh virtualenvscript + } else { + bat virtualenvscript + } + stash name: 'kallithea', useDefaultExcludes: false + } + stage('pylint') { + sh script: """$activatevirtualenv + pylint -j 0 --disable=C -f parseable kallithea > pylint.out + """, returnStatus: true + archiveArtifacts 'pylint.out' + try { + step([$class: 'WarningsPublisher', canComputeNew: false, canResolveRelativePaths: false, defaultEncoding: '', excludePattern: '', healthy: '', includePattern: '', messagesPattern: '', parserConfigurations: [[parserName: 'PyLint', pattern: 'pylint.out']], unHealthy: '']) + } catch (java.lang.IllegalArgumentException exc) { + echo "You need to install the 'Warnings Plug-in' to display the pylint report." + currentBuild.result = 'UNSTABLE' + echo "Caught: ${exc}" + } + } +} + +def pytests = [:] +pytests['sqlite'] = { + node { + ws { + deleteDir() + unstash name: 'kallithea' + if (isUnix()) { + sh script: """$activatevirtualenv + py.test -p no:sugar --cov-config .coveragerc --junit-xml=pytest_sqlite.xml --cov=kallithea + """, returnStatus: true + } else { + bat script: """$activatevirtualenv + py.test -p no:sugar --cov-config .coveragerc --junit-xml=pytest_sqlite.xml --cov=kallithea + """, returnStatus: true + } + sh 'sed --in-place "s/\\(classname=[\'\\"]\\)/\\1SQLITE./g" pytest_sqlite.xml' + archiveArtifacts 'pytest_sqlite.xml' + junit 'pytest_sqlite.xml' + writeFile(file: '.coverage.sqlite', text: readFile('.coverage')) + stash name: 'coverage.sqlite', includes: '.coverage.sqlite' + } + } +} + +pytests['de'] = { + node { + if (isUnix()) { + ws { + deleteDir() + unstash name: 'kallithea' + withEnv(['LANG=de_DE.UTF-8', + 'LANGUAGE=de', + 'LC_ADDRESS=de_DE.UTF-8', + 'LC_IDENTIFICATION=de_DE.UTF-8', + 'LC_MEASUREMENT=de_DE.UTF-8', + 'LC_MONETARY=de_DE.UTF-8', + 'LC_NAME=de_DE.UTF-8', + 'LC_NUMERIC=de_DE.UTF-8', + 'LC_PAPER=de_DE.UTF-8', + 'LC_TELEPHONE=de_DE.UTF-8', + 'LC_TIME=de_DE.UTF-8', + ]) { + sh script: """$activatevirtualenv + py.test -p no:sugar --cov-config .coveragerc --junit-xml=pytest_de.xml --cov=kallithea + """, returnStatus: true + } + sh 'sed --in-place "s/\\(classname=[\'\\"]\\)/\\1DE./g" pytest_de.xml' + archiveArtifacts 'pytest_de.xml' + junit 'pytest_de.xml' + writeFile(file: '.coverage.de', text: readFile('.coverage')) + stash name: 'coverage.de', includes: '.coverage.de' + } + } + } +} +pytests['mysql'] = { + node { + if (isUnix()) { + ws { + deleteDir() + unstash name: 'kallithea' + sh """$activatevirtualenv + pip install --upgrade MySQL-python + """ + withEnv(['TEST_DB=mysql://kallithea:kallithea@jenkins_mysql/kallithea_test?charset=utf8']) { + if (isUnix()) { + sh script: """$activatevirtualenv + py.test -p no:sugar --cov-config .coveragerc --junit-xml=pytest_mysql.xml --cov=kallithea + """, returnStatus: true + } else { + bat script: """$activatevirtualenv + py.test -p no:sugar --cov-config .coveragerc --junit-xml=pytest_mysql.xml --cov=kallithea + """, returnStatus: true + } + } + sh 'sed --in-place "s/\\(classname=[\'\\"]\\)/\\1MYSQL./g" pytest_mysql.xml' + archiveArtifacts 'pytest_mysql.xml' + junit 'pytest_mysql.xml' + writeFile(file: '.coverage.mysql', text: readFile('.coverage')) + stash name: 'coverage.mysql', includes: '.coverage.mysql' + } + } + } +} +pytests['postgresql'] = { + node { + if (isUnix()) { + ws { + deleteDir() + unstash name: 'kallithea' + sh """$activatevirtualenv + pip install --upgrade psycopg2 + """ + withEnv(['TEST_DB=postgresql://kallithea:kallithea@jenkins_postgresql/kallithea_test']) { + if (isUnix()) { + sh script: """$activatevirtualenv + py.test -p no:sugar --cov-config .coveragerc --junit-xml=pytest_postgresql.xml --cov=kallithea + """, returnStatus: true + } else { + bat script: """$activatevirtualenv + py.test -p no:sugar --cov-config .coveragerc --junit-xml=pytest_postgresql.xml --cov=kallithea + """, returnStatus: true + } + } + sh 'sed --in-place "s/\\(classname=[\'\\"]\\)/\\1POSTGRES./g" pytest_postgresql.xml' + archiveArtifacts 'pytest_postgresql.xml' + junit 'pytest_postgresql.xml' + writeFile(file: '.coverage.postgresql', text: readFile('.coverage')) + stash name: 'coverage.postgresql', includes: '.coverage.postgresql' + } + } + } +} +stage('Tests') { + parallel pytests + node { + unstash 'coverage.sqlite' + unstash 'coverage.de' + unstash 'coverage.mysql' + unstash 'coverage.postgresql' + if (isUnix()) { + sh script: """$activatevirtualenv + coverage combine .coverage.sqlite .coverage.de .coverage.mysql .coverage.postgresql + coverage xml + """, returnStatus: true + } else { + bat script: """$activatevirtualenv + coverage combine .coverage.sqlite .coverage.de .coverage.mysql .coverage.postgresql + coverage xml + """, returnStatus: true + } + try { + step([$class: 'CoberturaPublisher', autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'coverage.xml', failNoReports: false, failUnhealthy: false, failUnstable: false, maxNumberOfBuilds: 0, onlyStable: false, zoomCoverageChart: false]) + } catch (java.lang.IllegalArgumentException exc) { + echo "You need to install the pipeline compatible 'CoberturaPublisher Plug-in' to display the coverage report." + currentBuild.result = 'UNSTABLE' + echo "Caught: ${exc}" + } + } +} diff --git a/LICENSE.md b/LICENSE.md --- a/LICENSE.md +++ b/LICENSE.md @@ -22,27 +22,39 @@ Various third-party code under GPLv3-com of Kallithea. +Alembic +------- + +Kallithea incorporates an [Alembic](http://alembic.zzzcomputing.com/en/latest/) +"migration environment" in `kallithea/alembic`, portions of which is: + +Copyright © 2009-2016 by Michael Bayer. +Alembic is a trademark of Michael Bayer. + +and licensed under the MIT-permissive license, which is +[included in this distribution](MIT-Permissive-License.txt). + Bootstrap --------- -Kallithea incorporates parts of the Javascript system called +Kallithea uses the web framework called [Bootstrap](http://getbootstrap.com/), which is: -Copyright © 2012 Twitter, Inc. +Copyright © 2011-2016 Twitter, Inc. -and licensed under -[the Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). +and licensed under the MIT-permissive license, which is +[included in this distribution](MIT-Permissive-License.txt). -A copy of the Apache License 2.0 is also included in this distribution in its -entirety in the file Apache-License-2.0.txt +It is not distributed with Kallithea, but will be downloaded +using the ''kallithea-cli front-end-build'' command. Codemirror ---------- -Kallithea incorporates parts of the Javascript system called +Kallithea uses the Javascript system called [Codemirror](http://codemirror.net/), version 4.7.0, which is primarily: Copyright © 2013-2014 by Marijn Haverbeke @@ -51,40 +63,70 @@ and licensed under the MIT-permissive li [included in this distribution](MIT-Permissive-License.txt). Additional files from upstream Codemirror are copyrighted by various authors -and licensed under other permissive licenses. The sub-directories under -[.../public/codemirror](kallithea/public/codemirror) include the copyright and -license notice and information as they appeared in Codemirror's upstream -release. +and licensed under other permissive licenses. + +It is not distributed with Kallithea, but will be downloaded +using the ''kallithea-cli front-end-build'' command. jQuery ------ -Kallithea incorporates the Javascript system called -[jQuery](http://jquery.org/), -[herein](kallithea/public/js/jquery-1.11.1.min.js), and the Corresponding -Source can be found in https://github.com/jquery/jquery at tag 1.11.1 -(mirrored at https://kallithea-scm.org/repos/mirror/jquery/files/1.11.1/ ). +Kallithea uses the Javascript system called +[jQuery](http://jquery.org/). It is Copyright 2013 jQuery Foundation and other contributors http://jquery.com/ and is under an [MIT-permissive license](MIT-Permissive-License.txt). +It is not distributed with Kallithea, but will be downloaded +using the ''kallithea-cli front-end-build'' command. + + + +At.js +----- + +Kallithea uses the Javascript system called +[At.js](http://ichord.github.com/At.js), +which can be found together with its Corresponding Source in +https://github.com/ichord/At.js at tag v1.5.4. + +It is Copyright 2013 chord.luo@gmail.com and is under an +[MIT-permissive license](MIT-Permissive-License.txt). + +It is not distributed with Kallithea, but will be downloaded +using the ''kallithea-cli front-end-build'' command. + -Mousetrap ---------- +Caret.js +-------- -Kallithea incorporates parts of the Javascript system called -[Mousetrap](http://craig.is/killing/mice/), which is: +Kallithea uses the Javascript system called +[Caret.js](http://ichord.github.com/Caret.js/), +which can be found together with its Corresponding Source in +https://github.com/ichord/Caret.js at tag v0.3.1. + +It is Copyright 2013 chord.luo@gmail.com and is under an +[MIT-permissive license](MIT-Permissive-License.txt). + +It is not distributed with Kallithea, but will be downloaded +using the ''kallithea-cli front-end-build'' command. - Copyright 2013 Craig Campbell + + +DataTables +---------- -and licensed under -[the Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). +Kallithea uses the Javascript system called +[DataTables](http://www.datatables.net/). -A [copy of the Apache License 2.0](Apache-License-2.0.txt) is also included -in this distribution. +It is Copyright 2008-2015 SpryMedia Ltd. and is under an +[MIT-permissive license](MIT-Permissive-License.txt). + +It is not distributed with Kallithea, but will be downloaded +using the ''kallithea-cli front-end-build'' command. @@ -103,7 +145,7 @@ tri-license. Select2 ------- -Kallithea incorporates parts of the Javascript system called +Kallithea uses the Javascript system called [Select2](http://ivaynberg.github.io/select2/), which is: Copyright 2012 Igor Vaynberg (and probably others) @@ -122,12 +164,15 @@ in this distribution. Kallithea will take the Apache license fork of the dual license, since Kallithea is GPLv3'd. +It is not distributed with Kallithea, but will be downloaded +using the ''kallithea-cli front-end-build'' command. + Select2-Bootstrap-CSS --------------------- -Kallithea incorporates some CSS from a system called +Kallithea uses some CSS from a system called [Select2-bootstrap-css](https://github.com/t0m/select2-bootstrap-css), which is: @@ -136,122 +181,43 @@ Copyright © 2013 Tom Terrace (and l and licensed under the MIT-permissive license, which is [included in this distribution](MIT-Permissive-License.txt). - - -History.js ----------- - -Kallithea incorporates some CSS from a system called History.js, which is - -Copyright 2010-2011 Benjamin Arthur Lupton - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - - -YUI ---- - -Kallithea incorporates parts of the Javascript system called -[YUI 2 — Yahoo! User Interface Library](http://yui.github.io/yui2/docs/yui_2.9.0_full/), -which is made available under the [BSD License](http://yuilibrary.com/license/): - -Copyright © 2013 Yahoo! Inc. All rights reserved. - -Redistribution and use of this software in source and binary forms, with or -without modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* Neither the name of Yahoo! Inc. nor the names of YUI's contributors may be - used to endorse or promote products derived from this software without - specific prior written permission of Yahoo! Inc. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -Kallithea includes a minified version of YUI 2.9. To build yui.2.9.js: - - git clone https://github.com/yui/builder - git clone https://github.com/yui/yui2 - cd yui2/ - git checkout hudson-yui2-2800 - ln -sf JumpToPageDropDown.js src/paginator/js/JumpToPageDropdown.js # work around inconsistent casing - rm -f tmp.js - for m in yahoo event dom connection animation dragdrop element datasource autocomplete container event-delegate json datatable paginator; do - rm -f build/\$m/\$m.js - ( cd src/\$m && ant build deploybuild ) && sed -e 's,@VERSION@,2.9.0,g' -e 's,@BUILD@,2800,g' build/\$m/\$m.js >> tmp.js - done - java -jar ../builder/componentbuild/lib/yuicompressor/yuicompressor-2.4.4.jar tmp.js -o yui.2.9.js - -In compliance with GPLv3 the Corresponding Source for this Object Code is made -available on -[https://kallithea-scm.org/repos/mirror](https://kallithea-scm.org/repos/mirror). +It is not distributed with Kallithea, but will be downloaded +using the ''kallithea-cli front-end-build'' command. Flot ---- -Kallithea incorporates some CSS from a system called -[Flot](http://code.google.com/p/flot/), which is: +Kallithea uses some parts of a Javascript system called +[Flot](http://www.flotcharts.org/), which is: -Copyright 2006 Google Inc. +Copyright (c) 2007-2014 IOLA and Ole Laursen -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. - -A [copy of the Apache License 2.0](Apache-License-2.0.txt) is also included -in this distribution. - +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: - -Migrate -------- +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. -Kallithea incorporates in kallithea/lib/dbmigrate/migrate parts of the Python -system called [Migrate or sqlalchemy-migrate](https://github.com/stackforge/sqlalchemy-migrate), -which is: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. -Copyright (c) 2009 Evan Rosson, Jan Dittberner, Domen Kožar +It is not distributed with Kallithea, but will be downloaded +using the ''kallithea-cli front-end-build'' command. -and licensed under the MIT-permissive license, which is -[included in this distribution](MIT-Permissive-License.txt). Icon fonts @@ -261,7 +227,7 @@ Kallithea incorporates subsets of both [Font Awesome](http://fontawesome.io) and [GitHub Octicons](https://octicons.github.com) for icons. Font Awesome is: -Copyright (c) 2012, Dave Gandy +Copyright (c) 2016, Dave Gandy Octicons is: diff --git a/MANIFEST.in b/MANIFEST.in --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,21 +1,29 @@ +include .coveragerc include Apache-License-2.0.txt include CONTRIBUTORS include COPYING +include Jenkinsfile include LICENSE-MERGELY.html include LICENSE.md include MIT-Permissive-License.txt include README.rst +include dev_requirements.txt include development.ini +include pytest.ini +include requirements.txt +include tox.ini recursive-include docs * recursive-include init.d * +recursive-include kallithea/alembic * include kallithea/bin/ldap_sync.conf -include kallithea/bin/template.ini.mako -include kallithea/config/deployment.ini_tmpl +include kallithea/lib/paster_commands/template.ini.mako +recursive-include kallithea/front-end * recursive-include kallithea/i18n * -recursive-include kallithea/lib/dbmigrate *.py_tmpl README migrate.cfg recursive-include kallithea/public * recursive-include kallithea/templates * recursive-include kallithea/tests/fixtures * recursive-include kallithea/tests/scripts * -include kallithea/tests/test.ini +include kallithea/tests/models/test_dump_html_mails.ref.html +include kallithea/tests/performance/test_vcs.py include kallithea/tests/vcs/aconfig +recursive-include scripts * diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -162,76 +162,14 @@ You can also build the documentation loc install it via the command: ``pip install sphinx`` . -Converting from RhodeCode -------------------------- - -Currently, you have two options for working with an existing RhodeCode -database: - -- keep the database unconverted (intended for testing and evaluation) -- convert the database in a one-time step - -Maintaining interoperability -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Interoperability with RhodeCode 2.2.X installations is provided so you don't -have to immediately commit to switching to Kallithea. This option will most -likely go away once the two projects have diverged significantly. - -To run Kallithea on a RhodeCode database, run:: - - echo "BRAND = 'rhodecode'" > kallithea/brand.py - -This location will depend on where you installed Kallithea. If you installed -via:: - - python2 setup.py install - -then you will find this location at -``$VIRTUAL_ENV/lib/python2.7/site-packages/Kallithea-0.1-py2.7.egg/kallithea``. - -One-time conversion -~~~~~~~~~~~~~~~~~~~ +Migrating from RhodeCode +------------------------ -Alternatively, if you would like to convert the database for good, you can use -a helper script provided by Kallithea. This script will operate directly on the -database, using the database string you can find in your ``production.ini`` (or -``development.ini``) file. For example, if using SQLite:: - - cd /path/to/kallithea - cp /path/to/rhodecode/rhodecode.db kallithea.db - pip install sqlalchemy-migrate - python2 kallithea/bin/rebranddb.py sqlite:///kallithea.db - -.. Note:: - - If you started out using the branding interoperability approach mentioned - above, watch out for stray brand.pyc after removing brand.py. - -Git hooks -~~~~~~~~~ - -After switching to Kallithea, it will be necessary to update the Git_ hooks in -your repositories. If not, the Git_ hooks from RhodeCode will still be called, -which will cause ``git push`` to fail every time. - -If you do not have any custom Git_ hooks deployed, perform the following steps -(this may take some time depending on the number and size of repositories you -have): - -1. Log-in as an administrator. - -2. Open page *Admin > Settings > Remap and Rescan*. - -3. Turn on the option **Install Git Hooks**. - -4. Turn on the option **Overwrite existing Git hooks**. - -5. Click on the button **Rescan Repositories**. - -If you do have custom hooks, you will need to merge those changes manually. In -order to get sample hooks from Kallithea, the easiest way is to create a new Git_ -repository, and have a look at the hooks deployed there. +Kallithea 0.3.2 and earlier supports migrating from an existing RhodeCode +installation. To migrate, install Kallithea 0.3.2 and follow the +instructions in the 0.3.2 README to perform a one-time conversion of the +database from RhodeCode to Kallithea, before upgrading to this version +of Kallithea. .. _virtualenv: http://pypi.python.org/pypi/virtualenv diff --git a/dev_requirements.txt b/dev_requirements.txt new file mode 100644 --- /dev/null +++ b/dev_requirements.txt @@ -0,0 +1,8 @@ +pytest >= 3.3.0, < 3.8 +pytest-runner < 4.3 +pytest-sugar >= 0.7.0, < 0.10 +pytest-benchmark < 3.2 +pytest-localserver < 0.5 +mock < 2.1 +Sphinx < 1.8 +WebTest < 2.1 diff --git a/development.ini b/development.ini --- a/development.ini +++ b/development.ini @@ -1,19 +1,12 @@ ################################################################################ ################################################################################ -# Kallithea - Development config: # -# listening on *:5000 # -# sqlite and kallithea.db # -# initial_repo_scan = true # -# set debug = true # -# verbose and colorful logging # +# Kallithea - config file generated with kallithea-config # # # # The %(here)s variable will be replaced with the parent directory of this file# ################################################################################ ################################################################################ [DEFAULT] -debug = true -pdebug = false ################################################################################ ## Email settings ## @@ -39,43 +32,39 @@ pdebug = false #email_prefix = [Kallithea] ## Recipients for error emails and fallback recipients of application mails. -## Multiple addresses can be specified, space-separated. +## Multiple addresses can be specified, comma-separated. ## Only addresses are allowed, do not add any name part. ## Default: #email_to = ## Examples: #email_to = admin@example.com -#email_to = admin@example.com another_admin@example.com +#email_to = admin@example.com,another_admin@example.com +email_to = ## 'From' header for error emails. You can optionally add a name. -## Default: -#error_email_from = pylons@yourapp.com +## Default: (none) ## Examples: #error_email_from = Kallithea Errors -#error_email_from = paste_error@example.com +#error_email_from = kallithea_errors@example.com +error_email_from = ## SMTP server settings -## Only smtp_server is mandatory. All other settings take the specified default -## values. -#smtp_server = smtp.example.com +## If specifying credentials, make sure to use secure connections. +## Default: Send unencrypted unauthenticated mails to the specified smtp_server. +## For "SSL", use smtp_use_ssl = true and smtp_port = 465. +## For "STARTTLS", use smtp_use_tls = true and smtp_port = 587. +smtp_server = #smtp_username = #smtp_password = -#smtp_port = 25 -#smtp_use_tls = false +smtp_port = #smtp_use_ssl = false -## SMTP authentication parameters to use (e.g. LOGIN PLAIN CRAM-MD5, etc.). -## If empty, use any of the authentication parameters supported by the server. -#smtp_auth = +#smtp_use_tls = false +## Entry point for 'gearbox serve' [server:main] -## PASTE ## -#use = egg:Paste#http -## nr of worker threads to spawn -#threadpool_workers = 1 -## max request before thread respawn -#threadpool_max_requests = 100 -## option to use threads of process -#use_threadpool = true +#host = 127.0.0.1 +host = 0.0.0.0 +port = 5000 ## WAITRESS ## use = egg:waitress#main @@ -87,85 +76,6 @@ max_request_body_size = 107374182400 ## windows systems. #asyncore_use_poll = True -## GUNICORN ## -#use = egg:gunicorn#main -## number of process workers. You must set `instance_id = *` when this option -## is set to more than one worker -#workers = 1 -## process name -#proc_name = kallithea -## type of worker class, one of sync, eventlet, gevent, tornado -## recommended for bigger setup is using of of other than sync one -#worker_class = sync -#max_requests = 1000 -## ammount of time a worker can handle request before it gets killed and -## restarted -#timeout = 3600 - -## UWSGI ## -## run with uwsgi --ini-paste-logged -#[uwsgi] -#socket = /tmp/uwsgi.sock -#master = true -#http = 127.0.0.1:5000 - -## set as deamon and redirect all output to file -#daemonize = ./uwsgi_kallithea.log - -## master process PID -#pidfile = ./uwsgi_kallithea.pid - -## stats server with workers statistics, use uwsgitop -## for monitoring, `uwsgitop 127.0.0.1:1717` -#stats = 127.0.0.1:1717 -#memory-report = true - -## log 5XX errors -#log-5xx = true - -## Set the socket listen queue size. -#listen = 256 - -## Gracefully Reload workers after the specified amount of managed requests -## (avoid memory leaks). -#max-requests = 1000 - -## enable large buffers -#buffer-size = 65535 - -## socket and http timeouts ## -#http-timeout = 3600 -#socket-timeout = 3600 - -## Log requests slower than the specified number of milliseconds. -#log-slow = 10 - -## Exit if no app can be loaded. -#need-app = true - -## Set lazy mode (load apps in workers instead of master). -#lazy = true - -## scaling ## -## set cheaper algorithm to use, if not set default will be used -#cheaper-algo = spare - -## minimum number of workers to keep at all times -#cheaper = 1 - -## number of workers to spawn at startup -#cheaper-initial = 1 - -## maximum number of workers that can be spawned -#workers = 4 - -## how many workers should be spawned at a time -#cheaper-step = 1 - -## COMMON ## -host = 0.0.0.0 -port = 5000 - ## middleware for hosting the WSGI application under a URL prefix #[filter:proxy-prefix] #use = egg:PasteDeploy#prefix @@ -178,29 +88,26 @@ use = egg:kallithea full_stack = true static_files = true -## Available Languages: -## cs de fr hu ja nl_BE pl pt_BR ru sk zh_CN zh_TW -lang = + +## Internationalization (see setup documentation for details) +## By default, the language requested by the browser is used if available. +#i18n.enable = false +## Fallback language, empty for English (valid values are the names of subdirectories in kallithea/i18n): +i18n.lang = + cache_dir = %(here)s/data index_dir = %(here)s/data/index -## perform a full repository scan on each server start, this should be -## set to false after first startup, to allow faster server restarts. -#initial_repo_scan = false -initial_repo_scan = true - ## uncomment and set this path to use archive download cache archive_cache_dir = %(here)s/tarballcache ## change this to unique ID for security +#app_instance_uuid = VERY-SECRET app_instance_uuid = development-not-secret ## cut off limit for large diffs (size in bytes) cut_off_limit = 256000 -## use cache version of scm repo everywhere -vcs_full_cache = true - ## force https in Kallithea, fixes https redirects, assumes it's always https force_https = false @@ -226,6 +133,11 @@ rss_include_diff = false show_sha_length = 12 show_revision_number = false +## Canonical URL to use when creating full URLs in UI and texts. +## Useful when the site is available under different names or protocols. +## Defaults to what is provided in the WSGI environment. +#canonical_url = https://kallithea.example.com/repos + ## gist URL alias, used to create nicer urls for gist. This should be an ## url that does rewrites to _admin/gists/. ## example: http://gist.example.com/{gistid}. Empty means use the internal @@ -245,46 +157,53 @@ api_access_controllers_whitelist = # FilesController:archivefile ## default encoding used to convert from and to unicode -## can be also a comma seperated list of encoding in case of mixed encodings -default_encoding = utf8 +## can be also a comma separated list of encoding in case of mixed encodings +default_encoding = utf-8 + +## Set Mercurial encoding, similar to setting HGENCODING before launching Kallithea +hgencoding = utf-8 ## issue tracker for Kallithea (leave blank to disable, absent for default) #bugtracker = https://bitbucket.org/conservancy/kallithea/issues -## issue tracking mapping for commits messages -## comment out issue_pat, issue_server, issue_prefix to enable +## issue tracking mapping for commit messages, comments, PR descriptions, ... +## Refer to the documentation ("Integration with issue trackers") for more details. -## pattern to get the issues from commit messages -## default one used here is # with a regex passive group for `#` -## {id} will be all groups matched from this pattern +## regular expression to match issue references +## This pattern may/should contain parenthesized groups, that can +## be referred to in issue_server_link or issue_sub using Python backreferences +## (e.g. \1, \2, ...). You can also create named groups with '(?P)'. +## To require mandatory whitespace before the issue pattern, use: +## (?:^|(?<=\s)) before the actual pattern, and for mandatory whitespace +## behind the issue pattern, use (?:$|(?=\s)) after the actual pattern. -issue_pat = (?:\s*#)(\d+) +issue_pat = #(\d+) -## server url to the issue, each {id} will be replaced with match -## fetched from the regex and {repo} is replaced with full repository name -## including groups {repo_name} is replaced with just name of repo - -issue_server_link = https://issues.example.com/{repo}/issue/{id} +## server url to the issue +## This pattern may/should contain backreferences to parenthesized groups in issue_pat. +## A backreference can be \1, \2, ... or \g if you specified a named group +## called 'groupname' in issue_pat. +## The special token {repo} is replaced with the full repository name +## including repository groups, while {repo_name} is replaced with just +## the name of the repository. -## prefix to add to link to indicate it's an url -## #314 will be replaced by +issue_server_link = https://issues.example.com/{repo}/issue/\1 -issue_prefix = # +## substitution pattern to use as the link text +## If issue_sub is empty, the text matched by issue_pat is retained verbatim +## for the link text. Otherwise, the link text is that of issue_sub, with any +## backreferences to groups in issue_pat replaced. -## issue_pat, issue_server_link, issue_prefix can have suffixes to specify +issue_sub = + +## issue_pat, issue_server_link and issue_sub can have suffixes to specify ## multiple patterns, to other issues server, wiki or others ## below an example how to create a wiki pattern # wiki-some-id -> https://wiki.example.com/some-id -#issue_pat_wiki = (?:wiki-)(.+) -#issue_server_link_wiki = https://wiki.example.com/{id} -#issue_prefix_wiki = WIKI- - -## instance-id prefix -## a prefix key for this instance used for cache invalidation when running -## multiple instances of kallithea, make sure it's globally unique for -## all running kallithea instances. Leave empty if you don't use it -instance_id = +#issue_pat_wiki = wiki-(\S+) +#issue_server_link_wiki = https://wiki.example.com/\1 +#issue_sub_wiki = WIKI-\1 ## alternative return HTTP header for failed authentication. Default HTTP ## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with @@ -301,19 +220,29 @@ allow_repo_location_change = True ## allows to setup custom hooks in settings page allow_custom_hooks_settings = True +## extra extensions for indexing, space separated and without the leading '.'. +# index.extensions = +# gemfile +# lock + +## extra filenames for indexing, space separated +# index.filenames = +# .dockerignore +# .editorconfig +# INSTALL +# CHANGELOG + #################################### ### CELERY CONFIG #### #################################### use_celery = false -broker.host = localhost -broker.vhost = rabbitmqhost -broker.port = 5672 -broker.user = rabbitmq -broker.password = qweqwe + +## Example: connect to the virtual host 'rabbitmqhost' on localhost as rabbitmq: +broker.url = amqp://rabbitmq:qewqew@localhost:5672/rabbitmqhost celery.imports = kallithea.lib.celerylib.tasks - +celery.accept.content = pickle celery.result.backend = amqp celery.result.dburi = amqp:// celery.result.serialier = json @@ -322,11 +251,9 @@ celery.result.serialier = json #celery.amqp.task.result.expires = 18000 celeryd.concurrency = 2 -#celeryd.log.file = celeryd.log -celeryd.log.level = DEBUG celeryd.max.tasks.per.child = 1 -## tasks will never be sent to the queue, but executed locally instead. +## If true, tasks will never be sent to the queue, but executed locally instead. celery.always.eager = false #################################### @@ -363,6 +290,7 @@ beaker.session.httponly = true beaker.session.timeout = 2592000 ## Server secret used with HMAC to ensure integrity of cookies. +#beaker.session.secret = VERY-SECRET beaker.session.secret = development-not-secret ## Further, encrypt the data with AES. #beaker.session.encrypt_key = @@ -382,90 +310,13 @@ beaker.session.secret = development-not- #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea #beaker.session.table_name = db_session -############################ -## ERROR HANDLING SYSTEMS ## -############################ - -#################### -### [appenlight] ### -#################### - -## AppEnlight is tailored to work with Kallithea, see -## http://appenlight.com for details how to obtain an account -## you must install python package `appenlight_client` to make it work - -## appenlight enabled -appenlight = false - -appenlight.server_url = https://api.appenlight.com -appenlight.api_key = YOUR_API_KEY - -## TWEAK AMOUNT OF INFO SENT HERE - -## enables 404 error logging (default False) -appenlight.report_404 = false - -## time in seconds after request is considered being slow (default 1) -appenlight.slow_request_time = 1 - -## record slow requests in application -## (needs to be enabled for slow datastore recording and time tracking) -appenlight.slow_requests = true - -## enable hooking to application loggers -#appenlight.logging = true - -## minimum log level for log capture -#appenlight.logging.level = WARNING - -## send logs only from erroneous/slow requests -## (saves API quota for intensive logging) -appenlight.logging_on_error = false - -## list of additonal keywords that should be grabbed from environ object -## can be string with comma separated list of words in lowercase -## (by default client will always send following info: -## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that -## start with HTTP* this list be extended with additional keywords here -appenlight.environ_keys_whitelist = - -## list of keywords that should be blanked from request object -## can be string with comma separated list of words in lowercase -## (by default client will always blank keys that contain following words -## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf' -## this list be extended with additional keywords set here -appenlight.request_keys_blacklist = - -## list of namespaces that should be ignores when gathering log entries -## can be string with comma separated list of namespaces -## (by default the client ignores own entries: appenlight_client.client) -appenlight.log_namespace_blacklist = - -################ -### [sentry] ### -################ - -## sentry is a alternative open source error aggregator -## you must install python packages `sentry` and `raven` to enable - -sentry.dsn = YOUR_DNS -sentry.servers = -sentry.name = -sentry.key = -sentry.public_key = -sentry.secret_key = -sentry.project = -sentry.site = -sentry.include_paths = -sentry.exclude_paths = - ################################################################################ -## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* ## +## WARNING: *DEBUG MODE MUST BE OFF IN A PRODUCTION ENVIRONMENT* ## ## Debug mode will enable the interactive debugging tool, allowing ANYONE to ## ## execute malicious code after an exception is raised. ## ################################################################################ -#set debug = false -set debug = true +#debug = false +debug = true ################################## ### LOGVIEW CONFIG ### @@ -480,26 +331,25 @@ logview.pylons.util = #eee ######################################################### # SQLITE [default] -sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=60 - -# POSTGRESQL -#sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea - -# MySQL -#sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea +sqlalchemy.url = sqlite:///%(here)s/kallithea.db?timeout=60 # see sqlalchemy docs for others -sqlalchemy.db1.echo = false -sqlalchemy.db1.pool_recycle = 3600 -sqlalchemy.db1.convert_unicode = true +sqlalchemy.pool_recycle = 3600 + +################################ +### ALEMBIC CONFIGURATION #### +################################ + +[alembic] +script_location = kallithea:alembic ################################ ### LOGGING CONFIGURATION #### ################################ [loggers] -keys = root, routes, kallithea, sqlalchemy, beaker, templates, whoosh_indexer +keys = root, routes, kallithea, sqlalchemy, tg, gearbox, beaker, templates, whoosh_indexer, werkzeug, backlash [handlers] keys = console, console_sql @@ -516,6 +366,7 @@ level = NOTSET handlers = console [logger_routes] +#level = WARN level = DEBUG handlers = qualname = routes.middleware @@ -523,35 +374,65 @@ qualname = routes.middleware propagate = 1 [logger_beaker] +#level = WARN level = DEBUG handlers = qualname = beaker.container propagate = 1 [logger_templates] +#level = WARN level = INFO handlers = qualname = pylons.templating propagate = 1 [logger_kallithea] +#level = WARN level = DEBUG handlers = qualname = kallithea propagate = 1 +[logger_tg] +#level = WARN +level = DEBUG +handlers = +qualname = tg +propagate = 1 + +[logger_gearbox] +#level = WARN +level = DEBUG +handlers = +qualname = gearbox +propagate = 1 + [logger_sqlalchemy] -level = INFO +level = WARN handlers = console_sql qualname = sqlalchemy.engine propagate = 0 [logger_whoosh_indexer] +#level = WARN level = DEBUG handlers = qualname = whoosh_indexer propagate = 1 +[logger_werkzeug] +level = WARN +handlers = +qualname = werkzeug +propagate = 1 + +[logger_backlash] +level = WARN +handlers = +qualname = backlash +propagate = 1 + ############## ## HANDLERS ## ############## @@ -559,17 +440,13 @@ propagate = 1 [handler_console] class = StreamHandler args = (sys.stderr,) -#level = INFO #formatter = generic -level = DEBUG formatter = color_formatter [handler_console_sql] class = StreamHandler args = (sys.stderr,) -#level = WARN #formatter = generic -level = DEBUG formatter = color_formatter_sql ################ diff --git a/docs/setup.rst b/docs/administrator_guide/auth.rst copy from docs/setup.rst copy to docs/administrator_guide/auth.rst --- a/docs/setup.rst +++ b/docs/administrator_guide/auth.rst @@ -1,164 +1,18 @@ -.. _setup: - -===== -Setup -===== - - -Setting up Kallithea --------------------- - -First, you will need to create a Kallithea configuration file. Run the -following command to do so:: - - paster make-config Kallithea my.ini - -This will create the file ``my.ini`` in the current directory. This -configuration file contains the various settings for Kallithea, e.g. -proxy port, email settings, usage of static files, cache, Celery -settings, and logging. - -Next, you need to create the databases used by Kallithea. It is recommended to -use PostgreSQL or SQLite (default). If you choose a database other than the -default, ensure you properly adjust the database URL in your ``my.ini`` -configuration file to use this other database. Kallithea currently supports -PostgreSQL, SQLite and MySQL databases. Create the database by running -the following command:: - - paster setup-db my.ini - -This will prompt you for a "root" path. This "root" path is the location where -Kallithea will store all of its repositories on the current machine. After -entering this "root" path ``setup-db`` will also prompt you for a username -and password for the initial admin account which ``setup-db`` sets -up for you. - -The ``setup-db`` values can also be given on the command line. -Example:: - - paster setup-db my.ini --user=nn --password=secret --email=nn@example.com --repos=/srv/repos - -The ``setup-db`` command will create all needed tables and an -admin account. When choosing a root path you can either use a new -empty location, or a location which already contains existing -repositories. If you choose a location which contains existing -repositories Kallithea will add all of the repositories at the chosen -location to its database. (Note: make sure you specify the correct -path to the root). - -.. note:: the given path for Mercurial_ repositories **must** be write - accessible for the application. It's very important since - the Kallithea web interface will work without write access, - but when trying to do a push it will fail with permission - denied errors unless it has write access. - -You are now ready to use Kallithea. To run it simply execute:: - - paster serve my.ini - -- This command runs the Kallithea server. The web app should be available at - http://127.0.0.1:5000. The IP address and port is configurable via the - configuration file created in the previous step. -- Log in to Kallithea using the admin account created when running ``setup-db``. -- The default permissions on each repository is read, and the owner is admin. - Remember to update these if needed. -- In the admin panel you can toggle LDAP, anonymous, and permissions - settings, as well as edit more advanced options on users and - repositories. - - -Extensions ----------- - -Optionally one can create an ``rcextensions`` package that extends Kallithea -functionality. -To generate a skeleton extensions package, run:: - - paster make-rcext my.ini +.. _authentication: -This will create an ``rcextensions`` package next to the specified ``ini`` file. -With ``rcextensions`` it's possible to add additional mapping for whoosh, -stats and add additional code into the push/pull/create/delete repo hooks, -for example for sending signals to build-bots such as Jenkins. - -See the ``__init__.py`` file inside the generated ``rcextensions`` package -for more details. - - -Using Kallithea with SSH ------------------------- - -Kallithea currently only hosts repositories using http and https. (The addition -of ssh hosting is a planned future feature.) However you can easily use ssh in -parallel with Kallithea. (Repository access via ssh is a standard "out of -the box" feature of Mercurial_ and you can use this to access any of the -repositories that Kallithea is hosting. See PublishingRepositories_) - -Kallithea repository structures are kept in directories with the same name -as the project. When using repository groups, each group is a subdirectory. -This allows you to easily use ssh for accessing repositories. - -In order to use ssh you need to make sure that your web server and the users' -login accounts have the correct permissions set on the appropriate directories. - -.. note:: These permissions are independent of any permissions you - have set up using the Kallithea web interface. - -If your main directory (the same as set in Kallithea settings) is for -example set to ``/srv/repos`` and the repository you are using is -named ``kallithea``, then to clone via ssh you should run:: - - hg clone ssh://user@kallithea.example.com/srv/repos/kallithea - -Using other external tools such as mercurial-server_ or using ssh key-based -authentication is fully supported. +==================== +Authentication setup +==================== -.. note:: In an advanced setup, in order for your ssh access to use - the same permissions as set up via the Kallithea web - interface, you can create an authentication hook to connect - to the Kallithea db and run check functions for permissions - against that. - - -Setting up Whoosh full text search ----------------------------------- - -Kallithea provides full text search of repositories using `Whoosh`__. - -.. __: https://whoosh.readthedocs.io/en/latest/ - -For an incremental index build, run:: - - paster make-index my.ini - -For a full index rebuild, run:: - - paster make-index my.ini -f - -The ``--repo-location`` option allows the location of the repositories to be overriden; -usually, the location is retrieved from the Kallithea database. - -The ``--index-only`` option can be used to limit the indexed repositories to a comma-separated list:: - - paster make-index my.ini --index-only=vcs,kallithea - -To keep your index up-to-date it is necessary to do periodic index builds; -for this, it is recommended to use a crontab entry. Example:: - - 0 3 * * * /path/to/virtualenv/bin/paster make-index /path/to/kallithea/my.ini - -When using incremental mode (the default), Whoosh will check the last -modification date of each file and add it to be reindexed if a newer file is -available. The indexing daemon checks for any removed files and removes them -from index. - -If you want to rebuild the index from scratch, you can use the ``-f`` flag as above, -or in the admin panel you can check the "build from scratch" checkbox. +Users can be authenticated in different ways. By default, Kallithea +uses its internal user database. Alternative authentication +methods include LDAP, PAM, Crowd, and container-based authentication. .. _ldap-setup: -Setting up LDAP support ------------------------ + +LDAP Authentication +------------------- Kallithea supports LDAP authentication. In order to use LDAP, you have to install the python-ldap_ package. This package is @@ -178,10 +32,9 @@ Here's a typical LDAP setup:: Connection settings Enable LDAP = checked Host = host.example.com - Port = 389 Account = Password = - Connection Security = LDAPS connection + Connection Security = LDAPS Certificate Checks = DEMAND Search settings @@ -215,8 +68,9 @@ Host : required .. _Port: -Port : required - 389 for un-encrypted LDAP, 636 for SSL-encrypted LDAP. +Port : optional + Defaults to 389 for PLAIN un-encrypted LDAP and START_TLS. + Defaults to 636 for LDAPS. .. _ldap_account: @@ -236,26 +90,27 @@ Password : optional Connection Security : required Defines the connection to LDAP server - No encryption - Plain non encrypted connection + PLAIN + Plain unencrypted LDAP connection. + This will by default use `Port`_ 389. - LDAPS connection - Enable LDAPS connections. It will likely require `Port`_ to be set to - a different value (standard LDAPS port is 636). When LDAPS is enabled - then `Certificate Checks`_ is required. + LDAPS + Use secure LDAPS connections according to `Certificate + Checks`_ configuration. + This will by default use `Port`_ 636. - START_TLS on LDAP connection - START TLS connection + START_TLS + Use START TLS according to `Certificate Checks`_ configuration on an + apparently "plain" LDAP connection. + This will by default use `Port`_ 389. .. _Certificate Checks: Certificate Checks : optional How SSL certificates verification is handled -- this is only useful when `Enable LDAPS`_ is enabled. Only DEMAND or HARD offer full SSL security - while the other options are susceptible to man-in-the-middle attacks. SSL - certificates can be installed to /etc/openldap/cacerts so that the - DEMAND or HARD options can be used with self-signed certificates or - certificates that do not have traceable certificates of authority. + with mandatory certificate validation, while the other options are + susceptible to man-in-the-middle attacks. NEVER A serve certificate will never be requested or checked. @@ -277,6 +132,16 @@ Certificate Checks : optional HARD The same as DEMAND. +.. _Custom CA Certificates: + +Custom CA Certificates : optional + Directory used by OpenSSL to find CAs for validating the LDAP server certificate. + Python 2.7.10 and later default to using the system certificate store, and + this should thus not be necessary when using certificates signed by a CA + trusted by the system. + It can be set to something like `/etc/openldap/cacerts` on older systems or + if using self-signed certificates. + .. _Base DN: Base DN : required @@ -347,7 +212,7 @@ information check out the Kallithea logs will be saved there. Active Directory -'''''''''''''''' +^^^^^^^^^^^^^^^^ Kallithea can use Microsoft Active Directory for user authentication. This is done through an LDAP or LDAPS connection to Active Directory. The @@ -384,24 +249,24 @@ It's also possible for an administrator permissions before the user logs in for the first time, using the :ref:`create-user` API. Container-based authentication -'''''''''''''''''''''''''''''' +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ In a container-based authentication setup, Kallithea reads the user name from the ``REMOTE_USER`` server variable provided by the WSGI container. -After setting up your container (see `Apache with mod_wsgi`_), you'll need +After setting up your container (see :ref:`apache_mod_wsgi`), you'll need to configure it to require authentication on the location configured for Kallithea. Proxy pass-through authentication -''''''''''''''''''''''''''''''''' +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ In a proxy pass-through authentication setup, Kallithea reads the user name from the ``X-Forwarded-User`` request header, which should be configured to be sent by the reverse-proxy server. -After setting up your proxy solution (see `Apache virtual host reverse proxy example`_, -`Apache as subdirectory`_ or `Nginx virtual host example`_), you'll need to +After setting up your proxy solution (see :ref:`apache_virtual_host_reverse_proxy`, +:ref:`apache_subdirectory` or :ref:`nginx_virtual_host`), you'll need to configure the authentication and add the username in a request header named ``X-Forwarded-User``. @@ -428,6 +293,73 @@ reverse-proxy setup with basic auth: RequestHeader set X-Forwarded-User %{RU}e +Setting metadata in container/reverse-proxy +""""""""""""""""""""""""""""""""""""""""""" +When a new user account is created on the first login, Kallithea has no information about +the user's email and full name. So you can set some additional request headers like in the +example below. In this example the user is authenticated via Kerberos and an Apache +mod_python fixup handler is used to get the user information from a LDAP server. But you +could set the request headers however you want. + +.. code-block:: apache + + + ProxyPass http://127.0.0.1:5000/someprefix + ProxyPassReverse http://127.0.0.1:5000/someprefix + SetEnvIf X-Url-Scheme https HTTPS=1 + + AuthName "Kerberos Login" + AuthType Kerberos + Krb5Keytab /etc/apache2/http.keytab + KrbMethodK5Passwd off + KrbVerifyKDC on + Require valid-user + + PythonFixupHandler ldapmetadata + + RequestHeader set X_REMOTE_USER %{X_REMOTE_USER}e + RequestHeader set X_REMOTE_EMAIL %{X_REMOTE_EMAIL}e + RequestHeader set X_REMOTE_FIRSTNAME %{X_REMOTE_FIRSTNAME}e + RequestHeader set X_REMOTE_LASTNAME %{X_REMOTE_LASTNAME}e + + +.. code-block:: python + + from mod_python import apache + import ldap + + LDAP_SERVER = "ldaps://server.mydomain.com:636" + LDAP_USER = "" + LDAP_PASS = "" + LDAP_ROOT = "dc=mydomain,dc=com" + LDAP_FILTER = "sAMAccountName=%s" + LDAP_ATTR_LIST = ['sAMAccountName','givenname','sn','mail'] + + def fixuphandler(req): + if req.user is None: + # no user to search for + return apache.OK + else: + try: + if('\\' in req.user): + username = req.user.split('\\')[1] + elif('@' in req.user): + username = req.user.split('@')[0] + else: + username = req.user + l = ldap.initialize(LDAP_SERVER) + l.simple_bind_s(LDAP_USER, LDAP_PASS) + r = l.search_s(LDAP_ROOT, ldap.SCOPE_SUBTREE, LDAP_FILTER % username, attrlist=LDAP_ATTR_LIST) + + req.subprocess_env['X_REMOTE_USER'] = username + req.subprocess_env['X_REMOTE_EMAIL'] = r[0][1]['mail'][0].lower() + req.subprocess_env['X_REMOTE_FIRSTNAME'] = "%s" % r[0][1]['givenname'][0] + req.subprocess_env['X_REMOTE_LASTNAME'] = "%s" % r[0][1]['sn'][0] + except Exception, e: + apache.log_error("error getting data from ldap %s" % str(e), apache.APLOG_ERR) + + return apache.OK + .. note:: If you enable proxy pass-through authentication, make sure your server is only accessible through the proxy. Otherwise, any client would be able to @@ -435,384 +367,4 @@ reverse-proxy setup with basic auth: using any account of their liking. -Integration with issue trackers -------------------------------- - -Kallithea provides a simple integration with issue trackers. It's possible -to define a regular expression that will match an issue ID in commit messages, -and have that replaced with a URL to the issue. To enable this simply -uncomment the following variables in the ini file:: - - issue_pat = (?:^#|\s#)(\w+) - issue_server_link = https://issues.example.com/{repo}/issue/{id} - issue_prefix = # - -``issue_pat`` is the regular expression describing which strings in -commit messages will be treated as issue references. A match group in -parentheses should be used to specify the actual issue id. - -The default expression matches issues in the format ``#``, e.g., ``#300``. - -Matched issue references are replaced with the link specified in -``issue_server_link``. ``{id}`` is replaced with the issue ID, and -``{repo}`` with the repository name. Since the # is stripped away, -``issue_prefix`` is prepended to the link text. ``issue_prefix`` doesn't -necessarily need to be ``#``: if you set issue prefix to ``ISSUE-`` this will -generate a URL in the format: - -.. code-block:: html - - ISSUE-300 - -If needed, more than one pattern can be specified by appending a unique suffix to -the variables. For example:: - - issue_pat_wiki = (?:wiki-)(.+) - issue_server_link_wiki = https://wiki.example.com/{id} - issue_prefix_wiki = WIKI- - -With these settings, wiki pages can be referenced as wiki-some-id, and every -such reference will be transformed into: - -.. code-block:: html - - WIKI-some-id - - -Hook management ---------------- - -Hooks can be managed in similar way to that used in ``.hgrc`` files. -To manage hooks, choose *Admin > Settings > Hooks*. - -The built-in hooks cannot be modified, though they can be enabled or disabled in the *VCS* section. - -To add another custom hook simply fill in the first textbox with -``.`` and the second with the hook path. Example hooks -can be found in ``kallithea.lib.hooks``. - - -Changing default encoding -------------------------- - -By default, Kallithea uses UTF-8 encoding. -This is configurable as ``default_encoding`` in the .ini file. -This affects many parts in Kallithea including user names, filenames, and -encoding of commit messages. In addition Kallithea can detect if the ``chardet`` -library is installed. If ``chardet`` is detected Kallithea will fallback to it -when there are encode/decode errors. - - -Celery configuration --------------------- - -Kallithea can use the distributed task queue system Celery_ to run tasks like -cloning repositories or sending emails. - -Kallithea will in most setups work perfectly fine out of the box (without -Celery), executing all tasks in the web server process. Some tasks can however -take some time to run and it can be better to run such tasks asynchronously in -a separate process so the web server can focus on serving web requests. - -For installation and configuration of Celery, see the `Celery documentation`_. -Note that Celery requires a message broker service like RabbitMQ_ (recommended) -or Redis_. - -The use of Celery is configured in the Kallithea ini configuration file. -To enable it, simply set:: - - use_celery = true - -and add or change the ``celery.*`` and ``broker.*`` configuration variables. - -Remember that the ini files use the format with '.' and not with '_' like -Celery. So for example setting `BROKER_HOST` in Celery means setting -`broker.host` in the configuration file. - -To start the Celery process, run:: - - paster celeryd - -.. note:: - Make sure you run this command from the same virtualenv, and with the same - user that Kallithea runs. - - -HTTPS support -------------- - -Kallithea will by default generate URLs based on the WSGI environment. - -Alternatively, you can use some special configuration settings to control -directly which scheme/protocol Kallithea will use when generating URLs: - -- With ``https_fixup = true``, the scheme will be taken from the - ``X-Url-Scheme``, ``X-Forwarded-Scheme`` or ``X-Forwarded-Proto`` HTTP header - (default ``http``). -- With ``force_https = true`` the default will be ``https``. -- With ``use_htsts = true``, Kallithea will set ``Strict-Transport-Security`` when using https. - - -Nginx virtual host example --------------------------- - -Sample config for Nginx using proxy: - -.. code-block:: nginx - - upstream kallithea { - server 127.0.0.1:5000; - # add more instances for load balancing - #server 127.0.0.1:5001; - #server 127.0.0.1:5002; - } - - ## gist alias - server { - listen 443; - server_name gist.example.com; - access_log /var/log/nginx/gist.access.log; - error_log /var/log/nginx/gist.error.log; - - ssl on; - ssl_certificate gist.your.kallithea.server.crt; - ssl_certificate_key gist.your.kallithea.server.key; - - ssl_session_timeout 5m; - - ssl_protocols SSLv3 TLSv1; - ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5; - ssl_prefer_server_ciphers on; - - rewrite ^/(.+)$ https://kallithea.example.com/_admin/gists/$1; - rewrite (.*) https://kallithea.example.com/_admin/gists; - } - - server { - listen 443; - server_name kallithea.example.com - access_log /var/log/nginx/kallithea.access.log; - error_log /var/log/nginx/kallithea.error.log; - - ssl on; - ssl_certificate your.kallithea.server.crt; - ssl_certificate_key your.kallithea.server.key; - - ssl_session_timeout 5m; - - ssl_protocols SSLv3 TLSv1; - ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5; - ssl_prefer_server_ciphers on; - - ## uncomment root directive if you want to serve static files by nginx - ## requires static_files = false in .ini file - #root /path/to/installation/kallithea/public; - include /etc/nginx/proxy.conf; - location / { - try_files $uri @kallithea; - } - - location @kallithea { - proxy_pass http://127.0.0.1:5000; - } - - } - -Here's the proxy.conf. It's tuned so it will not timeout on long -pushes or large pushes:: - - proxy_redirect off; - proxy_set_header Host $host; - ## needed for container auth - #proxy_set_header REMOTE_USER $remote_user; - #proxy_set_header X-Forwarded-User $remote_user; - proxy_set_header X-Url-Scheme $scheme; - proxy_set_header X-Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Proxy-host $proxy_host; - proxy_buffering off; - proxy_connect_timeout 7200; - proxy_send_timeout 7200; - proxy_read_timeout 7200; - proxy_buffers 8 32k; - client_max_body_size 1024m; - client_body_buffer_size 128k; - large_client_header_buffers 8 64k; - - -Apache virtual host reverse proxy example ------------------------------------------ - -Here is a sample configuration file for Apache using proxy: - -.. code-block:: apache - - - ServerName kallithea.example.com - - - # For Apache 2.4 and later: - Require all granted - - # For Apache 2.2 and earlier, instead use: - # Order allow,deny - # Allow from all - - - #important ! - #Directive to properly generate url (clone url) for pylons - ProxyPreserveHost On - - #kallithea instance - ProxyPass / http://127.0.0.1:5000/ - ProxyPassReverse / http://127.0.0.1:5000/ - - #to enable https use line below - #SetEnvIf X-Url-Scheme https HTTPS=1 - - -Additional tutorial -http://pylonsbook.com/en/1.1/deployment.html#using-apache-to-proxy-requests-to-pylons - - -Apache as subdirectory ----------------------- - -Apache subdirectory part: - -.. code-block:: apache - - > - ProxyPass http://127.0.0.1:5000/ - ProxyPassReverse http://127.0.0.1:5000/ - SetEnvIf X-Url-Scheme https HTTPS=1 - - -Besides the regular apache setup you will need to add the following line -into ``[app:main]`` section of your .ini file:: - - filter-with = proxy-prefix - -Add the following at the end of the .ini file:: - - [filter:proxy-prefix] - use = egg:PasteDeploy#prefix - prefix = / - -then change ```` into your chosen prefix - - -Apache with mod_wsgi --------------------- - -Alternatively, Kallithea can be set up with Apache under mod_wsgi. For -that, you'll need to: - -- Install mod_wsgi. If using a Debian-based distro, you can install - the package libapache2-mod-wsgi:: - - aptitude install libapache2-mod-wsgi - -- Enable mod_wsgi:: - - a2enmod wsgi - -- Add global Apache configuration to tell mod_wsgi that Python only will be - used in the WSGI processes and shouldn't be initialized in the Apache - processes:: - - WSGIRestrictEmbedded On - -- 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. - -Here is a sample excerpt from an Apache Virtual Host configuration file: - -.. code-block:: apache - - WSGIDaemonProcess kallithea processes=5 threads=1 maximum-requests=100 \ - python-home=/srv/kallithea/venv - WSGIProcessGroup kallithea - WSGIScriptAlias / /srv/kallithea/dispatch.wsgi - WSGIPassAuthorization On - -Or if using a dispatcher WSGI script with proper virtualenv activation: - -.. code-block:: apache - - WSGIDaemonProcess kallithea processes=5 threads=1 maximum-requests=100 - WSGIProcessGroup kallithea - WSGIScriptAlias / /srv/kallithea/dispatch.wsgi - WSGIPassAuthorization On - -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. - -.. note:: - If running Kallithea in multiprocess mode, - make sure you set ``instance_id = *`` in the configuration so each process - gets it's own cache invalidation key. - -Example WSGI dispatch script: - -.. code-block:: python - - import os - os.environ["HGENCODING"] = "UTF-8" - os.environ['PYTHON_EGG_CACHE'] = '/srv/kallithea/.egg-cache' - - # sometimes it's needed to set the curent dir - os.chdir('/srv/kallithea/') - - import site - site.addsitedir("/srv/kallithea/venv/lib/python2.7/site-packages") - - ini = '/srv/kallithea/my.ini' - from paste.script.util.logging_config import fileConfig - fileConfig(ini) - from paste.deploy import loadapp - application = loadapp('config:' + ini) - -Or using proper virtualenv activation: - -.. code-block:: python - - activate_this = '/srv/kallithea/venv/bin/activate_this.py' - execfile(activate_this, dict(__file__=activate_this)) - - import os - os.environ['HOME'] = '/srv/kallithea' - - ini = '/srv/kallithea/kallithea.ini' - from paste.script.util.logging_config import fileConfig - fileConfig(ini) - from paste.deploy import loadapp - application = loadapp('config:' + ini) - - -Other configuration files -------------------------- - -A number of `example init.d scripts`__ can be found in -the ``init.d`` directory of the Kallithea source. - -.. __: https://kallithea-scm.org/repos/kallithea/files/tip/init.d/ . - - -.. _virtualenv: http://pypi.python.org/pypi/virtualenv -.. _python: http://www.python.org/ -.. _Mercurial: https://www.mercurial-scm.org/ -.. _Celery: http://celeryproject.org/ -.. _Celery documentation: http://docs.celeryproject.org/en/latest/getting-started/index.html -.. _RabbitMQ: http://www.rabbitmq.com/ -.. _Redis: http://redis.io/ .. _python-ldap: http://www.python-ldap.org/ -.. _mercurial-server: http://www.lshift.net/mercurial-server.html -.. _PublishingRepositories: https://www.mercurial-scm.org/wiki/PublishingRepositories diff --git a/docs/usage/vcs_support.rst b/docs/administrator_guide/vcs_setup.rst rename from docs/usage/vcs_support.rst rename to docs/administrator_guide/vcs_setup.rst --- a/docs/usage/vcs_support.rst +++ b/docs/administrator_guide/vcs_setup.rst @@ -1,14 +1,15 @@ -.. _vcs_support: +.. _vcs_setup: -=============================== -Version control systems support -=============================== +============================= +Version control systems setup +============================= Kallithea supports Git and Mercurial repositories out-of-the-box. For Git, you do need the ``git`` command line client installed on the server. You can always disable Git or Mercurial support by editing the -file ``kallithea/__init__.py`` and commenting out the backend. +file ``kallithea/__init__.py`` and commenting out the backend. For example, to +disable Git but keep Mercurial enabled: .. code-block:: python @@ -18,20 +19,20 @@ file ``kallithea/__init__.py`` and comme } -Git support ------------ +Git-specific setup +------------------ Web server with chunked encoding -```````````````````````````````` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Large Git pushes require an HTTP server with support for chunked encoding for POST. The Python web servers waitress_ and gunicorn_ (Linux only) can be used. By default, Kallithea uses -waitress_ for `paster serve` instead of the built-in `paste` WSGI +waitress_ for `gearbox serve` instead of the built-in `paste` WSGI server. -The paster server is controlled in the .ini file:: +The web server used by gearbox is controlled in the .ini file:: use = egg:waitress#main @@ -45,41 +46,14 @@ Also make sure to comment out the follow threadpool_max_requests = use_threadpool = - -Mercurial support ------------------ - - -Working with Mercurial subrepositories -`````````````````````````````````````` - -This section explains how to use Mercurial subrepositories_ in Kallithea. - -Example usage:: +Increasing Git HTTP POST buffer size +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ## init a simple repo - hg init mainrepo - cd mainrepo - echo "file" > file - hg add file - hg ci --message "initial file" - - # clone subrepo we want to add from Kallithea - hg clone http://kallithea.local/subrepo +If Git pushes fail with HTTP error code 411 (Length Required), you may need to +increase the Git HTTP POST buffer. Run the following command as the user that +runs Kallithea to set a global Git variable to this effect:: - ## specify URL to existing repo in Kallithea as subrepository path - echo "subrepo = http://kallithea.local/subrepo" > .hgsub - hg add .hgsub - hg ci --message "added remote subrepo" - -In the file list of a clone of ``mainrepo`` you will see a connected -subrepository at the revision it was cloned with. Clicking on the -subrepository link sends you to the proper repository in Kallithea. - -Cloning ``mainrepo`` will also clone the attached subrepository. - -Next we can edit the subrepository data, and push back to Kallithea. This will -update both repositories. + git config --global http.postBuffer 524288000 .. _waitress: http://pypi.python.org/pypi/waitress diff --git a/docs/api/api.rst b/docs/api/api.rst --- a/docs/api/api.rst +++ b/docs/api/api.rst @@ -9,34 +9,16 @@ methods. Everything is available by send ``/_admin/api``. -API access for web views -++++++++++++++++++++++++ - -API access can also be turned on for each web view in Kallithea that is -decorated with the ``@LoginRequired`` decorator. Some views use -``@LoginRequired(api_access=True)`` and are always available. By default only -RSS/Atom feed views are enabled. Other views are -only available if they have been whitelisted. Edit the -``api_access_controllers_whitelist`` option in your .ini file and define views -that should have API access enabled. +API keys +-------- -For example, to enable API access to patch/diff, raw file and archive:: - - api_access_controllers_whitelist = - ChangesetController:changeset_patch, - ChangesetController:changeset_raw, - FilesController:raw, - FilesController:archivefile - -After this change, a Kallithea view can be accessed without login by adding a -GET parameter ``?api_key=`` to the URL. - -Exposing raw diffs is a good way to integrate with -third-party services like code review, or build farms that can download archives. +Every Kallithea user automatically receives an API key, which they can +view under "My Account". On this page, API keys can also be revoked, and +additional API keys can be generated. API access -++++++++++ +---------- Clients must send JSON encoded JSON-RPC requests:: @@ -76,7 +58,7 @@ the reponse will have a failure descript API client -++++++++++ +---------- Kallithea comes with a ``kallithea-api`` command line tool, providing a convenient way to call the JSON-RPC API. @@ -110,11 +92,11 @@ so you don't have to specify them every API methods -+++++++++++ +----------- pull ----- +^^^^ Pull the given repo from remote location. Can be used to automatically keep remote repos up to date. @@ -136,7 +118,7 @@ OUTPUT:: error : null rescan_repos ------------- +^^^^^^^^^^^^ Rescan repositories. If ``remove_obsolete`` is set, Kallithea will delete repos that are in the database but not in the filesystem. @@ -159,7 +141,7 @@ OUTPUT:: error : null invalidate_cache ----------------- +^^^^^^^^^^^^^^^^ Invalidate the cache for a repository. This command can only be executed using the api_key of a user with admin rights, @@ -181,7 +163,7 @@ OUTPUT:: error : null lock ----- +^^^^ Set the locking state on the given repository by the given user. If the param ``userid`` is skipped, it is set to the ID of the user who is calling this method. @@ -212,7 +194,7 @@ OUTPUT:: error : null get_ip ------- +^^^^^^ Return IP address as seen from Kallithea server, together with all defined IP addresses for given user. @@ -244,12 +226,12 @@ OUTPUT:: error : null get_user --------- +^^^^^^^^ Get a user by username or userid. The result is empty if user can't be found. If userid param is skipped, it is set to id of user who is calling this method. Any userid can be specified when the command is executed using the api_key of a user with admin rights. -Regular users can only speicy their own userid. +Regular users can only specify their own userid. INPUT:: @@ -288,7 +270,7 @@ OUTPUT:: error: null get_users ---------- +^^^^^^^^^ List all existing users. This command can only be executed using the api_key of a user with admin rights. @@ -325,7 +307,7 @@ OUTPUT:: .. _create-user: create_user ------------ +^^^^^^^^^^^ Create new user. This command can only be executed using the api_key of a user with admin rights. @@ -371,7 +353,7 @@ Example:: kallithea-api create_user username:bent email:bent@example.com firstname:Bent lastname:Bentsen extern_type:ldap extern_name:uid=bent,dc=example,dc=com update_user ------------ +^^^^^^^^^^^ Update the given user if such user exists. This command can only be executed using the api_key of a user with admin rights. @@ -415,7 +397,7 @@ OUTPUT:: error: null delete_user ------------ +^^^^^^^^^^^ Delete the given user if such a user exists. This command can only be executed using the api_key of a user with admin rights. @@ -439,7 +421,7 @@ OUTPUT:: error: null get_user_group --------------- +^^^^^^^^^^^^^^ Get an existing user group. This command can only be executed using the api_key of a user with admin rights. @@ -481,7 +463,7 @@ OUTPUT:: error : null get_user_groups ---------------- +^^^^^^^^^^^^^^^ List all existing user groups. This command can only be executed using the api_key of a user with admin rights. @@ -507,7 +489,7 @@ OUTPUT:: error : null create_user_group ------------------ +^^^^^^^^^^^^^^^^^ Create a new user group. This command can only be executed using the api_key of a user with admin rights. @@ -537,7 +519,7 @@ OUTPUT:: error: null add_user_to_user_group ----------------------- +^^^^^^^^^^^^^^^^^^^^^^ Adds a user to a user group. If the user already is in that group, success will be ``false``. @@ -564,7 +546,7 @@ OUTPUT:: error: null remove_user_from_user_group ---------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^ Remove a user from a user group. If the user isn't in the given group, success will be ``false``. @@ -591,7 +573,7 @@ OUTPUT:: error: null get_repo --------- +^^^^^^^^ Get an existing repository by its name or repository_id. Members will contain either users_group or users associated to that repository. @@ -604,7 +586,9 @@ INPUT:: api_key : "" method : "get_repo" args: { - "repoid" : "" + "repoid" : "", + "with_revision_names": " = Optional(False)", + "with_pullrequests": " = Optional(False)", } OUTPUT:: @@ -630,7 +614,7 @@ OUTPUT:: "raw_id": "", "revision": "", "short_id": "" - } + }, "owner": "", "fork_of": "", "members" : [ @@ -658,7 +642,7 @@ OUTPUT:: "permission" : "repository.(read|write|admin)" }, … - ] + ], "followers": [ { "user_id" : "", @@ -675,12 +659,74 @@ OUTPUT:: "last_login": "", }, … - ] + ], + + "tags": { + "": "", + ... + }, + "branches": { + "": "", + ... + }, + "bookmarks": { + "": "", + ... + }, + + "pull_requests": [ + { + "status": "", + "pull_request_id": , + "description": "", + "title": "", + "url": "", + "reviewers": [ + { + "username": "", + }, + ... + ], + "org_repo_url": "", + "org_ref_parts": [ + "", + "", + "" + ], + "other_ref_parts": [ + "", + "", + "" + ], + "comments": [ + { + "username": "", + "text": "", + "comment_id": "", + }, + ... + ], + "owner": "", + "statuses": [ + { + "status": "", # "under_review", "approved" or "rejected" + "reviewer": "", + "modified_at": "" # iso 8601 date, server's timezone + }, + ... + ], + "revisions": [ + "", + ... + ] + }, + ... + ] } error: null get_repos ---------- +^^^^^^^^^ List all existing repositories. This command can only be executed using the api_key of a user with admin rights, @@ -717,7 +763,7 @@ OUTPUT:: error: null get_repo_nodes --------------- +^^^^^^^^^^^^^^ Return a list of files and directories for a given path at the given revision. It is possible to specify ret_type to show only ``files`` or ``dirs``. @@ -748,7 +794,7 @@ OUTPUT:: error: null create_repo ------------ +^^^^^^^^^^^ Create a repository. If the repository name contains "/", the repository will be created in the repository group indicated by that path. Any such repository @@ -802,7 +848,7 @@ OUTPUT:: error: null update_repo ------------ +^^^^^^^^^^^ Update a repository. This command can only be executed using the api_key of a user with admin rights, @@ -862,7 +908,7 @@ OUTPUT:: error: null fork_repo ---------- +^^^^^^^^^ Create a fork of the given repo. If using Celery, this will return success message immediately and a fork will be created @@ -898,7 +944,7 @@ OUTPUT:: error: null delete_repo ------------ +^^^^^^^^^^^ Delete a repository. This command can only be executed using the api_key of a user with admin rights, @@ -925,7 +971,7 @@ OUTPUT:: error: null grant_user_permission ---------------------- +^^^^^^^^^^^^^^^^^^^^^ Grant permission for a user on the given repository, or update the existing one if found. This command can only be executed using the api_key of a user with admin rights. @@ -951,7 +997,7 @@ OUTPUT:: error: null revoke_user_permission ----------------------- +^^^^^^^^^^^^^^^^^^^^^^ Revoke permission for a user on the given repository. This command can only be executed using the api_key of a user with admin rights. @@ -976,7 +1022,7 @@ OUTPUT:: error: null grant_user_group_permission ---------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^ Grant permission for a user group on the given repository, or update the existing one if found. @@ -1003,7 +1049,7 @@ OUTPUT:: error: null revoke_user_group_permission ----------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Revoke permission for a user group on the given repository. This command can only be executed using the api_key of a user with admin rights. @@ -1026,3 +1072,235 @@ OUTPUT:: "success": true } error: null + +get_changesets +^^^^^^^^^^^^^^ + +Get changesets of a given repository. This command can only be executed using the api_key +of a user with read permissions to the repository. + +INPUT:: + + id : + api_key : "" + method : "get_changesets" + args: { + "repoid" : "", + "start": " = Optional(None)", + "end": " = Optional(None)", + "start_date": " = Optional(None)", # in "%Y-%m-%dT%H:%M:%S" format + "end_date": " = Optional(None)", # in "%Y-%m-%dT%H:%M:%S" format + "branch_name": " = Optional(None)", + "reverse": " = Optional(False)", + "with_file_list": " = Optional(False)" + } + +OUTPUT:: + + id : + result: [ + { + "raw_id": "", + "short_id": "short_id": "", + "author": "", + "date": "", + "message": "", + "revision": "", + + "added": [], + "changed": [], + "removed": [] + }, + ... + ] + error: null + +get_changeset +^^^^^^^^^^^^^ + +Get information and review status for a given changeset. This command can only +be executed using the api_key of a user with read permissions to the +repository. + +INPUT:: + + id : + api_key : "" + method : "get_changeset" + args: { + "repoid" : "", + "raw_id" : "", + "with_reviews": " = Optional(False)" + } + +OUTPUT:: + + id : + result: { + "author": "", + "date": "", + "message": "", + "raw_id": "", + "revision": "", + "short_id": "", + "reviews": [{ + "reviewer": "", + "modified_at": "", # iso 8601 date, server's timezone + "status": "", # "under_review", "approved" or "rejected" + }, + ... + ] + } + error: null + +Example output:: + + { + "id" : 1, + "error" : null, + "result" : { + "author" : { + "email" : "user@example.com", + "name" : "Kallithea Admin" + }, + "changed" : [], + "short_id" : "e1022d3d28df", + "date" : "2017-03-28T09:09:03", + "added" : [ + "README.rst" + ], + "removed" : [], + "revision" : 0, + "raw_id" : "e1022d3d28dfba02f626cde65dbe08f4ceb0e4e7", + "message" : "Added file via Kallithea", + "id" : "e1022d3d28dfba02f626cde65dbe08f4ceb0e4e7", + "reviews" : [ + { + "status" : "under_review", + "modified_at" : "2017-03-28T09:17:08.618", + "reviewer" : "user" + } + ] + } + } + +get_pullrequest +^^^^^^^^^^^^^^^ + +Get information and review status for a given pull request. This command can only be executed +using the api_key of a user with read permissions to the original repository. + +INPUT:: + + id : + api_key : "" + method : "get_pullrequest" + args: { + "pullrequest_id" : "", + } + +OUTPUT:: + + id : + result: { + "status": "", + "pull_request_id": , + "description": "", + "title": "", + "url": "", + "reviewers": [ + { + "username": "", + }, + ... + ], + "org_repo_url": "", + "org_ref_parts": [ + "", + "", + "" + ], + "other_ref_parts": [ + "", + "", + "" + ], + "comments": [ + { + "username": "", + "text": "", + "comment_id": "", + }, + ... + ], + "owner": "", + "statuses": [ + { + "status": "", # "under_review", "approved" or "rejected" + "reviewer": "", + "modified_at": "" # iso 8601 date, server's timezone + }, + ... + ], + "revisions": [ + "", + ... + ] + }, + error: null + +comment_pullrequest +^^^^^^^^^^^^^^^^^^^ + +Add comment, change status or close a given pull request. This command can only be executed +using the api_key of a user with read permissions to the original repository. + +INPUT:: + + id : + api_key : "" + method : "comment_pullrequest" + args: { + "pull_request_id": "", + "comment_msg": Optional(''), + "status": Optional(None), # "under_review", "approved" or "rejected" + "close_pr": Optional(False)", + } + +OUTPUT:: + + id : + result: True + error: null + + +API access for web views +------------------------ + +API access can also be turned on for each web view in Kallithea that is +decorated with the ``@LoginRequired`` decorator. Some views use +``@LoginRequired(api_access=True)`` and are always available. By default only +RSS/Atom feed views are enabled. Other views are +only available if they have been whitelisted. Edit the +``api_access_controllers_whitelist`` option in your .ini file and define views +that should have API access enabled. + +For example, to enable API access to patch/diff, raw file and archive:: + + api_access_controllers_whitelist = + ChangesetController:changeset_patch, + ChangesetController:changeset_raw, + FilesController:raw, + FilesController:archivefile + +After this change, a Kallithea view can be accessed without login using +bearer authentication, by including this header with the request:: + + Authentication: Bearer + +Alternatively, the API key can be passed in the URL query string using +``?api_key=``, though this is not recommended due to the increased +risk of API key leaks, and support will likely be removed in the future. + +Exposing raw diffs is a good way to integrate with +third-party services like code review, or build farms that can download archives. diff --git a/docs/api/models.rst b/docs/api/models.rst --- a/docs/api/models.rst +++ b/docs/api/models.rst @@ -10,9 +10,6 @@ The :mod:`models` module .. automodule:: kallithea.model.comment :members: -.. automodule:: kallithea.model.notification - :members: - .. automodule:: kallithea.model.permission :members: diff --git a/docs/changelog.rst b/docs/changelog.rst deleted file mode 100644 --- a/docs/changelog.rst +++ /dev/null @@ -1,10 +0,0 @@ -.. _changelog: - -========= -Changelog -========= - -Kallithea project doesn't keep its changelog here. We refer you to our `Mercurial logs`__. - - -.. __: https://kallithea-scm.org/repos/kallithea/changelog diff --git a/docs/contributing.rst b/docs/contributing.rst --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -28,62 +28,179 @@ for more details. Getting started --------------- -To get started with development:: +To get started with Kallithea development:: hg clone https://kallithea-scm.org/repos/kallithea cd kallithea virtualenv ../kallithea-venv source ../kallithea-venv/bin/activate - pip install --upgrade pip "setuptools<34" - pip install -e . - paster make-config Kallithea my.ini - paster setup-db my.ini --user=user --email=user@example.com --password=password --repos=/tmp - paster serve my.ini --reload & + pip install --upgrade pip setuptools + pip install --upgrade -e . + pip install --upgrade -r dev_requirements.txt + kallithea-cli config-create my.ini + kallithea-cli db-create -c my.ini --user=user --email=user@example.com --password=password --repos=/tmp + kallithea-cli front-end-build + gearbox serve -c my.ini --reload & firefox http://127.0.0.1:5000/ -You can also start out by forking https://bitbucket.org/conservancy/kallithea -on Bitbucket_ and create a local clone of your own fork. +If you plan to use Bitbucket_ for sending contributions, you can also fork +Kallithea on Bitbucket_ first (https://bitbucket.org/conservancy/kallithea) and +then replace the clone step above by a clone of your fork. In this case, please +see :ref:`contributing-guidelines` below for configuring your fork correctly. + + +Contribution flow +----------------- + +Starting from an existing Kallithea clone, make sure it is up to date with the +latest upstream changes:: + + hg pull + hg update + +Review the :ref:`contributing-guidelines` and :ref:`coding-guidelines`. + +If you are new to Mercurial, refer to Mercurial `Quick Start`_ and `Beginners +Guide`_ on the Mercurial wiki. + +Now, make some changes and test them (see :ref:`contributing-tests`). Don't +forget to add new tests to cover new functionality or bug fixes. + +For documentation changes, run ``make html`` from the ``docs`` directory to +generate the HTML result, then review them in your browser. + +Before submitting any changes, run the cleanup script:: + + ./scripts/run-all-cleanup + +When you are completely ready, you can send your changes to the community for +review and inclusion. Most commonly used methods are sending patches to the +mailing list (via ``hg email``) or by creating a pull request on Bitbucket_. + +.. _contributing-tests: Running tests ------------- -After finishing your changes make sure all tests pass cleanly. You can run -the testsuite running ``nosetests`` from the project root, or if you use tox -run ``tox`` for Python 2.6--2.7 with multiple database test. +After finishing your changes make sure all tests pass cleanly. Run the testsuite +by invoking ``py.test`` from the project root:: + + py.test + +Note that testing on Python 2.6 also requires ``unittest2``. -When running tests, Kallithea uses `kallithea/tests/test.ini` and populates the -SQLite database specified there. +Note that on unix systems, the temporary directory (``/tmp`` or where +``$TMPDIR`` points) must allow executable files; Git hooks must be executable, +and the test suite creates repositories in the temporary directory. Linux +systems with /tmp mounted noexec will thus fail. + +You can also use ``tox`` to run the tests with all supported Python versions +(currently Python 2.6--2.7). + +When running tests, Kallithea generates a `test.ini` based on template values +in `kallithea/tests/conftest.py` and populates the SQLite database specified +there. It is possible to avoid recreating the full test database on each invocation of the tests, thus eliminating the initial delay. To achieve this, run the tests as:: - paster serve kallithea/tests/test.ini --pid-file=test.pid --daemon - KALLITHEA_WHOOSH_TEST_DISABLE=1 KALLITHEA_NO_TMP_PATH=1 nosetests + gearbox serve -c /tmp/kallithea-test-XXX/test.ini --pid-file=test.pid --daemon + KALLITHEA_WHOOSH_TEST_DISABLE=1 KALLITHEA_NO_TMP_PATH=1 py.test kill -9 $(cat test.pid) -You can run individual tests by specifying their path as argument to nosetests. -nosetests also has many more options, see `nosetests -h`. Some useful options +In these commands, the following variables are used:: + + KALLITHEA_WHOOSH_TEST_DISABLE=1 - skip whoosh index building and tests + KALLITHEA_NO_TMP_PATH=1 - disable new temp path for tests, used mostly for testing_vcs_operations + +You can run individual tests by specifying their path as argument to py.test. +py.test also has many more options, see `py.test -h`. Some useful options are:: - -x, --stop Stop running tests after the first error or failure - -s, --nocapture Don't capture stdout (any stdout output will be - printed immediately) [NOSE_NOCAPTURE] - --failed Run the tests that failed in the last test run. + -k EXPRESSION only run tests which match the given substring + expression. An expression is a python evaluable + expression where all names are substring-matched + against test names and their parent classes. Example: + -x, --exitfirst exit instantly on first error or failed test. + --lf rerun only the tests that failed at the last run (or + all if none failed) + --ff run all tests but run the last failures first. This + may re-order tests and thus lead to repeated fixture + setup/teardown + --pdb start the interactive Python debugger on errors. + -s, --capture=no don't capture stdout (any stdout output will be + printed immediately) + +Performance tests +^^^^^^^^^^^^^^^^^ + +A number of performance tests are present in the test suite, but they are +not run in a standard test run. These tests are useful to +evaluate the impact of certain code changes with respect to performance. + +To run these tests:: + + env TEST_PERFORMANCE=1 py.test kallithea/tests/performance + +To analyze performance, you could install pytest-profiling_, which enables the +--profile and --profile-svg options to py.test. + +.. _pytest-profiling: https://github.com/manahl/pytest-plugins/tree/master/pytest-profiling + +.. _contributing-guidelines: -Coding/contribution guidelines ------------------------------- +Contribution guidelines +----------------------- Kallithea is GPLv3 and we assume all contributions are made by the committer/contributor and under GPLv3 unless explicitly stated. We do care a lot about preservation of copyright and license information for existing code that is brought into the project. +Contributions will be accepted in most formats -- such as pull requests on +Bitbucket, something hosted on your own Kallithea instance, or patches sent by +email to the `kallithea-general`_ mailing list. + +When contributing via Bitbucket, please make your fork of +https://bitbucket.org/conservancy/kallithea/ `non-publishing`_ -- it is one of +the settings on "Repository details" page. This ensures your commits are in +"draft" phase and makes it easier for you to address feedback and for project +maintainers to integrate your changes. + +.. _non-publishing: https://www.mercurial-scm.org/wiki/Phases#Publishing_Repository + +Make sure to test your changes both manually and with the automatic tests +before posting. + +We care about quality and review and keeping a clean repository history. We +might give feedback that requests polishing contributions until they are +"perfect". We might also rebase and collapse and make minor adjustments to your +changes when we apply them. + +We try to make sure we have consensus on the direction the project is taking. +Everything non-sensitive should be discussed in public -- preferably on the +mailing list. We aim at having all non-trivial changes reviewed by at least +one other core developer before pushing. Obvious non-controversial changes will +be handled more casually. + +There is a main development branch ("default") which is generally stable so that +it can be (and is) used in production. There is also a "stable" branch that is +almost exclusively reserved for bug fixes or trivial changes. Experimental +changes should live elsewhere (for example in a pull request) until they are +ready. + +.. _coding-guidelines: + + +Coding guidelines +----------------- + We don't have a formal coding/formatting standard. We are currently using a mix of Mercurial's (https://www.mercurial-scm.org/wiki/CodingStyle), pep8, and -consistency with existing code. Run whitespacecleanup.sh to avoid stupid -whitespace noise in your patches. +consistency with existing code. Run ``scripts/run-all-cleanup`` before +committing to ensure some basic code formatting consistency. We support both Python 2.6.x and 2.7.x and nothing else. For now we don't care about Python 3 compatibility. @@ -112,30 +229,66 @@ page titles, button labels, headers, and .. _English title case: https://en.wikipedia.org/wiki/Capitalization#Title_case -Contributions will be accepted in most formats -- such as pull requests on -bitbucket, something hosted on your own Kallithea instance, or patches sent by -email to the `kallithea-general`_ mailing list. +Template helpers (that is, everything in ``kallithea.lib.helpers``) +should only be referenced from templates. If you need to call a +helper from the Python code, consider moving the function somewhere +else (e.g. to the model). + +Notes on the SQLAlchemy session +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Each HTTP request runs inside an independent SQLAlchemy session (as well +as in an independent database transaction). ``Session`` is the session manager +and factory. ``Session()`` will create a new session on-demand or return the +current session for the active thread. Many database operations are methods on +such session instances - only ``Session.remove()`` should be called directly on +the manager. -Make sure to test your changes both manually and with the automatic tests -before posting. +Database model objects +(almost) always belong to a particular SQLAlchemy session, which means +that SQLAlchemy will ensure that they're kept in sync with the database +(but also means that they cannot be shared across requests). -We care about quality and review and keeping a clean repository history. We -might give feedback that requests polishing contributions until they are -"perfect". We might also rebase and collapse and make minor adjustments to your -changes when we apply them. +Objects can be added to the session using ``Session().add``, but this is +rarely needed: + +* When creating a database object by calling the constructor directly, + it must explicitly be added to the session. + +* When creating an object using a factory function (like + ``create_repo``), the returned object has already (by convention) + been added to the session, and should not be added again. -We try to make sure we have consensus on the direction the project is taking. -Everything non-sensitive should be discussed in public -- preferably on the -mailing list. We aim at having all non-trivial changes reviewed by at least -one other core developer before pushing. Obvious non-controversial changes will -be handled more casually. +* When getting an object from the session (via ``Session().query`` or + any of the utility functions that look up objects in the database), + it's already part of the session, and should not be added again. + SQLAlchemy monitors attribute modifications automatically for all + objects it knows about and syncs them to the database. + +SQLAlchemy also flushes changes to the database automatically; manually +calling ``Session().flush`` is usually only necessary when the Python +code needs the database to assign an "auto-increment" primary key ID to +a freshly created model object (before flushing, the ID attribute will +be ``None``). + +TurboGears2 DebugBar +^^^^^^^^^^^^^^^^^^^^ -For now we just have one official branch ("default") and will keep it so stable -that it can be (and is) used in production. Experimental changes should live -elsewhere (for example in a pull request) until they are ready. +It is possible to enable the TurboGears2-provided DebugBar_, a toolbar overlayed +over the Kallithea web interface, allowing you to see: + +* timing information of the current request, including profiling information +* request data, including GET data, POST data, cookies, headers and environment + variables +* a list of executed database queries, including timing and result values -.. _translations: -.. include:: ./../kallithea/i18n/how_to +DebugBar is only activated when ``debug = true`` is set in the configuration +file. This is important, because the DebugBar toolbar will be visible for all +users, and allow them to see information they should not be allowed to see. Like +is anyway the case for ``debug = true``, do not use this in production! + +To enable DebugBar, install ``tgext.debugbar`` and ``kajiki`` (typically via +``pip``) and restart Kallithea (in debug mode). "Roadmap" @@ -158,3 +311,6 @@ Thank you for your contribution! .. _kallithea-general: http://lists.sfconservancy.org/mailman/listinfo/kallithea-general .. _Hosted Weblate: https://hosted.weblate.org/projects/kallithea/kallithea/ .. _wiki: https://bitbucket.org/conservancy/kallithea/wiki/Home +.. _DebugBar: https://github.com/TurboGears/tgext.debugbar +.. _Quick Start: https://www.mercurial-scm.org/wiki/QuickStart +.. _Beginners Guide: https://www.mercurial-scm.org/wiki/BeginnersGuides diff --git a/docs/dev/dbmigrations.rst b/docs/dev/dbmigrations.rst new file mode 100644 --- /dev/null +++ b/docs/dev/dbmigrations.rst @@ -0,0 +1,74 @@ +======================= +Database schema changes +======================= + +Kallithea uses Alembic for :ref:`database migrations ` +(upgrades and downgrades). + +If you are developing a Kallithea feature that requires database schema +changes, you should make a matching Alembic database migration script: + +1. :ref:`Create a Kallithea configuration and database ` for testing + the migration script, or use existing ``development.ini`` setup. + + Ensure that this database is up to date with the latest database + schema *before* the changes you're currently developing. (Do not + create the database while your new schema changes are applied.) + +2. Create a separate throwaway configuration for iterating on the actual + database changes:: + + kallithea-cli config-create temp.ini + + Edit the file to change database settings. SQLite is typically fine, + but make sure to change the path to e.g. ``temp.db``, to avoid + clobbering any existing database file. + +3. Make your code changes (including database schema changes in ``db.py``). + +4. After every database schema change, recreate the throwaway database + to test the changes:: + + rm temp.db + kallithea-cli db-create -c temp.ini --repos=/var/repos --user=doe --email doe@example.com --password=123456 --no-public-access --force-yes + kallithea-cli repo-scan -c temp.ini + +5. Once satisfied with the schema changes, auto-generate a draft Alembic + script using the development database that has *not* been upgraded. + (The generated script will upgrade the database to match the code.) + + :: + + alembic -c development.ini revision -m "area: add cool feature" --autogenerate + +6. Edit the script to clean it up and fix any problems. + + Note that for changes that simply add columns, it may be appropriate + to not remove them in the downgrade script (and instead do nothing), + to avoid the loss of data. Unknown columns will simply be ignored by + Kallithea versions predating your changes. + +7. Run ``alembic -c development.ini upgrade head`` to apply changes to + the (non-throwaway) database, and test the upgrade script. Also test + downgrades. + + The included ``development.ini`` has full SQL logging enabled. If + you're using another configuration file, you may want to enable it + by setting ``level = DEBUG`` in section ``[handler_console_sql]``. + +The Alembic migration script should be committed in the same revision as +the database schema (``db.py``) changes. + +See the `Alembic documentation`__ for more information, in particular +the tutorial and the section about auto-generating migration scripts. + +.. __: http://alembic.zzzcomputing.com/en/latest/ + + +Troubleshooting +--------------- + +* If ``alembic --autogenerate`` responds "Target database is not up to + date", you need to either first use Alembic to upgrade the database + to the most recent version (before your changes), or recreate the + database from scratch (without your schema changes applied). diff --git a/docs/dev/translation.rst b/docs/dev/translation.rst new file mode 100644 --- /dev/null +++ b/docs/dev/translation.rst @@ -0,0 +1,2 @@ +.. _translations: +.. include:: ./../../kallithea/i18n/how_to diff --git a/docs/images/.img b/docs/images/.img deleted file mode 100644 diff --git a/docs/index.rst b/docs/index.rst --- a/docs/index.rst +++ b/docs/index.rst @@ -4,14 +4,23 @@ Kallithea Documentation ####################### -**Readme** +* :ref:`genindex` +* :ref:`search` + + +Readme +****** .. toctree:: :maxdepth: 1 readme -**Installation** + +Administrator guide +******************* + +**Installation and upgrade** .. toctree:: :maxdepth: 1 @@ -21,52 +30,53 @@ Kallithea Documentation installation_win installation_win_old installation_iis + installation_puppet + upgrade + +**Setup and configuration** + +.. toctree:: + :maxdepth: 1 + setup - installation_puppet + administrator_guide/auth + administrator_guide/vcs_setup + usage/email + usage/customization + +**Maintenance** -**Usage** +.. toctree:: + :maxdepth: 1 + + usage/backup + usage/performance + usage/debugging + usage/troubleshooting + + +User guide +********** .. toctree:: :maxdepth: 1 usage/general - usage/vcs_support + usage/vcs_notes usage/locking usage/statistics - -**Administrator's guide** + api/api -.. toctree:: - :maxdepth: 1 - usage/email - usage/performance - usage/backup - usage/debugging - usage/troubleshooting - -**Development** +Developer guide +*************** .. toctree:: :maxdepth: 1 contributing - changelog - -**API** - -.. toctree:: - :maxdepth: 1 - - api/api - api/models - - -Other topics ------------- - -* :ref:`genindex` -* :ref:`search` + dev/translation + dev/dbmigrations .. _virtualenv: http://pypi.python.org/pypi/virtualenv diff --git a/docs/installation.rst b/docs/installation.rst --- a/docs/installation.rst +++ b/docs/installation.rst @@ -26,6 +26,22 @@ The following describes three different have to remove its dependencies manually and make sure that they are not needed by other packages. +Regardless of the installation method you may need to make sure you have +appropriate development packages installed, as installation of some of the +Kallithea dependencies requires a working C compiler and libffi library +headers. Depending on your configuration, you may also need to install +Git and development packages for the database of your choice. + +For Debian and Ubuntu, the following command will ensure that a reasonable +set of dependencies is installed:: + + sudo apt-get install build-essential git python-pip python-virtualenv libffi-dev python-dev + +For Fedora and RHEL-derivatives, the following command will ensure that a +reasonable set of dependencies is installed:: + + sudo yum install gcc git python-pip python-virtualenv libffi-devel python-devel + .. _installation-source: @@ -38,16 +54,13 @@ repository, follow the instructions belo hg clone https://kallithea-scm.org/repos/kallithea -u stable cd kallithea virtualenv ../kallithea-venv - source ../kallithea-venv/bin/activate - pip install --upgrade pip "setuptools<34" - pip install -e . + . ../kallithea-venv/bin/activate + pip install --upgrade pip setuptools + pip install --upgrade -e . python2 setup.py compile_catalog # for translation of the UI You can now proceed to :ref:`setup`. -To upgrade, simply update the repository with ``hg pull -u`` and restart the -server. - .. _installation-virtualenv: @@ -68,8 +81,8 @@ An additional benefit of virtualenv_ is - Activate the virtualenv_ in your current shell session and make sure the basic requirements are up-to-date by running:: - source /srv/kallithea/venv/bin/activate - pip install --upgrade pip "setuptools<34" + . /srv/kallithea/venv/bin/activate + pip install --upgrade pip setuptools .. note:: You can't use UNIX ``sudo`` to source the ``virtualenv`` script; it will "activate" a shell that terminates immediately. It is also perfectly @@ -78,8 +91,8 @@ An additional benefit of virtualenv_ is .. note:: Some dependencies are optional. If you need them, install them in the virtualenv too:: - pip install psycopg2 - pip install python-ldap + pip install --upgrade psycopg2 + pip install --upgrade python-ldap This might require installation of development packages using your distribution's package manager. @@ -91,15 +104,15 @@ An additional benefit of virtualenv_ is - Go into the created directory and run this command to install Kallithea:: - pip install kallithea + pip install --upgrade kallithea Alternatively, download a .tar.gz from http://pypi.python.org/pypi/Kallithea, extract it and run:: - pip install . + pip install --upgrade . -- This will install Kallithea together with pylons_ and all other required - python libraries into the activated virtualenv. +- This will install Kallithea together with all other required + Python libraries into the activated virtualenv. You can now proceed to :ref:`setup`. @@ -123,90 +136,4 @@ To install as a regular user in ``~/.loc You can now proceed to :ref:`setup`. -Upgrading Kallithea from Python Package Index (PyPI) ----------------------------------------------------- - -.. note:: - It is strongly recommended that you **always** perform a database and - configuration backup before doing an upgrade. - - These directions will use '{version}' to note that this is the version of - Kallithea that these files were used with. If backing up your Kallithea - instance from version 0.1 to 0.2, the ``my.ini`` file could be - backed up to ``my.ini.0-1``. - -If using a SQLite database, stop the Kallithea process/daemon/service, and -then make a copy of the database file:: - - service kallithea stop - cp kallithea.db kallithea.db.{version} - -Back up your configuration file:: - - cp my.ini my.ini.{version} - -Ensure that you are using the Python virtual environment that you originally -installed Kallithea in by running:: - - pip freeze - -This will list all packages installed in the current environment. If -Kallithea isn't listed, activate the correct virtual environment:: - - source /srv/kallithea/venv/bin/activate - -Once you have verified the environment you can upgrade Kallithea with:: - - pip install --upgrade kallithea - -Then run the following command from the installation directory:: - - paster make-config Kallithea my.ini - -This will display any changes made by the new version of Kallithea to your -current configuration. It will try to perform an automerge. It is recommended -that you recheck the content after the automerge. - -.. note:: - Please always make sure your .ini files are up to date. Errors can - often be caused by missing parameters added in new versions. - -It is also recommended that you rebuild the whoosh index after upgrading since -the new whoosh version could introduce some incompatible index changes. Please -read the changelog to see if there were any changes to whoosh. - -The final step is to upgrade the database. To do this simply run:: - - paster upgrade-db my.ini - -This will upgrade the schema and update some of the defaults in the database, -and will always recheck the settings of the application, if there are no new -options that need to be set. - -.. note:: - The DB schema upgrade library has some limitations and can sometimes fail if you try to - upgrade from older major releases. In such a case simply run upgrades sequentially, e.g., - upgrading from 0.1.X to 0.3.X should be done like this: 0.1.X. > 0.2.X > 0.3.X - You can always specify what version of Kallithea you want to install for example in pip - `pip install Kallithea==0.2` - -You may find it helpful to clear out your log file so that new errors are -readily apparent:: - - echo > kallithea.log - -Once that is complete, you may now start your upgraded Kallithea Instance:: - - service kallithea start - -Or:: - - paster serve /srv/kallithea/my.ini - -.. note:: - If you're using Celery, make sure you restart all instances of it after - upgrade. - - .. _virtualenv: http://pypi.python.org/pypi/virtualenv -.. _pylons: http://www.pylonsproject.org/ diff --git a/docs/installation_iis.rst b/docs/installation_iis.rst --- a/docs/installation_iis.rst +++ b/docs/installation_iis.rst @@ -39,7 +39,7 @@ will be served from the root of its own own virtual folder will be noted where appropriate. Application pool -................ +^^^^^^^^^^^^^^^^ Make sure that there is a unique application pool for the Kallithea application with an identity that has read access to the Kallithea distribution. @@ -55,11 +55,11 @@ to run on the website and neither will K as long as the Kallithea requirements are met by the existing pool. ISAPI handler -............. +^^^^^^^^^^^^^ The ISAPI handler can be generated using:: - paster install-iis my.ini --virtualdir=/ + kallithea-cli iis-install -c my.ini --virtualdir=/ This will generate a ``dispatch.py`` file in the current directory that contains the necessary components to finalize an installation into IIS. Once this file @@ -74,12 +74,12 @@ This accomplishes two things: generating The ISAPI handler is registered to all file extensions, so it will automatically be the one handling all requests to the specified virtual directory. When the website starts -the ISAPI handler, it will start a thread pool managed wrapper around the paster +the ISAPI handler, it will start a thread pool managed wrapper around the middleware WSGI handler that Kallithea runs within and each HTTP request to the site will be processed through this logic henceforth. Authentication with Kallithea using IIS authentication modules -.............................................................. +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The recommended way to handle authentication with Kallithea using IIS is to let IIS handle all the authentication and just pass it to Kallithea. @@ -111,7 +111,7 @@ Troubleshooting --------------- Typically, any issues in this setup will either be entirely in IIS or entirely -in Kallithea (or Kallithea's WSGI/paster middleware). Consequently, two +in Kallithea (or Kallithea's WSGI middleware). Consequently, two different options for finding issues exist: IIS' failed request tracking which is great at finding issues until they exist inside Kallithea, at which point the ISAPI-WSGI wrapper above uses ``win32traceutil``, which is part of ``pywin32``. diff --git a/docs/installation_puppet.rst b/docs/installation_puppet.rst --- a/docs/installation_puppet.rst +++ b/docs/installation_puppet.rst @@ -90,7 +90,7 @@ customizing the setup process. You have parameter in the :ref:`example above `, but there are more. For example, you can specify the installation directory, the name of the user under which Kallithea gets installed, the initial admin password, etc. -Notably, you can provide arbitrary modifications to Kallitheas configuration +Notably, you can provide arbitrary modifications to Kallithea's configuration file by means of the ``config_hash`` parameter. Parameters, which have not been set explicitly, will be set to default values, diff --git a/docs/installation_win.rst b/docs/installation_win.rst --- a/docs/installation_win.rst +++ b/docs/installation_win.rst @@ -1,12 +1,12 @@ .. _installation_win: -================================================================ -Installation and upgrade on Windows (7/Server 2008 R2 and newer) -================================================================ +==================================================== +Installation on Windows (7/Server 2008 R2 and newer) +==================================================== First time install -:::::::::::::::::: +------------------ Target OS: Windows 7 and newer or Windows Server 2008 R2 and newer @@ -15,7 +15,7 @@ Tested on Windows 8.1, Windows Server 20 To install on an older version of Windows, see ``_ Step 1 -- Install Python ------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^ Install Python 2.x.y (x = 6 or 7). Latest version is recommended. If you need another version, they can run side by side. @@ -31,7 +31,7 @@ Remember the specific major and minor ve be needed in the next step. In this case, it is "2.7". Step 2 -- Python BIN --------------------- +^^^^^^^^^^^^^^^^^^^^ Add Python BIN folder to the path. This can be done manually (editing "PATH" environment variable) or by using Windows Support Tools that @@ -45,7 +45,7 @@ Please substitute [your-python-path] wit path. Typically this is ``C:\\Python27``. Step 3 -- Install pywin32 extensions ------------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Download pywin32 from: http://sourceforge.net/projects/pywin32/files/ @@ -61,7 +61,7 @@ http://sourceforge.net/projects/pywin32/ (Win32) Step 4 -- Install pip ---------------------- +^^^^^^^^^^^^^^^^^^^^^ pip is a package management system for Python. You will need it to install Kallithea and its dependencies. @@ -85,7 +85,7 @@ open a CMD and type:: SETX PATH "%PATH%;[your-python-path]\Scripts" /M Step 5 -- Kallithea folder structure ------------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Create a Kallithea folder structure. @@ -102,7 +102,7 @@ Create the following folder structure:: C:\Kallithea\Repos Step 6 -- Install virtualenv ----------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. note:: A python virtual environment will allow for isolation between the Python packages of your system and those used for Kallithea. @@ -119,7 +119,7 @@ To create a virtual environment, run:: virtualenv C:\Kallithea\Env Step 7 -- Install Kallithea ---------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^ In order to install Kallithea, you need to be able to run "pip install kallithea". It will use pip to install the Kallithea Python package and its dependencies. Some Python packages use managed code and need to be compiled. @@ -134,7 +134,7 @@ In a command prompt type (adapting paths cd C:\Kallithea\Env\Scripts activate - pip install --upgrade pip "setuptools<34" + pip install --upgrade pip setuptools The prompt will change into "(Env) C:\\Kallithea\\Env\\Scripts" or similar (depending of your folder structure). Then type:: @@ -145,17 +145,19 @@ The prompt will change into "(Env) C:\\K complete. Some warnings will appear. Don't worry, they are normal. -Step 8 -- Install git (optional) --------------------------------- +Step 8 -- Install Git (optional) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Mercurial being a python package, was installed automatically when doing ``pip install kallithea``. -Mercurial being a python package, it was installed automatically when doing "pip install kallithea". - -You need to install git manually if you want Kallithea to be able to host git repositories. - +You need to install Git manually if you want Kallithea to be able to host Git repositories. See http://git-scm.com/book/en/v2/Getting-Started-Installing-Git#Installing-on-Windows for instructions. +The location of the Git binaries (like ``c:\path\to\git\bin``) must be +added to the ``PATH`` environment variable so ``git.exe`` and other tools like +``gzip.exe`` are available. Step 9 -- Configuring Kallithea -------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Steps taken from ``_ @@ -164,9 +166,9 @@ it, reopen it following the same command one). When ready, type:: cd C:\Kallithea\Bin - paster make-config Kallithea production.ini + kallithea-cli config-create my.ini -Then you must edit production.ini to fit your needs (IP address, IP +Then you must edit my.ini to fit your needs (IP address, IP port, mail settings, database, etc.). `NotePad++`__ or a similar text editor is recommended to properly handle the newline character differences between Unix and Windows. @@ -175,11 +177,11 @@ __ http://notepad-plus-plus.org/ For the sake of simplicity, run it with the default settings. After your edits (if any) in the previous command prompt, type:: - paster setup-db production.ini + kallithea-cli db-create -c my.ini .. warning:: This time a *new* database will be installed. You must - follow a different step to later *upgrade* to a newer - Kallithea version) + follow a different process to later :ref:`upgrade ` + to a newer Kallithea version. The script will ask you for confirmation about creating a new database, answer yes (y) @@ -191,14 +193,14 @@ The script will ask you for admin mail, If you make a mistake and the script doesn't end, don't worry: start it again. -If you decided not to install git, you will get errors about it that you can ignore. +If you decided not to install Git, you will get errors about it that you can ignore. Step 10 -- Running Kallithea ----------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ In the previous command prompt, being in the C:\\Kallithea\\Bin folder, type:: - paster serve production.ini + gearbox serve -c my.ini Open your web server, and go to http://127.0.0.1:5000 @@ -219,27 +221,3 @@ What this guide does not cover: - Using Apache. You can investigate here: - https://groups.google.com/group/rhodecode/msg/c433074e813ffdc4 - - -Upgrading -::::::::: - -Stop running Kallithea -Open a CommandPrompt like in Step 7 (cd to C:\Kallithea\Env\Scripts and activate) and type:: - - pip install kallithea --upgrade - cd \Kallithea\Bin - -Backup your production.ini file now. - -Then run:: - - paster make-config Kallithea production.ini - -Look for changes and update your production.ini accordingly. - -Next, update the database:: - - paster upgrade-db production.ini - -More details can be found in ``_. diff --git a/docs/installation_win_old.rst b/docs/installation_win_old.rst --- a/docs/installation_win_old.rst +++ b/docs/installation_win_old.rst @@ -1,12 +1,12 @@ .. _installation_win_old: -====================================================================== -Installation and upgrade on Windows (XP/Vista/Server 2003/Server 2008) -====================================================================== +========================================================== +Installation on Windows (XP/Vista/Server 2003/Server 2008) +========================================================== First-time install -:::::::::::::::::: +------------------ Target OS: Windows XP SP3 32-bit English (Clean installation) + All Windows Updates until 24-may-2012 @@ -24,7 +24,7 @@ Target OS: Windows XP SP3 32-bit English - http://bugs.python.org/issue7511 Step 1 -- Install Visual Studio 2008 Express --------------------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Optional: You can also install MinGW, but VS2008 installation is easier. @@ -58,7 +58,7 @@ choose "Visual C++ 2008 Express" when in Copy C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars64.bat to C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\amd64\vcvarsamd64.bat Step 2 -- Install Python ------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^ Install Python 2.x.y (x = 6 or 7) x86 version (32-bit). DO NOT USE A 3.x version. Download Python 2.x.y from: @@ -74,7 +74,7 @@ be needed in the next step. In this case 64-bit: Just download and install the 64-bit version of python. Step 3 -- Install Win32py extensions ------------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Download pywin32 from: http://sourceforge.net/projects/pywin32/files/ @@ -93,7 +93,7 @@ http://sourceforge.net/projects/pywin32/ http://sourceforge.net/projects/pywin32/files/pywin32/Build%20218/pywin32-218.win-amd64-py2.7.exe/download Step 4 -- Python BIN --------------------- +^^^^^^^^^^^^^^^^^^^^ Add Python BIN folder to the path @@ -120,7 +120,7 @@ that came preinstalled in Vista/7 and ca Typically: C:\\Python27 Step 5 -- Kallithea folder structure ------------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Create a Kallithea folder structure @@ -137,7 +137,7 @@ Create the following folder structure:: C:\Kallithea\Repos Step 6 -- Install virtualenv ----------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Install Virtual Env for Python @@ -157,7 +157,7 @@ where you downloaded "virtualenv.py", an to include it) Step 7 -- Install Kallithea ---------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^ Finally, install Kallithea @@ -183,7 +183,7 @@ In that CMD (loaded with VS2008 PATHs) t cd C:\Kallithea\Env\Scripts (or similar) activate - pip install --upgrade pip "setuptools<34" + pip install --upgrade pip setuptools The prompt will change into "(Env) C:\\Kallithea\\Env\\Scripts" or similar (depending of your folder structure). Then type:: @@ -195,7 +195,7 @@ The prompt will change into "(Env) C:\\K Some warnings will appear, don't worry as they are normal. Step 8 -- Configuring Kallithea -------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ steps taken from http://packages.python.org/Kallithea/setup.html @@ -204,9 +204,9 @@ if you closed it reopen it following the "activate" one). When ready, just type:: cd C:\Kallithea\Bin - paster make-config Kallithea production.ini + kallithea-cli config-create my.ini -Then, you must edit production.ini to fit your needs (network address and +Then, you must edit my.ini to fit your needs (network address and port, mail settings, database, whatever). I recommend using NotePad++ (free) or similar text editor, as it handles well the EndOfLine character differences between Unix and Windows @@ -215,10 +215,11 @@ character differences between Unix and W For the sake of simplicity lets run it with the default settings. After your edits (if any), in the previous Command Prompt, type:: - paster setup-db production.ini + kallithea-cli db-create -c my.ini -(this time a NEW database will be installed, you must follow a different -step to later UPGRADE to a newer Kallithea version) +.. warning:: This time a *new* database will be installed. You must + follow a different process to later :ref:`upgrade ` + to a newer Kallithea version. The script will ask you for confirmation about creating a NEW database, answer yes (y) @@ -233,12 +234,12 @@ If you make some mistake and the script it again. Step 9 -- Running Kallithea ---------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^ In the previous command prompt, being in the C:\\Kallithea\\Bin folder, just type:: - paster serve production.ini + gearbox serve -c my.ini Open yout web server, and go to http://127.0.0.1:5000 @@ -260,23 +261,3 @@ What this Guide does not cover: - Using Apache. You can investigate here: - https://groups.google.com/group/rhodecode/msg/c433074e813ffdc4 - - -Upgrading -::::::::: - -Stop running Kallithea -Open a CommandPrompt like in Step7 (VS2008 path + activate) and type:: - - easy_install -U kallithea - cd \Kallithea\Bin - -{ backup your production.ini file now} :: - - paster make-config Kallithea production.ini - -(check changes and update your production.ini accordingly) :: - - paster upgrade-db production.ini (update database) - -Full steps in http://packages.python.org/Kallithea/upgrade.html diff --git a/docs/make.bat b/docs/make.bat --- a/docs/make.bat +++ b/docs/make.bat @@ -3,153 +3,153 @@ REM Command file for Sphinx documentation if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build + set SPHINXBUILD=sphinx-build ) set BUILDDIR=_build set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . if NOT "%PAPER%" == "" ( - set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% + set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% ) if "%1" == "" goto help if "%1" == "help" ( - :help - echo.Please use `make ^` where ^ is one of - echo. html to make standalone HTML files - echo. dirhtml to make HTML files named index.html in directories - echo. singlehtml to make a single large HTML file - echo. pickle to make pickle files - echo. json to make JSON files - echo. htmlhelp to make HTML files and a HTML help project - echo. qthelp to make HTML files and a qthelp project - echo. devhelp to make HTML files and a Devhelp project - echo. epub to make an epub - echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter - echo. text to make text files - echo. man to make manual pages - echo. changes to make an overview over all changed/added/deprecated items - echo. linkcheck to check all external links for integrity - echo. doctest to run all doctests embedded in the documentation if enabled - goto end + :help + echo.Please use `make ^` where ^ is one of + echo. html to make standalone HTML files + echo. dirhtml to make HTML files named index.html in directories + echo. singlehtml to make a single large HTML file + echo. pickle to make pickle files + echo. json to make JSON files + echo. htmlhelp to make HTML files and a HTML help project + echo. qthelp to make HTML files and a qthelp project + echo. devhelp to make HTML files and a Devhelp project + echo. epub to make an epub + echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter + echo. text to make text files + echo. man to make manual pages + echo. changes to make an overview over all changed/added/deprecated items + echo. linkcheck to check all external links for integrity + echo. doctest to run all doctests embedded in the documentation if enabled + goto end ) if "%1" == "clean" ( - for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i - del /q /s %BUILDDIR%\* - goto end + for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i + del /q /s %BUILDDIR%\* + goto end ) if "%1" == "html" ( - %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/html. - goto end + %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/html. + goto end ) if "%1" == "dirhtml" ( - %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. - goto end + %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. + goto end ) if "%1" == "singlehtml" ( - %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. - goto end + %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml + echo. + echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. + goto end ) if "%1" == "pickle" ( - %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle - echo. - echo.Build finished; now you can process the pickle files. - goto end + %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle + echo. + echo.Build finished; now you can process the pickle files. + goto end ) if "%1" == "json" ( - %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json - echo. - echo.Build finished; now you can process the JSON files. - goto end + %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json + echo. + echo.Build finished; now you can process the JSON files. + goto end ) if "%1" == "htmlhelp" ( - %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp - echo. - echo.Build finished; now you can run HTML Help Workshop with the ^ + %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp + echo. + echo.Build finished; now you can run HTML Help Workshop with the ^ .hhp project file in %BUILDDIR%/htmlhelp. - goto end + goto end ) if "%1" == "qthelp" ( - %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp - echo. - echo.Build finished; now you can run "qcollectiongenerator" with the ^ + %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp + echo. + echo.Build finished; now you can run "qcollectiongenerator" with the ^ .qhcp project file in %BUILDDIR%/qthelp, like this: - echo.^> qcollectiongenerator %BUILDDIR%\qthelp\Kallithea.qhcp - echo.To view the help file: - echo.^> assistant -collectionFile %BUILDDIR%\qthelp\Kallithea.ghc - goto end + echo.^> qcollectiongenerator %BUILDDIR%\qthelp\Kallithea.qhcp + echo.To view the help file: + echo.^> assistant -collectionFile %BUILDDIR%\qthelp\Kallithea.ghc + goto end ) if "%1" == "devhelp" ( - %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp - echo. - echo.Build finished. - goto end + %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp + echo. + echo.Build finished. + goto end ) if "%1" == "epub" ( - %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub - echo. - echo.Build finished. The epub file is in %BUILDDIR%/epub. - goto end + %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub + echo. + echo.Build finished. The epub file is in %BUILDDIR%/epub. + goto end ) if "%1" == "latex" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - echo. - echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. - goto end + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex + echo. + echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. + goto end ) if "%1" == "text" ( - %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text - echo. - echo.Build finished. The text files are in %BUILDDIR%/text. - goto end + %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text + echo. + echo.Build finished. The text files are in %BUILDDIR%/text. + goto end ) if "%1" == "man" ( - %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man - echo. - echo.Build finished. The manual pages are in %BUILDDIR%/man. - goto end + %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man + echo. + echo.Build finished. The manual pages are in %BUILDDIR%/man. + goto end ) if "%1" == "changes" ( - %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes - echo. - echo.The overview file is in %BUILDDIR%/changes. - goto end + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes + echo. + echo.The overview file is in %BUILDDIR%/changes. + goto end ) if "%1" == "linkcheck" ( - %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck - echo. - echo.Link check complete; look for any errors in the above output ^ + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck + echo. + echo.Link check complete; look for any errors in the above output ^ or in %BUILDDIR%/linkcheck/output.txt. - goto end + goto end ) if "%1" == "doctest" ( - %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest - echo. - echo.Testing of doctests in the sources finished, look at the ^ + %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest + echo. + echo.Testing of doctests in the sources finished, look at the ^ results in %BUILDDIR%/doctest/output.txt. - goto end + goto end ) :end diff --git a/docs/overview.rst b/docs/overview.rst --- a/docs/overview.rst +++ b/docs/overview.rst @@ -69,6 +69,11 @@ installed. (``pip install kallithea`` from a source tree will do pretty much the same but build the Kallithea package itself locally instead of downloading it.) +.. note:: + Kallithea includes front-end code that needs to be processed first. + The tool npm_ is used to download external dependencies and orchestrate the + processing. The ``npm`` binary must thus be available. + Web server ---------- @@ -84,17 +89,17 @@ to use web server authentication. There are several web server options: -- Kallithea uses the Paste_ tool as command line interface. Paste provides - ``paster serve`` as a convenient way to launch a Python WSGI / web server +- Kallithea uses the Gearbox_ tool as command line interface. Gearbox provides + ``gearbox serve`` as a convenient way to launch a Python WSGI / web server from the command line. That is perfect for development and evaluation. Actual use in production might have different requirements and need extra work to make it manageable as a scalable system service. - Paste comes with its own built-in web server but Kallithea defaults to use + Gearbox comes with its own built-in web server but Kallithea defaults to use Waitress_. Gunicorn_ is also an option. These web servers have different limited feature sets. - The web server used by ``paster`` is configured in the ``.ini`` file passed + The web server used by ``gearbox`` is configured in the ``.ini`` file passed to it. The entry point for the WSGI application is configured in ``setup.py`` as ``kallithea.config.middleware:make_app``. @@ -113,7 +118,7 @@ There are several web server options: encryption or special authentication or for other security reasons, to provide caching of static files, or to provide load balancing or fail-over. Nginx_, Varnish_ and HAProxy_ are often used for this purpose, often in front - of a ``paster`` server that somehow is wrapped as a service. + of a ``gearbox serve`` that somehow is wrapped as a service. The best option depends on what you are familiar with and the requirements for performance and stability. Also, keep in mind that Kallithea mainly is serving @@ -126,7 +131,7 @@ continuous hammering from the internet. .. _Gunicorn: http://gunicorn.org/ .. _Waitress: http://waitress.readthedocs.org/en/latest/ .. _virtualenv: http://pypi.python.org/pypi/virtualenv -.. _Paste: http://pythonpaste.org/ +.. _Gearbox: http://turbogears.readthedocs.io/en/latest/turbogears/gearbox.html .. _PyPI: https://pypi.python.org/pypi .. _Apache httpd: http://httpd.apache.org/ .. _mod_wsgi: https://code.google.com/p/modwsgi/ @@ -136,6 +141,6 @@ continuous hammering from the internet. .. _iis: http://en.wikipedia.org/wiki/Internet_Information_Services .. _pip: http://en.wikipedia.org/wiki/Pip_%28package_manager%29 .. _WSGI: http://en.wikipedia.org/wiki/Web_Server_Gateway_Interface -.. _pylons: http://www.pylonsproject.org/ .. _HAProxy: http://www.haproxy.org/ .. _Varnish: https://www.varnish-cache.org/ +.. _npm: https://www.npmjs.com/ diff --git a/docs/setup.rst b/docs/setup.rst --- a/docs/setup.rst +++ b/docs/setup.rst @@ -11,12 +11,14 @@ Setting up Kallithea First, you will need to create a Kallithea configuration file. Run the following command to do so:: - paster make-config Kallithea my.ini + kallithea-cli config-create my.ini This will create the file ``my.ini`` in the current directory. This configuration file contains the various settings for Kallithea, e.g. proxy port, email settings, usage of static files, cache, Celery -settings, and logging. +settings, and logging. Extra settings can be specified like:: + + kallithea-cli config-create my.ini host=8.8.8.8 "[handler_console]" formatter=color_formatter Next, you need to create the databases used by Kallithea. It is recommended to use PostgreSQL or SQLite (default). If you choose a database other than the @@ -25,20 +27,20 @@ configuration file to use this other dat PostgreSQL, SQLite and MySQL databases. Create the database by running the following command:: - paster setup-db my.ini + kallithea-cli db-create -c my.ini This will prompt you for a "root" path. This "root" path is the location where Kallithea will store all of its repositories on the current machine. After -entering this "root" path ``setup-db`` will also prompt you for a username -and password for the initial admin account which ``setup-db`` sets +entering this "root" path ``db-create`` will also prompt you for a username +and password for the initial admin account which ``db-create`` sets up for you. -The ``setup-db`` values can also be given on the command line. +The ``db-create`` values can also be given on the command line. Example:: - paster setup-db my.ini --user=nn --password=secret --email=nn@example.com --repos=/srv/repos + kallithea-cli db-create -c my.ini --user=nn --password=secret --email=nn@example.com --repos=/srv/repos -The ``setup-db`` command will create all needed tables and an +The ``db-create`` command will create all needed tables and an admin account. When choosing a root path you can either use a new empty location, or a location which already contains existing repositories. If you choose a location which contains existing @@ -52,14 +54,18 @@ path to the root). but when trying to do a push it will fail with permission denied errors unless it has write access. +Finally, prepare the front-end by running:: + + kallithea-cli front-end-build + You are now ready to use Kallithea. To run it simply execute:: - paster serve my.ini + gearbox serve -c my.ini - This command runs the Kallithea server. The web app should be available at http://127.0.0.1:5000. The IP address and port is configurable via the configuration file created in the previous step. -- Log in to Kallithea using the admin account created when running ``setup-db``. +- Log in to Kallithea using the admin account created when running ``db-create``. - The default permissions on each repository is read, and the owner is admin. Remember to update these if needed. - In the admin panel you can toggle LDAP, anonymous, and permissions @@ -67,22 +73,20 @@ You are now ready to use Kallithea. To r repositories. -Extensions ----------- - -Optionally one can create an ``rcextensions`` package that extends Kallithea -functionality. -To generate a skeleton extensions package, run:: +Internationalization (i18n support) +----------------------------------- - paster make-rcext my.ini +The Kallithea web interface is automatically displayed in the user's preferred +language, as indicated by the browser. Thus, different users may see the +application in different languages. If the requested language is not available +(because the translation file for that language does not yet exist or is +incomplete), the language specified in setting ``i18n.lang`` in the Kallithea +configuration file is used as fallback. If no fallback language is explicitly +specified, English is used. -This will create an ``rcextensions`` package next to the specified ``ini`` file. -With ``rcextensions`` it's possible to add additional mapping for whoosh, -stats and add additional code into the push/pull/create/delete repo hooks, -for example for sending signals to build-bots such as Jenkins. - -See the ``__init__.py`` file inside the generated ``rcextensions`` package -for more details. +If you want to disable automatic language detection and instead configure a +fixed language regardless of user preference, set ``i18n.enabled = false`` and +set ``i18n.lang`` to the desired language (or leave empty for English). Using Kallithea with SSH @@ -129,23 +133,23 @@ Kallithea provides full text search of r For an incremental index build, run:: - paster make-index my.ini + kallithea-cli index-create -c my.ini For a full index rebuild, run:: - paster make-index my.ini -f + kallithea-cli index-create -c my.ini --full -The ``--repo-location`` option allows the location of the repositories to be overriden; +The ``--repo-location`` option allows the location of the repositories to be overridden; usually, the location is retrieved from the Kallithea database. The ``--index-only`` option can be used to limit the indexed repositories to a comma-separated list:: - paster make-index my.ini --index-only=vcs,kallithea + kallithea-cli index-create -c my.ini --index-only=vcs,kallithea To keep your index up-to-date it is necessary to do periodic index builds; for this, it is recommended to use a crontab entry. Example:: - 0 3 * * * /path/to/virtualenv/bin/paster make-index /path/to/kallithea/my.ini + 0 3 * * * /path/to/virtualenv/bin/kallithea-cli index-create -c /path/to/kallithea/my.ini When using incremental mode (the default), Whoosh will check the last modification date of each file and add it to be reindexed if a newer file is @@ -155,321 +159,75 @@ from index. If you want to rebuild the index from scratch, you can use the ``-f`` flag as above, or in the admin panel you can check the "build from scratch" checkbox. -.. _ldap-setup: - -Setting up LDAP support ------------------------ - -Kallithea supports LDAP authentication. In order -to use LDAP, you have to install the python-ldap_ package. This package is -available via PyPI, so you can install it by running:: - - pip install python-ldap - -.. note:: ``python-ldap`` requires some libraries to be installed on - your system, so before installing it check that you have at - least the ``openldap`` and ``sasl`` libraries. - -Choose *Admin > Authentication*, click the ``kallithea.lib.auth_modules.auth_ldap`` button -and then *Save*, to enable the LDAP plugin and configure its settings. - -Here's a typical LDAP setup:: - - Connection settings - Enable LDAP = checked - Host = host.example.com - Port = 389 - Account = - Password = - Connection Security = LDAPS connection - Certificate Checks = DEMAND - - Search settings - Base DN = CN=users,DC=host,DC=example,DC=org - LDAP Filter = (&(objectClass=user)(!(objectClass=computer))) - LDAP Search Scope = SUBTREE - - Attribute mappings - Login Attribute = uid - First Name Attribute = firstName - Last Name Attribute = lastName - Email Attribute = mail - -If your user groups are placed in an Organisation Unit (OU) structure, the Search Settings configuration differs:: - - Search settings - Base DN = DC=host,DC=example,DC=org - LDAP Filter = (&(memberOf=CN=your user group,OU=subunit,OU=unit,DC=host,DC=example,DC=org)(objectClass=user)) - LDAP Search Scope = SUBTREE - -.. _enable_ldap: - -Enable LDAP : required - Whether to use LDAP for authenticating users. - -.. _ldap_host: - -Host : required - LDAP server hostname or IP address. Can be also a comma separated - list of servers to support LDAP fail-over. - -.. _Port: - -Port : required - 389 for un-encrypted LDAP, 636 for SSL-encrypted LDAP. - -.. _ldap_account: - -Account : optional - Only required if the LDAP server does not allow anonymous browsing of - records. This should be a special account for record browsing. This - will require `LDAP Password`_ below. - -.. _LDAP Password: - -Password : optional - Only required if the LDAP server does not allow anonymous browsing of - records. - -.. _Enable LDAPS: - -Connection Security : required - Defines the connection to LDAP server - - No encryption - Plain non encrypted connection - - LDAPS connection - Enable LDAPS connections. It will likely require `Port`_ to be set to - a different value (standard LDAPS port is 636). When LDAPS is enabled - then `Certificate Checks`_ is required. - - START_TLS on LDAP connection - START TLS connection - -.. _Certificate Checks: - -Certificate Checks : optional - How SSL certificates verification is handled -- this is only useful when - `Enable LDAPS`_ is enabled. Only DEMAND or HARD offer full SSL security - while the other options are susceptible to man-in-the-middle attacks. SSL - certificates can be installed to /etc/openldap/cacerts so that the - DEMAND or HARD options can be used with self-signed certificates or - certificates that do not have traceable certificates of authority. - - NEVER - A serve certificate will never be requested or checked. - - ALLOW - A server certificate is requested. Failure to provide a - certificate or providing a bad certificate will not terminate the - session. - - TRY - A server certificate is requested. Failure to provide a - certificate does not halt the session; providing a bad certificate - halts the session. - - DEMAND - A server certificate is requested and must be provided and - authenticated for the session to proceed. - - HARD - The same as DEMAND. - -.. _Base DN: - -Base DN : required - The Distinguished Name (DN) where searches for users will be performed. - Searches can be controlled by `LDAP Filter`_ and `LDAP Search Scope`_. - -.. _LDAP Filter: - -LDAP Filter : optional - A LDAP filter defined by RFC 2254. This is more useful when `LDAP - Search Scope`_ is set to SUBTREE. The filter is useful for limiting - which LDAP objects are identified as representing Users for - authentication. The filter is augmented by `Login Attribute`_ below. - This can commonly be left blank. - -.. _LDAP Search Scope: - -LDAP Search Scope : required - This limits how far LDAP will search for a matching object. - - BASE - Only allows searching of `Base DN`_ and is usually not what you - want. - - ONELEVEL - Searches all entries under `Base DN`_, but not Base DN itself. - - SUBTREE - Searches all entries below `Base DN`_, but not Base DN itself. - When using SUBTREE `LDAP Filter`_ is useful to limit object - location. - -.. _Login Attribute: - -Login Attribute : required - The LDAP record attribute that will be matched as the USERNAME or - ACCOUNT used to connect to Kallithea. This will be added to `LDAP - Filter`_ for locating the User object. If `LDAP Filter`_ is specified as - "LDAPFILTER", `Login Attribute`_ is specified as "uid" and the user has - connected as "jsmith" then the `LDAP Filter`_ will be augmented as below - :: - - (&(LDAPFILTER)(uid=jsmith)) - -.. _ldap_attr_firstname: - -First Name Attribute : required - The LDAP record attribute which represents the user's first name. - -.. _ldap_attr_lastname: - -Last Name Attribute : required - The LDAP record attribute which represents the user's last name. - -.. _ldap_attr_email: - -Email Attribute : required - The LDAP record attribute which represents the user's email address. - -If all data are entered correctly, and python-ldap_ is properly installed -users should be granted access to Kallithea with LDAP accounts. At this -time user information is copied from LDAP into the Kallithea user database. -This means that updates of an LDAP user object may not be reflected as a -user update in Kallithea. - -If You have problems with LDAP access and believe You entered correct -information check out the Kallithea logs, any error messages sent from LDAP -will be saved there. - -Active Directory -'''''''''''''''' - -Kallithea can use Microsoft Active Directory for user authentication. This -is done through an LDAP or LDAPS connection to Active Directory. The -following LDAP configuration settings are typical for using Active -Directory :: - - Base DN = OU=SBSUsers,OU=Users,OU=MyBusiness,DC=v3sys,DC=local - Login Attribute = sAMAccountName - First Name Attribute = givenName - Last Name Attribute = sn - Email Attribute = mail - -All other LDAP settings will likely be site-specific and should be -appropriately configured. - - -Authentication by container or reverse-proxy --------------------------------------------- - -Kallithea supports delegating the authentication -of users to its WSGI container, or to a reverse-proxy server through which all -clients access the application. - -When these authentication methods are enabled in Kallithea, it uses the -username that the container/proxy (Apache or Nginx, etc.) provides and doesn't -perform the authentication itself. The authorization, however, is still done by -Kallithea according to its settings. - -When a user logs in for the first time using these authentication methods, -a matching user account is created in Kallithea with default permissions. An -administrator can then modify it using Kallithea's admin interface. - -It's also possible for an administrator to create accounts and configure their -permissions before the user logs in for the first time, using the :ref:`create-user` API. - -Container-based authentication -'''''''''''''''''''''''''''''' - -In a container-based authentication setup, Kallithea reads the user name from -the ``REMOTE_USER`` server variable provided by the WSGI container. - -After setting up your container (see `Apache with mod_wsgi`_), you'll need -to configure it to require authentication on the location configured for -Kallithea. - -Proxy pass-through authentication -''''''''''''''''''''''''''''''''' - -In a proxy pass-through authentication setup, Kallithea reads the user name -from the ``X-Forwarded-User`` request header, which should be configured to be -sent by the reverse-proxy server. - -After setting up your proxy solution (see `Apache virtual host reverse proxy example`_, -`Apache as subdirectory`_ or `Nginx virtual host example`_), you'll need to -configure the authentication and add the username in a request header named -``X-Forwarded-User``. - -For example, the following config section for Apache sets a subdirectory in a -reverse-proxy setup with basic auth: - -.. code-block:: apache - - - ProxyPass http://127.0.0.1:5000/someprefix - ProxyPassReverse http://127.0.0.1:5000/someprefix - SetEnvIf X-Url-Scheme https HTTPS=1 - - AuthType Basic - AuthName "Kallithea authentication" - AuthUserFile /srv/kallithea/.htpasswd - Require valid-user - - RequestHeader unset X-Forwarded-User - - RewriteEngine On - RewriteCond %{LA-U:REMOTE_USER} (.+) - RewriteRule .* - [E=RU:%1] - RequestHeader set X-Forwarded-User %{RU}e - - -.. note:: - If you enable proxy pass-through authentication, make sure your server is - only accessible through the proxy. Otherwise, any client would be able to - forge the authentication header and could effectively become authenticated - using any account of their liking. - Integration with issue trackers ------------------------------- Kallithea provides a simple integration with issue trackers. It's possible to define a regular expression that will match an issue ID in commit messages, -and have that replaced with a URL to the issue. To enable this simply -uncomment the following variables in the ini file:: +and have that replaced with a URL to the issue. + +This is achieved with following three variables in the ini file:: - issue_pat = (?:^#|\s#)(\w+) - issue_server_link = https://issues.example.com/{repo}/issue/{id} - issue_prefix = # + issue_pat = #(\d+) + issue_server_link = https://issues.example.com/{repo}/issue/\1 + issue_sub = ``issue_pat`` is the regular expression describing which strings in -commit messages will be treated as issue references. A match group in -parentheses should be used to specify the actual issue id. +commit messages will be treated as issue references. The expression can/should +have one or more parenthesized groups that can later be referred to in +``issue_server_link`` and ``issue_sub`` (see below). If you prefer, named groups +can be used instead of simple parenthesized groups. -The default expression matches issues in the format ``#``, e.g., ``#300``. +If the pattern should only match if it is preceded by whitespace, add the +following string before the actual pattern: ``(?:^|(?<=\s))``. +If the pattern should only match if it is followed by whitespace, add the +following string after the actual pattern: ``(?:$|(?=\s))``. +These expressions use lookbehind and lookahead assertions of the Python regular +expression module to avoid the whitespace to be part of the actual pattern, +otherwise the link text will also contain that whitespace. Matched issue references are replaced with the link specified in -``issue_server_link``. ``{id}`` is replaced with the issue ID, and -``{repo}`` with the repository name. Since the # is stripped away, -``issue_prefix`` is prepended to the link text. ``issue_prefix`` doesn't -necessarily need to be ``#``: if you set issue prefix to ``ISSUE-`` this will -generate a URL in the format: +``issue_server_link``, in which any backreferences are resolved. Backreferences +can be ``\1``, ``\2``, ... or for named groups ``\g``. +The special token ``{repo}`` is replaced with the full repository path +(including repository groups), while token ``{repo_name}`` is replaced with the +repository name (without repository groups). + +The link text is determined by ``issue_sub``, which can be a string containing +backreferences to the groups specified in ``issue_pat``. If ``issue_sub`` is +empty, then the text matched by ``issue_pat`` is used verbatim. + +The example settings shown above match issues in the format ``#``. +This will cause the text ``#300`` to be transformed into a link: .. code-block:: html - ISSUE-300 + #300 + +The following example transforms a text starting with either of 'pullrequest', +'pull request' or 'PR', followed by an optional space, then a pound character +(#) and one or more digits, into a link with the text 'PR #' followed by the +digits:: + + issue_pat = (pullrequest|pull request|PR) ?#(\d+) + issue_server_link = https://issues.example.com/\2 + issue_sub = PR #\2 + +The following example demonstrates how to require whitespace before the issue +reference in order for it to be recognized, such that the text ``issue#123`` will +not cause a match, but ``issue #123`` will:: + + issue_pat = (?:^|(?<=\s))#(\d+) + issue_server_link = https://issues.example.com/\1 + issue_sub = If needed, more than one pattern can be specified by appending a unique suffix to -the variables. For example:: +the variables. For example, also demonstrating the use of named groups:: - issue_pat_wiki = (?:wiki-)(.+) - issue_server_link_wiki = https://wiki.example.com/{id} - issue_prefix_wiki = WIKI- + issue_pat_wiki = wiki-(?P\S+) + issue_server_link_wiki = https://wiki.example.com/\g + issue_sub_wiki = WIKI-\g With these settings, wiki pages can be referenced as wiki-some-id, and every such reference will be transformed into: @@ -478,6 +236,9 @@ such reference will be transformed into: WIKI-some-id +Refer to the `Python regular expression documentation`_ for more details about +the supported syntax in ``issue_pat``, ``issue_server_link`` and ``issue_sub``. + Hook management --------------- @@ -502,6 +263,9 @@ encoding of commit messages. In addition library is installed. If ``chardet`` is detected Kallithea will fallback to it when there are encode/decode errors. +The Mercurial encoding is configurable as ``hgencoding``. It is similar to +setting the ``HGENCODING`` environment variable, but will override it. + Celery configuration -------------------- @@ -531,7 +295,10 @@ Celery. So for example setting `BROKER_H To start the Celery process, run:: - paster celeryd + kallithea-cli celery-run -c my.ini + +Extra options to the Celery worker can be passed after ``--`` - see ``-- -h`` +for more info. .. note:: Make sure you run this command from the same virtualenv, and with the same @@ -552,6 +319,8 @@ directly which scheme/protocol Kallithea - With ``force_https = true`` the default will be ``https``. - With ``use_htsts = true``, Kallithea will set ``Strict-Transport-Security`` when using https. +.. _nginx_virtual_host: + Nginx virtual host example -------------------------- @@ -606,7 +375,7 @@ Sample config for Nginx using proxy: ## uncomment root directive if you want to serve static files by nginx ## requires static_files = false in .ini file - #root /path/to/installation/kallithea/public; + #root /srv/kallithea/kallithea/kallithea/public; include /etc/nginx/proxy.conf; location / { try_files $uri @kallithea; @@ -640,6 +409,8 @@ pushes or large pushes:: client_body_buffer_size 128k; large_client_header_buffers 8 64k; +.. _apache_virtual_host_reverse_proxy: + Apache virtual host reverse proxy example ----------------------------------------- @@ -661,7 +432,7 @@ Here is a sample configuration file for #important ! - #Directive to properly generate url (clone url) for pylons + #Directive to properly generate url (clone url) for Kallithea ProxyPreserveHost On #kallithea instance @@ -675,6 +446,8 @@ Here is a sample configuration file for Additional tutorial http://pylonsbook.com/en/1.1/deployment.html#using-apache-to-proxy-requests-to-pylons +.. _apache_subdirectory: + Apache as subdirectory ---------------------- @@ -683,9 +456,9 @@ Apache subdirectory part: .. code-block:: apache - > - ProxyPass http://127.0.0.1:5000/ - ProxyPassReverse http://127.0.0.1:5000/ + + ProxyPass http://127.0.0.1:5000/PREFIX + ProxyPassReverse http://127.0.0.1:5000/PREFIX SetEnvIf X-Url-Scheme https HTTPS=1 @@ -698,9 +471,11 @@ Add the following at the end of the .ini [filter:proxy-prefix] use = egg:PasteDeploy#prefix - prefix = / + prefix = /PREFIX -then change ```` into your chosen prefix +then change ``PREFIX`` into your chosen prefix + +.. _apache_mod_wsgi: Apache with mod_wsgi @@ -755,27 +530,21 @@ usually ``www-data`` or ``apache``. If y directory owned by a different user, use the user and group options to WSGIDaemonProcess to set the name of the user and group. -.. note:: - If running Kallithea in multiprocess mode, - make sure you set ``instance_id = *`` in the configuration so each process - gets it's own cache invalidation key. - Example WSGI dispatch script: .. code-block:: python import os - os.environ["HGENCODING"] = "UTF-8" os.environ['PYTHON_EGG_CACHE'] = '/srv/kallithea/.egg-cache' - # sometimes it's needed to set the curent dir + # 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") ini = '/srv/kallithea/my.ini' - from paste.script.util.logging_config import fileConfig + from logging.config import fileConfig fileConfig(ini) from paste.deploy import loadapp application = loadapp('config:' + ini) @@ -791,7 +560,7 @@ Or using proper virtualenv activation: os.environ['HOME'] = '/srv/kallithea' ini = '/srv/kallithea/kallithea.ini' - from paste.script.util.logging_config import fileConfig + from logging.config import fileConfig fileConfig(ini) from paste.deploy import loadapp application = loadapp('config:' + ini) @@ -808,11 +577,11 @@ the ``init.d`` directory of the Kallithe .. _virtualenv: http://pypi.python.org/pypi/virtualenv .. _python: http://www.python.org/ +.. _Python regular expression documentation: https://docs.python.org/2/library/re.html .. _Mercurial: https://www.mercurial-scm.org/ .. _Celery: http://celeryproject.org/ .. _Celery documentation: http://docs.celeryproject.org/en/latest/getting-started/index.html .. _RabbitMQ: http://www.rabbitmq.com/ .. _Redis: http://redis.io/ -.. _python-ldap: http://www.python-ldap.org/ .. _mercurial-server: http://www.lshift.net/mercurial-server.html .. _PublishingRepositories: https://www.mercurial-scm.org/wiki/PublishingRepositories diff --git a/docs/theme/nature/static/nature.css_t b/docs/theme/nature/static/nature.css_t --- a/docs/theme/nature/static/nature.css_t +++ b/docs/theme/nature/static/nature.css_t @@ -2,11 +2,11 @@ * Sphinx stylesheet -- default theme * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ - + @import url("basic.css"); - + /* -- page layout ----------------------------------------------------------- */ - + body { font-family: Arial, sans-serif; font-size: 100%; @@ -28,18 +28,18 @@ div.bodywrapper { hr{ border: 1px solid #B1B4B6; } - + div.document { background-color: #eee; } - + div.body { background-color: #ffffff; color: #3E4349; padding: 0 30px 30px 30px; font-size: 0.8em; } - + div.footer { color: #555; width: 100%; @@ -47,12 +47,12 @@ div.footer { text-align: center; font-size: 75%; } - + div.footer a { color: #444; text-decoration: underline; } - + div.related { background-color: #577632; line-height: 32px; @@ -60,11 +60,11 @@ div.related { text-shadow: 0px 1px 0 #444; font-size: 0.80em; } - + div.related a { color: #E2F3CC; } - + div.sphinxsidebar { font-size: 0.75em; line-height: 1.5em; @@ -73,7 +73,7 @@ div.sphinxsidebar { div.sphinxsidebarwrapper{ padding: 20px 0; } - + div.sphinxsidebar h3, div.sphinxsidebar h4 { font-family: Arial, sans-serif; @@ -89,30 +89,29 @@ div.sphinxsidebar h4 { div.sphinxsidebar h4{ font-size: 1.1em; } - + div.sphinxsidebar h3 a { color: #444; } - - + div.sphinxsidebar p { color: #888; padding: 5px 20px; } - + div.sphinxsidebar p.topless { } - + div.sphinxsidebar ul { margin: 10px 20px; padding: 0; color: #000; } - + div.sphinxsidebar a { color: #444; } - + div.sphinxsidebar input { border: 1px solid #ccc; font-family: sans-serif; @@ -126,19 +125,19 @@ div.sphinxsidebar input[type=text]{ div.sphinxsidebar input[type=image] { border: 0; } - + /* -- body styles ----------------------------------------------------------- */ - + a { color: #005B81; text-decoration: none; } - + a:hover { color: #E32E00; text-decoration: underline; } - + div.body h1, div.body h2, div.body h3, @@ -153,30 +152,30 @@ div.body h6 { padding: 5px 0 5px 10px; text-shadow: 0px 1px 0 white } - + div.body h1 { border-top: 20px solid white; margin-top: 0; font-size: 200%; } div.body h2 { font-size: 150%; background-color: #C8D5E3; } div.body h3 { font-size: 120%; background-color: #D8DEE3; } div.body h4 { font-size: 110%; background-color: #D8DEE3; } div.body h5 { font-size: 100%; background-color: #D8DEE3; } div.body h6 { font-size: 100%; background-color: #D8DEE3; } - + a.headerlink { color: #c60f0f; font-size: 0.8em; padding: 0 4px 0 4px; text-decoration: none; } - + a.headerlink:hover { background-color: #c60f0f; color: white; } - + div.body p, div.body dd, div.body li { line-height: 1.5em; } - + div.admonition p.admonition-title + p { display: inline; } @@ -189,29 +188,29 @@ div.note { background-color: #eee; border: 1px solid #ccc; } - + div.seealso { background-color: #ffc; border: 1px solid #ff6; } - + div.topic { background-color: #eee; } - + div.warning { background-color: #ffe4e4; border: 1px solid #f66; } - + p.admonition-title { display: inline; } - + p.admonition-title:after { content: ":"; } - + pre { padding: 10px; background-color: White; @@ -222,7 +221,7 @@ pre { margin: 1.5em 0 1.5em 0; box-shadow: 1px 1px 1px #d8d8d8; } - + tt { background-color: #ecf0f3; color: #222; diff --git a/docs/upgrade.rst b/docs/upgrade.rst new file mode 100644 --- /dev/null +++ b/docs/upgrade.rst @@ -0,0 +1,246 @@ +.. _upgrade: + +=================== +Upgrading Kallithea +=================== + +This describes the process for upgrading Kallithea, independently of the +Kallithea installation method. + +.. note:: + If you are upgrading from a RhodeCode installation, you must first + install Kallithea 0.3.2 and follow the instructions in the 0.3.2 + README to perform a one-time conversion of the database from + RhodeCode to Kallithea, before upgrading to the latest version + of Kallithea. + + +1. Stop the Kallithea web application +------------------------------------- + +This step depends entirely on the web server software used to serve +Kallithea, but in any case, Kallithea should not be running during +the upgrade. + +.. note:: + If you're using Celery, make sure you stop all instances during the + upgrade. + + +2. Create a backup of both database and configuration +----------------------------------------------------- + +You are of course strongly recommended to make backups regularly, but it +is *especially* important to make a full database and configuration +backup before performing a Kallithea upgrade. + +Back up your configuration +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Make a copy of your Kallithea configuration (``.ini``) file. + +If you are using :ref:`rcextensions `, you should also +make a copy of the entire ``rcextensions`` directory. + +Back up your database +^^^^^^^^^^^^^^^^^^^^^ + +If using SQLite, simply make a copy of the Kallithea database (``.db``) +file. + +If using PostgreSQL, please consult the documentation for the ``pg_dump`` +utility. + +If using MySQL, please consult the documentation for the ``mysqldump`` +utility. + +Look for ``sqlalchemy.url`` in your configuration file to determine +database type, settings, location, etc. If you were running Kallithea 0.3.x or +older, this was ``sqlalchemy.db1.url``. + + +3. Activate or recreate the Kallithea virtual environment (if any) +------------------------------------------------------------------ + +.. note:: + If you did not install Kallithea in a virtual environment, skip this step. + +For major upgrades, e.g. from 0.3.x to 0.4.x, it is recommended to create a new +virtual environment, rather than reusing the old. For minor upgrades, e.g. +within the 0.4.x range, this is not really necessary (but equally fine). + +To create a new virtual environment, please refer to the appropriate +installation page for details. After creating and activating the new virtual +environment, proceed with the rest of the upgrade process starting from the next +section. + +To reuse the same virtual environment, first activate it, then verify that you +are using the correct environment by running:: + + pip freeze + +This will list all packages installed in the current environment. If +Kallithea isn't listed, deactivate the environment and then activate the correct +one, or recreate a new environment. See the appropriate installation page for +details. + + +4. Install new version of Kallithea +----------------------------------- + +Please refer to the instructions for the installation method you +originally used to install Kallithea. + +If you originally installed using pip, it is as simple as:: + + pip install --upgrade kallithea + +If you originally installed from version control, assuming you did not make +private changes (in which case you should adapt the instructions accordingly):: + + cd my-kallithea-clone + hg parent # make a note of the original revision + hg pull + hg update + hg parent # make a note of the new revision + pip install --upgrade -e . + +.. _upgrade_config: + + +5. Upgrade your configuration +----------------------------- + +Run the following command to create a new configuration (``.ini``) file:: + + kallithea-cli config-create new.ini + +Then compare it with your old config file and copy over the required +configuration values from the old to the new file. + +.. note:: + Please always make sure your ``.ini`` files are up to date. Errors + can often be caused by missing parameters added in new versions. + +.. _upgrade_db: + + +6. Upgrade your database +------------------------ + +.. note:: + If you are *downgrading* Kallithea, you should perform the database + migration step *before* installing the older version. (That is, + always perform migrations using the most recent of the two versions + you're migrating between.) + +First, run the following command to see your current database version:: + + alembic -c new.ini current + +Typical output will be something like "9358dc3d6828 (head)", which is +the current Alembic database "revision ID". Write down the entire output +for troubleshooting purposes. + +The output will be empty if you're upgrading from Kallithea 0.3.x or +older. That's expected. If you get an error that the config file was not +found or has no ``[alembic]`` section, see the next section. + +Next, if you are performing an *upgrade*: Run the following command to +upgrade your database to the current Kallithea version:: + + alembic -c new.ini upgrade head + +If you are performing a *downgrade*: Run the following command to +downgrade your database to the given version:: + + alembic -c new.ini downgrade 0.4 + +Alembic will show the necessary migrations (if any) as it executes them. +If no "ERROR" is displayed, the command was successful. + +Should an error occur, the database may be "stranded" half-way +through the migration, and you should restore it from backup. + +Enabling old Kallithea config files for Alembic use +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Kallithea configuration files created before the introduction of Alembic +(i.e. predating Kallithea 0.4) need to be updated for use with Alembic. +Without this, Alembic will fail with an error like this:: + + FAILED: No config file 'my.ini' found, or file has no '[alembic]' section + +.. note:: + If you followed this upgrade guide correctly, you will have created a + new configuration file in section :ref:`Upgrading your configuration + `. When calling Alembic, make + sure to use this new config file. In this case, you should not get any + errors and the below manual steps should not be needed. + +If Alembic complains specifically about a missing ``alembic.ini``, it is +likely because you did not specify a config file using the ``-c`` option. +On the other hand, if the mentioned config file actually exists, you +need to append the following lines to it:: + + [alembic] + script_location = kallithea:alembic + +Your config file should now work with Alembic. + + +7. Prepare the front-end +------------------------ + +Starting with Kallithea 0.4, external front-end dependencies are no longer +shipped but need to be downloaded and/or generated at installation time. Run the +following command:: + + kallithea-cli front-end-build + + +8. Rebuild the Whoosh full-text index +------------------------------------- + +It is recommended that you rebuild the Whoosh index after upgrading since +new Whoosh versions can introduce incompatible index changes. + + +9. Start the Kallithea web application +-------------------------------------- + +This step once again depends entirely on the web server software used to +serve Kallithea. + +If you were running Kallithea 0.3.x or older and were using ``paster serve +my.ini`` before, then the corresponding command in Kallithea 0.4 and later is:: + + gearbox serve -c new.ini + +Before starting the new version of Kallithea, you may find it helpful to +clear out your log file so that new errors are readily apparent. + +.. note:: + If you're using Celery, make sure you restart all instances of it after + upgrade. + + +10. Update Git repository hooks +------------------------------- + +It is possible that an upgrade involves changes to the Git hooks installed by +Kallithea. As these hooks are created inside the repositories on the server +filesystem, they are not updated automatically when upgrading Kallithea itself. + +To update the hooks of your Git repositories: + +* Go to *Admin > Settings > Remap and Rescan* +* Select the checkbox *Install Git hooks* +* Click the button *Rescan repositories* + +.. note:: + Kallithea does not use hooks on Mercurial repositories. This step is thus + not necessary if you only have Mercurial repositories. + + +.. _virtualenv: http://pypi.python.org/pypi/virtualenv diff --git a/docs/usage/customization.rst b/docs/usage/customization.rst new file mode 100644 --- /dev/null +++ b/docs/usage/customization.rst @@ -0,0 +1,70 @@ +.. _customization: + +============= +Customization +============= + +There are several ways to customize Kallithea to your needs depending on what +you want to achieve. + + +HTML/JavaScript/CSS customization +--------------------------------- + +To customize the look-and-feel of the web interface (for example to add a +company banner or some JavaScript widget or to tweak the CSS style definitions) +you can enter HTML code (possibly with JavaScript and/or CSS) directly via the +*Admin > Settings > Global > HTML/JavaScript customization +block*. + + +Style sheet customization with Less +----------------------------------- + +Kallithea uses `Bootstrap 3`_ and Less_ for its style definitions. If you want +to make some customizations, we recommend to do so by creating a ``theme.less`` +file. When you create a file named ``theme.less`` in the Kallithea root +directory, you can use this file to override the default style. For example, +you can use this to override ``@kallithea-theme-main-color``, +``@kallithea-logo-url`` or other `Bootstrap variables`_. + +After creating the ``theme.less`` file, you need to regenerate the CSS files, by +running:: + + kallithea-cli front-end-build --no-install-deps + +.. _bootstrap 3: https://getbootstrap.com/docs/3.3/ +.. _bootstrap variables: https://getbootstrap.com/docs/3.3/customize/#less-variables +.. _less: http://lesscss.org/ + + +Behavioral customization: rcextensions +-------------------------------------- + +Some behavioral customization can be done in Python using ``rcextensions``, a +custom Python package that can extend Kallithea functionality. + +With ``rcextensions`` it's possible to add additional mappings for Whoosh +indexing and statistics, to add additional code into the push/pull/create/delete +repository hooks (for example to send signals to build bots such as Jenkins) and +even to monkey-patch certain parts of the Kallithea source code (for example +overwrite an entire function, change a global variable, ...). + +To generate a skeleton extensions package, run:: + + kallithea-cli extensions-create -c my.ini + +This will create an ``rcextensions`` package next to the specified ``ini`` file. +See the ``__init__.py`` file inside the generated ``rcextensions`` package +for more details. + + +Behavioral customization: code changes +-------------------------------------- + +As Kallithea is open-source software, you can make any changes you like directly +in the source code. + +We encourage you to send generic improvements back to the +community so that Kallithea can become better. See :ref:`contributing` for more +details. diff --git a/docs/usage/debugging.rst b/docs/usage/debugging.rst --- a/docs/usage/debugging.rst +++ b/docs/usage/debugging.rst @@ -25,7 +25,7 @@ Enable interactive debug mode To enable interactive debug mode simply comment out ``set debug = false`` in the .ini file. This will trigger an interactive debugger each time -there is an error in the browser, or send a http link if an error occured in the backend. This +there is an error in the browser, or send a http link if an error occurred in the backend. This is a great tool for fast debugging as you get a handy Python console right in the web view. diff --git a/docs/usage/email.rst b/docs/usage/email.rst --- a/docs/usage/email.rst +++ b/docs/usage/email.rst @@ -12,8 +12,17 @@ cannot be sent, all mails will show up i Before any email can be sent, an SMTP server has to be configured using the configuration file setting ``smtp_server``. If required for that server, specify a username (``smtp_username``) and password (``smtp_password``), a non-standard -port (``smtp_port``), encryption settings (``smtp_use_tls`` or ``smtp_use_ssl``) -and/or specific authentication parameters (``smtp_auth``). +port (``smtp_port``), whether to use "SSL" when connecting (``smtp_use_ssl``) +or use STARTTLS (``smtp_use_tls``), and/or specify special ESMTP "auth" features +(``smtp_auth``). + +For example, for sending through gmail, use:: + + smtp_server = smtp.gmail.com + smtp_username = username + smtp_password = password + smtp_port = 465 + smtp_use_ssl = true Application emails @@ -67,9 +76,8 @@ Error emails When an exception occurs in Kallithea -- and unless interactive debugging is enabled using ``set debug = true`` in the ``[app:main]`` section of the -configuration file -- an email with exception details is sent by WebError_'s -``ErrorMiddleware`` to the addresses specified in ``email_to`` in the -configuration file. +configuration file -- an email with exception details is sent by backlash_ +to the addresses specified in ``email_to`` in the configuration file. Recipients will see these emails originating from the sender specified in the ``error_email_from`` setting in the configuration file. This setting can either @@ -77,10 +85,6 @@ contain only an email address, like `kal a name and an address in the following format: `Kallithea Errors `. -*Note:* The WebError_ package does not respect ``smtp_port`` and assumes the -standard SMTP port (25). If you have a remote SMTP server with a different port, -you could set up a local forwarding SMTP server on port 25. - References ---------- @@ -89,4 +93,4 @@ References - `ErrorHandler (Pylons modules documentation) `_ -.. _WebError: https://pypi.python.org/pypi/WebError +.. _backlash: https://github.com/TurboGears/backlash diff --git a/docs/usage/general.rst b/docs/usage/general.rst --- a/docs/usage/general.rst +++ b/docs/usage/general.rst @@ -8,18 +8,18 @@ General Kallithea usage Repository deletion ------------------- -Currently when an admin or owner deletes a repository, Kallithea does +When an admin or owner deletes a repository, Kallithea does not physically delete said repository from the filesystem, but instead renames it in a special way so that it is not possible to push, clone or access the repository. There is a special command for cleaning up such archived repositories:: - paster cleanup-repos --older-than=30d my.ini + kallithea-cli repo-purge-deleted -c my.ini --older-than=30d This command scans for archived repositories that are older than 30 days, displays them, and asks if you want to delete them (unless given -the ``--dont-ask`` flag). If you host a large amount of repositories with +the ``--no-ask`` flag). If you host a large amount of repositories with forks that are constantly being deleted, it is recommended that you run this command via crontab. @@ -151,7 +151,7 @@ described in more detail in this documen features that merit further explanation. Repository extra fields -~~~~~~~~~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^^^^^^^^^ In the *Visual* tab, there is an option "Use repository extra fields", which allows to set custom fields for each repository in the system. @@ -165,7 +165,7 @@ about a manager of each repository. The Newly created fields are accessible via the API. Meta tagging -~~~~~~~~~~~~ +^^^^^^^^^^^^ In the *Visual* tab, option "Stylify recognised meta tags" will cause Kallithea to turn certain text fragments in repository and repository group diff --git a/docs/usage/performance.rst b/docs/usage/performance.rst --- a/docs/usage/performance.rst +++ b/docs/usage/performance.rst @@ -4,59 +4,65 @@ Optimizing Kallithea performance ================================ -When serving a large amount of big repositories, Kallithea can start -performing slower than expected. Because of the demanding nature of handling large -amounts of data from version control systems, here are some tips on how to get -the best performance. +When serving a large amount of big repositories, Kallithea can start performing +slower than expected. Because of the demanding nature of handling large amounts +of data from version control systems, here are some tips on how to get the best +performance. + -* Kallithea is often I/O bound, and hence a fast disk (SSD/SAN) is - usually more important than a fast CPU. +Fast storage +------------ -* Sluggish loading of the front page can easily be fixed by grouping repositories or by - increasing cache size (see below). This includes using the lightweight dashboard - option and ``vcs_full_cache`` setting in .ini file. +Kallithea is often I/O bound, and hence a fast disk (SSD/SAN) and plenty of RAM +is usually more important than a fast CPU. + -Follow these few steps to improve performance of Kallithea system. +Caching +------- -1. Increase cache +Tweak beaker cache settings in the ini file. The actual effect of that is +questionable. - Tweak beaker cache settings in the ini file. The actual effect of that - is questionable. -2. Switch from SQLite to PostgreSQL or MySQL +Database +-------- - SQLite is a good option when having a small load on the system. But due to - locking issues with SQLite, it is not recommended to use it for larger - deployments. Switching to MySQL or PostgreSQL will result in an immediate - performance increase. A tool like SQLAlchemyGrate_ can be used for - migrating to another database platform. +SQLite is a good option when having a small load on the system. But due to +locking issues with SQLite, it is not recommended to use it for larger +deployments. -3. Scale Kallithea horizontally +Switching to MySQL or PostgreSQL will result in an immediate performance +increase. A tool like SQLAlchemyGrate_ can be used for migrating to another +database platform. + - Scaling horizontally can give huge performance benefits when dealing with - large amounts of traffic (many users, CI servers, etc.). Kallithea can be - scaled horizontally on one (recommended) or multiple machines. +Horizontal scaling +------------------ - It is generally possible to run WSGI applications multithreaded, so that - several HTTP requests are served from the same Python process at once. That - can in principle give better utilization of internal caches and less - process overhead. +Scaling horizontally means running several Kallithea instances and let them +share the load. That can give huge performance benefits when dealing with large +amounts of traffic (many users, CI servers, etc.). Kallithea can be scaled +horizontally on one (recommended) or multiple machines. - One danger of running multithreaded is that program execution becomes much - more complex; programs must be written to consider all combinations of - events and problems might depend on timing and be impossible to reproduce. +It is generally possible to run WSGI applications multithreaded, so that +several HTTP requests are served from the same Python process at once. That can +in principle give better utilization of internal caches and less process +overhead. - Kallithea can't promise to be thread-safe, just like the embedded Mercurial - backend doesn't make any strong promises when used as Kallithea uses it. - Instead, we recommend scaling by using multiple server processes. +One danger of running multithreaded is that program execution becomes much more +complex; programs must be written to consider all combinations of events and +problems might depend on timing and be impossible to reproduce. - Web servers with multiple worker processes (such as ``mod_wsgi`` with the - ``WSGIDaemonProcess`` ``processes`` parameter) will work out of the box. +Kallithea can't promise to be thread-safe, just like the embedded Mercurial +backend doesn't make any strong promises when used as Kallithea uses it. +Instead, we recommend scaling by using multiple server processes. - In order to scale horizontally on multiple machines, you need to do the - following: +Web servers with multiple worker processes (such as ``mod_wsgi`` with the +``WSGIDaemonProcess`` ``processes`` parameter) will work out of the box. - - Each instance needs its own .ini file and unique ``instance_id`` set. +In order to scale horizontally on multiple machines, you need to do the +following: + - Each instance's ``data`` storage needs to be configured to be stored on a shared disk storage, preferably together with repositories. This ``data`` dir contains template caches, sessions, whoosh index and is used for @@ -71,4 +77,42 @@ Follow these few steps to improve perfor servers or build bots. +Serve static files directly from the web server +----------------------------------------------- + +With the default ``static_files`` ini setting, the Kallithea WSGI application +will take care of serving the static files from ``kallithea/public/`` at the +root of the application URL. + +The actual serving of the static files is very fast and unlikely to be a +problem in a Kallithea setup - the responses generated by Kallithea from +database and repository content will take significantly more time and +resources. + +To serve static files from the web server, use something like this Apache config +snippet:: + + Alias /images/ /srv/kallithea/kallithea/kallithea/public/images/ + Alias /css/ /srv/kallithea/kallithea/kallithea/public/css/ + Alias /js/ /srv/kallithea/kallithea/kallithea/public/js/ + Alias /codemirror/ /srv/kallithea/kallithea/kallithea/public/codemirror/ + Alias /fontello/ /srv/kallithea/kallithea/kallithea/public/fontello/ + +Then disable serving of static files in the ``.ini`` ``app:main`` section:: + + static_files = false + +If using Kallithea installed as a package, you should be able to find the files +under ``site-packages/kallithea``, either in your Python installation or in your +virtualenv. When upgrading, make sure to update the web server configuration +too if necessary. + +It might also be possible to improve performance by configuring the web server +to compress responses (served from static files or generated by Kallithea) when +serving them. That might also imply buffering of responses - that is more +likely to be a problem; large responses (clones or pulls) will have to be fully +processed and spooled to disk or memory before the client will see any +response. See the documentation for your web server. + + .. _SQLAlchemyGrate: https://github.com/shazow/sqlalchemygrate diff --git a/docs/usage/troubleshooting.rst b/docs/usage/troubleshooting.rst --- a/docs/usage/troubleshooting.rst +++ b/docs/usage/troubleshooting.rst @@ -63,7 +63,7 @@ Troubleshooting | :Q: **Requests hanging on Windows** -:A: Please try out with disabled Antivirus software, there are some known problems with Eset Anitivirus. Make sure +:A: Please try out with disabled Antivirus software, there are some known problems with Eset Antivirus. Make sure you have installed the latest Windows patches (especially KB2789397). diff --git a/docs/usage/vcs_support.rst b/docs/usage/vcs_notes.rst copy from docs/usage/vcs_support.rst copy to docs/usage/vcs_notes.rst --- a/docs/usage/vcs_support.rst +++ b/docs/usage/vcs_notes.rst @@ -1,57 +1,80 @@ -.. _vcs_support: - -=============================== -Version control systems support -=============================== - -Kallithea supports Git and Mercurial repositories out-of-the-box. -For Git, you do need the ``git`` command line client installed on the server. +.. _vcs_notes: -You can always disable Git or Mercurial support by editing the -file ``kallithea/__init__.py`` and commenting out the backend. - -.. code-block:: python +=================================== +Version control systems usage notes +=================================== - BACKENDS = { - 'hg': 'Mercurial repository', - #'git': 'Git repository', - } - - -Git support ------------ +.. _importing: -Web server with chunked encoding -```````````````````````````````` +Importing existing repositories +------------------------------- + +There are two main methods to import repositories in Kallithea: via the web +interface or via the filesystem. If you have a large number of repositories to +import, importing them via the filesystem is more convenient. + +Importing via web interface +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +For a small number of repositories, it may be easier to create the target +repositories through the Kallithea web interface, via *Admin > Repositories* or +via the *Add Repository* button on the entry page of the web interface. -Large Git pushes require an HTTP server with support for -chunked encoding for POST. The Python web servers waitress_ and -gunicorn_ (Linux only) can be used. By default, Kallithea uses -waitress_ for `paster serve` instead of the built-in `paste` WSGI -server. +Repositories can be nested in repository groups by first creating the group (via +*Admin > Repository Groups* or via the *Add Repository Group* button on the +entry page of the web interface) and then selecting the appropriate group when +adding the repository. -The paster server is controlled in the .ini file:: +After creation of the (empty) repository, push the existing commits to the +*Clone URL* displayed on the repository summary page. For Git repositories, +first add the *Clone URL* as remote, then push the commits to that remote. The +specific commands to execute are shown under the *Existing repository?* section +of the new repository's summary page. + +A benefit of this method particular for Git repositories, is that the +Kallithea-specific Git hooks are installed automatically. For Mercurial, no +hooks are required anyway. - use = egg:waitress#main +Importing via the filesystem +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The alternative method of importing repositories consists of creating the +repositories in the desired hierarchy on the filesystem and letting Kallithea +scan that location. -or:: - - use = egg:gunicorn#main +All repositories are stored in a central location on the filesystem. This +location is specified during installation (via ``db-create``) and can be reviewed +at *Admin > Settings > VCS > Location of repositories*. Repository groups +(defined in *Admin > Repository Groups*) are represented by a directory in that +repository location. Repositories of the repository group are nested under that +directory. -Also make sure to comment out the following options:: +To import a set of repositories and organize them in a certain repository group +structure, first place clones in the desired hierarchy at the configured +repository location. +These clones should be created without working directory. For Mercurial, this is +done with ``hg clone -U``, for Git with ``git clone --bare``. + +When the repositories are added correctly on the filesystem: - threadpool_workers = - threadpool_max_requests = - use_threadpool = +* go to *Admin > Settings > Remap and Rescan* in the Kallithea web interface +* select the *Install Git hooks* checkbox when importing Git repositories +* click *Rescan Repositories* + +This step will scan the filesystem and create the appropriate repository groups +and repositories in Kallithea. + +*Note*: Once repository groups have been created this way, manage their access +permissions through the Kallithea web interface. -Mercurial support ------------------ +Mercurial-specific notes +------------------------ -Working with Mercurial subrepositories -`````````````````````````````````````` +Working with subrepositories +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This section explains how to use Mercurial subrepositories_ in Kallithea. @@ -82,6 +105,4 @@ Next we can edit the subrepository data, update both repositories. -.. _waitress: http://pypi.python.org/pypi/waitress -.. _gunicorn: http://pypi.python.org/pypi/gunicorn .. _subrepositories: http://mercurial.aragost.com/kick-start/en/subrepositories/ diff --git a/init.d/celeryd-upstart.conf b/init.d/celeryd-upstart.conf --- a/init.d/celeryd-upstart.conf +++ b/init.d/celeryd-upstart.conf @@ -2,8 +2,8 @@ # Change variables/paths as necessary and place file /etc/init/celeryd.conf # start/stop/restart as normal upstart job (ie: $ start celeryd) -description "Celery for Kallithea Mercurial Server" -author "Matt Zuba /dev/null + [ -n "$PID" ] && kill $PID &>/dev/null if [ $? = 0 ]; then rm_daemon $DAEMON stat_done @@ -67,4 +67,4 @@ status) ;; *) echo "usage: $0 {start|stop|restart|status}" -esac \ No newline at end of file +esac diff --git a/init.d/kallithea-daemon-debian b/init.d/kallithea-daemon-debian --- a/init.d/kallithea-daemon-debian +++ b/init.d/kallithea-daemon-debian @@ -2,9 +2,9 @@ ######################################## #### THIS IS A DEBIAN INIT.D SCRIPT #### ######################################## - + ### BEGIN INIT INFO -# Provides: kallithea +# Provides: kallithea # Required-Start: $all # Required-Stop: $all # Default-Start: 2 3 4 5 @@ -12,29 +12,29 @@ # Short-Description: starts instance of kallithea # Description: starts instance of kallithea using start-stop-daemon ### END INIT INFO - + APP_NAME="kallithea" APP_HOMEDIR="opt" APP_PATH="/$APP_HOMEDIR/$APP_NAME" - + CONF_NAME="production.ini" - + PID_PATH="$APP_PATH/$APP_NAME.pid" LOG_PATH="$APP_PATH/$APP_NAME.log" - + PYTHON_PATH="/$APP_HOMEDIR/$APP_NAME-venv" - + RUN_AS="root" - -DAEMON="$PYTHON_PATH/bin/paster" - + +DAEMON="$PYTHON_PATH/bin/gearbox" + DAEMON_OPTS="serve --daemon \ --user=$RUN_AS \ --group=$RUN_AS \ --pid-file=$PID_PATH \ - --log-file=$LOG_PATH $APP_PATH/$CONF_NAME" - - + --log-file=$LOG_PATH -c $APP_PATH/$CONF_NAME" + + start() { echo "Starting $APP_NAME" PYTHON_EGG_CACHE="/tmp" start-stop-daemon -d $APP_PATH \ @@ -43,18 +43,18 @@ start() { --user $RUN_AS \ --exec $DAEMON -- $DAEMON_OPTS } - + stop() { echo "Stopping $APP_NAME" start-stop-daemon -d $APP_PATH \ --stop --quiet \ --pidfile $PID_PATH || echo "$APP_NAME - Not running!" - + if [ -f $PID_PATH ]; then rm $PID_PATH fi } - + status() { echo -n "Checking status of $APP_NAME ... " pid=`cat $PID_PATH` @@ -65,7 +65,7 @@ status() { echo "NOT running" fi } - + case "$1" in status) status @@ -87,4 +87,4 @@ case "$1" in *) echo "Usage: $0 {start|stop|restart}" exit 1 -esac \ No newline at end of file +esac diff --git a/init.d/kallithea-daemon-gentoo b/init.d/kallithea-daemon-gentoo --- a/init.d/kallithea-daemon-gentoo +++ b/init.d/kallithea-daemon-gentoo @@ -16,13 +16,13 @@ PYTHON_PATH="/home/$APP_HOMEDIR/v-env" RUN_AS="username" -DAEMON="$PYTHON_PATH/bin/paster" +DAEMON="$PYTHON_PATH/bin/gearbox" DAEMON_OPTS="serve --daemon \ --user=$RUN_AS \ --group=$RUN_AS \ --pid-file=$PID_PATH \ ---log-file=$LOG_PATH $APP_PATH/$CONF_NAME" +--log-file=$LOG_PATH -c $APP_PATH/$CONF_NAME" #extra options opts="${opts} restartdelay" @@ -56,6 +56,6 @@ restartdelay() { #stop() echo "sleep3" sleep 3 - + #start() } diff --git a/init.d/kallithea-daemon-redhat b/init.d/kallithea-daemon-redhat --- a/init.d/kallithea-daemon-redhat +++ b/init.d/kallithea-daemon-redhat @@ -20,7 +20,7 @@ APP_PATH="/var/www/$APP_NAME" CONF_NAME="production.ini" # write to wherever the PID should be stored, just ensure -# that the user you run paster as has the appropriate permissions +# that the user you run gearbox as has the appropriate permissions # same goes for the log file PID_PATH="/var/run/kallithea/pid" LOG_PATH="/var/log/kallithea/kallithea.log" @@ -31,13 +31,13 @@ PYTHON_PATH="/opt/python_virtualenvironm RUN_AS="kallithea" -DAEMON="$PYTHON_PATH/bin/paster" +DAEMON="$PYTHON_PATH/bin/gearbox" DAEMON_OPTS="serve --daemon \ --user=$RUN_AS \ --group=$RUN_AS \ --pid-file=$PID_PATH \ - --log-file=$LOG_PATH $APP_PATH/$CONF_NAME" + --log-file=$LOG_PATH -c $APP_PATH/$CONF_NAME" DESC="kallithea-server" LOCK_FILE="/var/lock/subsys/$APP_NAME" @@ -129,4 +129,4 @@ case "$1" in ;; esac -exit $RETVAL \ No newline at end of file +exit $RETVAL diff --git a/init.d/kallithea-upstart.conf b/init.d/kallithea-upstart.conf --- a/init.d/kallithea-upstart.conf +++ b/init.d/kallithea-upstart.conf @@ -2,8 +2,8 @@ # Change variables/paths as necessary and place file /etc/init/kallithea.conf # start/stop/restart as normal upstart job (ie: $ start kallithea) -description "Kallithea Mercurial Server" -author "Matt Zuba kallithea/brand.py - -BRAND = "kallithea" try: - from kallithea.brand import BRAND + import kallithea.brand except ImportError: pass - -# Prefix for the ui and settings table names -DB_PREFIX = (BRAND + "_") if BRAND != "kallithea" else "" - -# Users.extern_type and .extern_name value for local users -EXTERN_TYPE_INTERNAL = BRAND if BRAND != 'kallithea' else 'internal' - -# db_migrate_version.repository_id value, same as kallithea/lib/dbmigrate/migrate.cfg -DB_MIGRATIONS = BRAND + "_db_migrations" +else: + assert False, 'Database rebranding is no longer supported; see README.' -try: - from kallithea.lib import get_current_revision - _rev = get_current_revision(quiet=True) - if _rev and len(VERSION) > 3: - VERSION += (_rev[0],) -except ImportError: - pass -__version__ = ('.'.join((str(each) for each in VERSION[:3]))) -__dbversion__ = 31 # defines current db version for migrations +__version__ = '.'.join(str(each) for each in VERSION) __platform__ = platform.system() __license__ = 'GPLv3' __py_version__ = sys.version_info @@ -85,17 +61,3 @@ __url__ = 'https://kallithea-scm.org/' is_windows = __platform__ in ['Windows'] is_unix = not is_windows - -if len(VERSION) > 3: - __version__ += '.'+VERSION[3] - - if len(VERSION) > 4: - __version__ += VERSION[4] - else: - __version__ += '0' - -# Hack for making the celery dependency kombu==1.5.1 compatible with Python -# 2.7.11 which has https://hg.python.org/releases/2.7.11/rev/24bdc4940e81 -import uuid -if not hasattr(uuid, '_uuid_generate_random'): - uuid._uuid_generate_random = None diff --git a/kallithea/alembic/env.py b/kallithea/alembic/env.py new file mode 100644 --- /dev/null +++ b/kallithea/alembic/env.py @@ -0,0 +1,105 @@ +# -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Alembic migration environment (configuration). + +import logging +from logging.config import fileConfig + +from alembic import context +from sqlalchemy import engine_from_config, pool + +from kallithea.model import db + + +# The alembic.config.Config object, which wraps the current .ini file. +config = context.config + +# Default to use the main Kallithea database string in [app:main]. +# For advanced uses, this can be overridden by specifying an explicit +# [alembic] sqlalchemy.url. +database_url = ( + config.get_main_option('sqlalchemy.url') or + config.get_section_option('app:main', 'sqlalchemy.url') +) + +# Configure default logging for Alembic. (This can be overriden by the +# config file, but usually isn't.) +logging.getLogger('alembic').setLevel(logging.INFO) + +# Setup Python loggers based on the config file provided to the alembic +# command. If we're being invoked via the Alembic API (presumably for +# stamping during "kallithea-cli db-create"), config_file_name is not available, +# and loggers are assumed to already have been configured. +if config.config_file_name: + fileConfig(config.config_file_name, disable_existing_loggers=False) + + +def include_in_autogeneration(object, name, type, reflected, compare_to): + """Filter changes subject to autogeneration of migrations. """ + + # Don't include changes to sqlite_sequence. + if type == 'table' and name == 'sqlite_sequence': + return False + + return True + + +def run_migrations_offline(): + """Run migrations in 'offline' (--sql) mode. + + This produces an SQL script instead of directly applying the changes. + Some migrations may not run in offline mode. + """ + context.configure( + url=database_url, + literal_binds=True, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online(): + """Run migrations in 'online' mode. + + Connects to the database and directly applies the necessary + migrations. + """ + cfg = config.get_section(config.config_ini_section) + cfg['sqlalchemy.url'] = database_url + connectable = engine_from_config( + cfg, + prefix='sqlalchemy.', + poolclass=pool.NullPool) + + with connectable.connect() as connection: + context.configure( + connection=connection, + + # Support autogeneration of migration scripts based on "diff" between + # current database schema and kallithea.model.db schema. + target_metadata=db.Base.metadata, + include_object=include_in_autogeneration, + render_as_batch=True, # batch mode is needed for SQLite support + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/kallithea/alembic/script.py.mako b/kallithea/alembic/script.py.mako new file mode 100644 --- /dev/null +++ b/kallithea/alembic/script.py.mako @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +## Template for creating new Alembic migration scripts. +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" + +# The following opaque hexadecimal identifiers ("revisions") are used +# by Alembic to track this migration script and its relations to others. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} +branch_labels = ${repr(branch_labels)} +depends_on = ${repr(depends_on)} + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/kallithea/alembic/versions/9358dc3d6828_drop_sqlalchemy_migrate_support.py b/kallithea/alembic/versions/9358dc3d6828_drop_sqlalchemy_migrate_support.py new file mode 100644 --- /dev/null +++ b/kallithea/alembic/versions/9358dc3d6828_drop_sqlalchemy_migrate_support.py @@ -0,0 +1,37 @@ +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +"""Drop SQLAlchemy Migrate support + +Revision ID: 9358dc3d6828 +Revises: +Create Date: 2016-03-01 15:21:30.896585 + +""" + +# The following opaque hexadecimal identifiers ("revisions") are used +# by Alembic to track this migration script and its relations to others. +revision = '9358dc3d6828' +down_revision = None +branch_labels = None +depends_on = None + +from alembic import op + + +def upgrade(): + op.drop_table('db_migrate_version') + + +def downgrade(): + raise NotImplementedError('cannot revert to SQLAlchemy Migrate') diff --git a/kallithea/alembic/versions/a020f7044fd6_rename_hooks.py b/kallithea/alembic/versions/a020f7044fd6_rename_hooks.py new file mode 100644 --- /dev/null +++ b/kallithea/alembic/versions/a020f7044fd6_rename_hooks.py @@ -0,0 +1,61 @@ +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +"""rename hooks + +Revision ID: a020f7044fd6 +Revises: 9358dc3d6828 +Create Date: 2017-11-24 13:35:14.374000 + +""" + +# The following opaque hexadecimal identifiers ("revisions") are used +# by Alembic to track this migration script and its relations to others. +revision = 'a020f7044fd6' +down_revision = '9358dc3d6828' +branch_labels = None +depends_on = None + +from alembic import op +from kallithea.model.db import Ui +from sqlalchemy import Table, MetaData + +meta = MetaData() + + +def upgrade(): + meta.bind = op.get_bind() + ui = Table(Ui.__tablename__, meta, autoload=True) + + ui.update(values={ + 'ui_key': 'prechangegroup.push_lock_handling', + 'ui_value': 'python:kallithea.lib.hooks.push_lock_handling', + }).where(ui.c.ui_key == 'prechangegroup.pre_push').execute() + ui.update(values={ + 'ui_key': 'preoutgoing.pull_lock_handling', + 'ui_value': 'python:kallithea.lib.hooks.pull_lock_handling', + }).where(ui.c.ui_key == 'preoutgoing.pre_pull').execute() + + +def downgrade(): + meta.bind = op.get_bind() + ui = Table(Ui.__tablename__, meta, autoload=True) + + ui.update(values={ + 'ui_key': 'prechangegroup.pre_push', + 'ui_value': 'python:kallithea.lib.hooks.pre_push', + }).where(ui.c.ui_key == 'prechangegroup.push_lock_handling').execute() + ui.update(values={ + 'ui_key': 'preoutgoing.pre_pull', + 'ui_value': 'python:kallithea.lib.hooks.pre_pull', + }).where(ui.c.ui_key == 'preoutgoing.pull_lock_handling').execute() diff --git a/kallithea/bin/base.py b/kallithea/bin/base.py --- a/kallithea/bin/base.py +++ b/kallithea/bin/base.py @@ -111,8 +111,8 @@ class RcConf(object): return True return False - def __eq__(self): - return self._conf.__eq__() + def __eq__(self, other): + return self._conf.__eq__(other) def __repr__(self): return 'RcConf<%s>' % self._conf.__repr__() @@ -158,7 +158,7 @@ class RcConf(object): """ try: with open(self._conf_name, 'rb') as conf: - return json.load(conf) + return json.load(conf) except IOError as e: #sys.stderr.write(str(e) + '\n') pass diff --git a/kallithea/bin/kallithea_api.py b/kallithea/bin/kallithea_api.py --- a/kallithea/bin/kallithea_api.py +++ b/kallithea/bin/kallithea_api.py @@ -121,5 +121,6 @@ def main(argv=None): ) return 0 + if __name__ == '__main__': sys.exit(main(sys.argv)) diff --git a/kallithea/bin/kallithea_backup.py b/kallithea/bin/kallithea_backup.py --- a/kallithea/bin/kallithea_backup.py +++ b/kallithea/bin/kallithea_backup.py @@ -28,11 +28,11 @@ Original author and date, and relevant c import os import sys - import logging import tarfile import datetime import subprocess +import tempfile logging.basicConfig(level=logging.DEBUG, format="%(asctime)s %(levelname)-5.5s %(message)s") @@ -47,7 +47,7 @@ class BackupManager(object): self.repos_path = self.get_repos_path(repos_location) self.backup_server = backup_server - self.backup_file_path = '/tmp' + self.backup_file_path = tempfile.gettempdir() logging.info('starting backup for %s', self.repos_path) logging.info('backup target %s', self.backup_file_path) @@ -86,12 +86,13 @@ class BackupManager(object): '%(backup_server)s' % params] subprocess.call(cmd) - logging.info('Transfered file %s to %s', self.backup_file_name, cmd[4]) + logging.info('Transferred file %s to %s', self.backup_file_name, cmd[4]) def rm_file(self): logging.info('Removing file %s', self.backup_file_name) os.remove(os.path.join(self.backup_file_path, self.backup_file_name)) + if __name__ == "__main__": repo_location = '/home/repo_path' diff --git a/kallithea/bin/kallithea_cli.py b/kallithea/bin/kallithea_cli.py new file mode 100644 --- /dev/null +++ b/kallithea/bin/kallithea_cli.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# 'cli' is the main entry point for 'kallithea-cli', specified in setup.py as entry_points console_scripts +from kallithea.bin.kallithea_cli_base import cli + +# import commands (they will add themselves to the 'cli' object) +import kallithea.bin.kallithea_cli_celery +import kallithea.bin.kallithea_cli_config +import kallithea.bin.kallithea_cli_db +import kallithea.bin.kallithea_cli_extensions +import kallithea.bin.kallithea_cli_front_end +import kallithea.bin.kallithea_cli_iis +import kallithea.bin.kallithea_cli_index +import kallithea.bin.kallithea_cli_ishell +import kallithea.bin.kallithea_cli_repo diff --git a/kallithea/bin/kallithea_cli_base.py b/kallithea/bin/kallithea_cli_base.py new file mode 100644 --- /dev/null +++ b/kallithea/bin/kallithea_cli_base.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import click +import functools +import os + +import kallithea +import logging.config +import paste.deploy + + +# This placeholder is the main entry point for the kallithea-cli command +@click.group() +def cli(): + """Various commands to manage a Kallithea instance.""" + +def register_command(config_file=False, config_file_initialize_app=False): + """Register a kallithea-cli subcommand. + + If one of the config_file flags are true, a config file must be specified + with -c and it is read and logging is configured. The configuration is + available in the kallithea.CONFIG dict. + + If config_file_initialize_app is true, Kallithea, TurboGears global state + (including tg.config), and database access will also be fully initialized. + """ + cli_command = cli.command() + if config_file or config_file_initialize_app: + def annotator(annotated): + @click.option('--config_file', '-c', help="Path to .ini file with app configuration.", + type=click.Path(dir_okay=False, exists=True, readable=True), required=True) + @functools.wraps(annotated) # reuse meta data from the wrapped function so click can see other options + def runtime_wrapper(config_file, *args, **kwargs): + path_to_ini_file = os.path.realpath(config_file) + kallithea.CONFIG = paste.deploy.appconfig('config:' + path_to_ini_file) + logging.config.fileConfig(path_to_ini_file) + if config_file_initialize_app: + kallithea.config.middleware.make_app_without_logging(kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf) + kallithea.lib.utils.setup_cache_regions(kallithea.CONFIG) + return annotated(*args, **kwargs) + return cli_command(runtime_wrapper) + return annotator + return cli_command diff --git a/kallithea/lib/celerypylons/commands.py b/kallithea/bin/kallithea_cli_celery.py rename from kallithea/lib/celerypylons/commands.py rename to kallithea/bin/kallithea_cli_celery.py --- a/kallithea/lib/celerypylons/commands.py +++ b/kallithea/bin/kallithea_cli_celery.py @@ -1,100 +1,39 @@ # -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import click +import kallithea.bin.kallithea_cli_base as cli_base import kallithea -from kallithea.lib.utils import BasePasterCommand, Command, load_rcextensions -from celery.app import app_or_default -from celery.bin import camqadm, celerybeat, celeryd, celeryev -from kallithea.lib.utils2 import str2bool +@cli_base.register_command(config_file_initialize_app=True) +@click.argument('celery_args', nargs=-1) +def celery_run(celery_args): + """Start Celery worker(s) for asynchronous tasks. -__all__ = ['CeleryDaemonCommand', 'CeleryBeatCommand', - 'CAMQPAdminCommand', 'CeleryEventCommand'] - + This commands starts the Celery daemon which will spawn workers to handle + certain asynchronous tasks for Kallithea. -class CeleryCommand(BasePasterCommand): - """Abstract class implements run methods needed for celery - - Starts the celery worker that uses a paste.deploy configuration - file. + Any extra arguments you pass to this command will be passed through to + Celery. Use '--' before such extra arguments to avoid options to be parsed + by this CLI command. """ - def update_parser(self): - """ - Abstract method. Allows for the class's parser to be updated - before the superclass's `run` method is called. Necessary to - allow options/arguments to be passed through to the underlying - celery command. - """ - - cmd = self.celery_command(app_or_default()) - for x in cmd.get_options(): - self.parser.add_option(x) - - def command(self): - from pylons import config - try: - CELERY_ON = str2bool(config['app_conf'].get('use_celery')) - except KeyError: - CELERY_ON = False - - if not CELERY_ON: - raise Exception('Please set use_celery = true in .ini config ' - 'file before running celeryd') - kallithea.CELERY_ON = CELERY_ON - load_rcextensions(config['here']) - cmd = self.celery_command(app_or_default()) - return cmd.run(**vars(self.options)) - - -class CeleryDaemonCommand(CeleryCommand): - """Start the celery worker - - Starts the celery worker that uses a paste.deploy configuration - file. - """ - usage = 'CONFIG_FILE [celeryd options...]' - summary = __doc__.splitlines()[0] - description = "".join(__doc__.splitlines()[2:]) + if not kallithea.CELERY_ON: + raise Exception('Please set use_celery = true in .ini config ' + 'file before running this command') - parser = Command.standard_parser(quiet=True) - celery_command = celeryd.WorkerCommand - - -class CeleryBeatCommand(CeleryCommand): - """Start the celery beat server - - Starts the celery beat server using a paste.deploy configuration - file. - """ - usage = 'CONFIG_FILE [celerybeat options...]' - summary = __doc__.splitlines()[0] - description = "".join(__doc__.splitlines()[2:]) - - parser = Command.standard_parser(quiet=True) - celery_command = celerybeat.BeatCommand - - -class CAMQPAdminCommand(CeleryCommand): - """CAMQP Admin - - CAMQP celery admin tool. - """ - usage = 'CONFIG_FILE [camqadm options...]' - summary = __doc__.splitlines()[0] - description = "".join(__doc__.splitlines()[2:]) - - parser = Command.standard_parser(quiet=True) - celery_command = camqadm.AMQPAdminCommand - - -class CeleryEventCommand(CeleryCommand): - """Celery event command. - - Capture celery events. - """ - usage = 'CONFIG_FILE [celeryev options...]' - summary = __doc__.splitlines()[0] - description = "".join(__doc__.splitlines()[2:]) - - parser = Command.standard_parser(quiet=True) - celery_command = celeryev.EvCommand + from kallithea.lib import celerypylons + cmd = celerypylons.worker.worker(celerypylons.app) + return cmd.run_from_argv(None, command='celery-run -c CONFIG_FILE --', argv=list(celery_args)) diff --git a/kallithea/bin/kallithea_config.py b/kallithea/bin/kallithea_cli_config.py old mode 100755 new mode 100644 rename from kallithea/bin/kallithea_config.py rename to kallithea/bin/kallithea_cli_config.py --- a/kallithea/bin/kallithea_config.py +++ b/kallithea/bin/kallithea_cli_config.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python2 - # -*- coding: utf-8 -*- # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -13,148 +11,82 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -""" -kallithea.bin.kallithea_config -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -configuration generator for Kallithea - -This file was forked by the Kallithea project in July 2014. -Original author and date, and relevant copyright and licensing information is below: -:created_on: Jun 18, 2013 -:author: marcink -:copyright: (c) 2013 RhodeCode GmbH, and others. -:license: GPLv3, see LICENSE.md for more details. -""" - +import click +import kallithea.bin.kallithea_cli_base as cli_base import os -import sys import uuid -import argparse -from mako.template import Template -TMPL = 'template.ini.mako' -here = os.path.dirname(os.path.abspath(__file__)) +from collections import defaultdict + +import mako.exceptions + +from kallithea.lib import inifile -def argparser(argv): - usage = ( - "kallithea-config [-h] [--filename=FILENAME] [--template=TEMPLATE] \n" - "VARS optional specify extra template variable that will be available in " - "template. Use comma separated key=val format eg.\n" - "key1=val1,port=5000,host=127.0.0.1,elements='a\,b\,c'\n" - ) +def show_defaults(ctx, param, value): + # Following construct is taken from the Click documentation: + # https://click.palletsprojects.com/en/7.x/options/#callbacks-and-eager-options + # "The resilient_parsing flag is applied to the context if Click wants to + # parse the command line without any destructive behavior that would change + # the execution flow. In this case, because we would exit the program, we + # instead do nothing." + if not value or ctx.resilient_parsing: + return - parser = argparse.ArgumentParser( - description='Kallithea CONFIG generator with variable replacement', - usage=usage - ) + for key, value in inifile.default_variables.items(): + click.echo('%s=%s' % (key, value)) - ## config - group = parser.add_argument_group('CONFIG') - group.add_argument('--filename', help='Output ini filename.') - group.add_argument('--template', help='Mako template file to use instead of ' - 'the default builtin template') - group.add_argument('--raw', help='Store given mako template as raw without ' - 'parsing. Use this to create custom template ' - 'initially', action='store_true') - group.add_argument('--show-defaults', help='Show all default variables for ' - 'builtin template', action='store_true') - args, other = parser.parse_known_args() - return parser, args, other + ctx.exit() + +@cli_base.register_command() +@click.option('--show-defaults', callback=show_defaults, + is_flag=True, expose_value=False, is_eager=True, + help='Show the default values that can be overridden') +@click.argument('config_file', type=click.Path(dir_okay=False, writable=True), required=True) +@click.argument('key_value_pairs', nargs=-1) +def config_create(config_file, key_value_pairs): + """Create a new configuration file. + This command creates a default configuration file, possibly adding/updating + settings you specify. -def _escape_split(text, sep): - """ - Allows for escaping of the separator: e.g. arg='foo\, bar' + The primary high level configuration keys and their default values are + shown with --show-defaults . Custom values for these keys can be specified + on the command line as key=value arguments. - It should be noted that the way bash et. al. do command line parsing, those - single quotes are required. a shameless ripoff from fabric project. - + Additional key=value arguments will be patched/inserted in the [app:main] + section ... until another section name specifies where any following values + should go. """ - escaped_sep = r'\%s' % sep - if escaped_sep not in text: - return text.split(sep) - - before, _, after = text.partition(escaped_sep) - startlist = before.split(sep) # a regular split is fine here - unfinished = startlist[-1] - startlist = startlist[:-1] - - # recurse because there may be more escaped separators - endlist = _escape_split(after, sep) - - # finish building the escaped value. we use endlist[0] becaue the first - # part of the string sent in recursion is the rest of the escaped value. - unfinished += sep + endlist[0] - - return startlist + [unfinished] + endlist[1:] # put together all the parts + mako_variable_values = {} + ini_settings = defaultdict(dict) -def _run(argv): - parser, args, other = argparser(argv) - if not len(sys.argv) > 1: - print parser.print_help() - sys.exit(0) - # defaults that can be overwritten by arguments - tmpl_stored_args = { - 'http_server': 'waitress', - 'lang': 'en', - 'database_engine': 'sqlite', - 'host': '127.0.0.1', - 'port': 5000, - 'error_aggregation_service': None, - } - if other: - # parse arguments, we assume only first is correct - kwargs = {} - for el in _escape_split(other[0], ','): - kv = _escape_split(el, '=') - if len(kv) == 2: - k, v = kv - kwargs[k] = v - # update our template stored args - tmpl_stored_args.update(kwargs) + section_name = None + for parameter in key_value_pairs: + parts = parameter.split('=', 1) + if len(parts) == 1 and parameter.startswith('[') and parameter.endswith(']'): + section_name = parameter + elif len(parts) == 2: + key, value = parts + if section_name is None and key in inifile.default_variables: + mako_variable_values[key] = value + else: + if section_name is None: + section_name = '[app:main]' + ini_settings[section_name][key] = value + else: + raise ValueError("Invalid name=value parameter %r" % parameter) # use default that cannot be replaced - tmpl_stored_args.update({ + mako_variable_values.update({ 'uuid': lambda: uuid.uuid4().hex, - 'here': os.path.abspath(os.curdir), }) - if args.show_defaults: - for k,v in tmpl_stored_args.iteritems(): - print '%s=%s' % (k, v) - sys.exit(0) try: - # built in template - tmpl_file = os.path.join(here, TMPL) - if args.template: - tmpl_file = args.template - - with open(tmpl_file, 'rb') as f: - tmpl_data = f.read().decode('utf-8') - if args.raw: - tmpl = tmpl_data - else: - tmpl = Template(tmpl_data).render(**tmpl_stored_args) - with open(args.filename, 'wb') as f: - f.write(tmpl.encode('utf-8')) - print 'Wrote new config file in %s' % (os.path.abspath(args.filename)) + config_file_abs = os.path.abspath(config_file) + inifile.create(config_file_abs, mako_variable_values, ini_settings) + click.echo('Wrote new config file in %s' % config_file_abs) + click.echo("Don't forget to build the front-end using 'kallithea-cli front-end-build'.") except Exception: - from mako import exceptions - print exceptions.text_error_template().render() - -def main(argv=None): - """ - Main execution function for cli - - :param argv: - """ - if argv is None: - argv = sys.argv - - return _run(argv) - - -if __name__ == '__main__': - sys.exit(main(sys.argv)) + click.echo(mako.exceptions.text_error_template().render()) diff --git a/kallithea/lib/paster_commands/setup_db.py b/kallithea/bin/kallithea_cli_db.py rename from kallithea/lib/paster_commands/setup_db.py rename to kallithea/bin/kallithea_cli_db.py --- a/kallithea/lib/paster_commands/setup_db.py +++ b/kallithea/bin/kallithea_cli_db.py @@ -1,112 +1,79 @@ -import os -import sys -from paste.script.appinstall import AbstractInstallCommand -from paste.script.command import BadCommand -from paste.deploy import appconfig +# -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +import click +import kallithea.bin.kallithea_cli_base as cli_base -# Add location of top level folder to sys.path -from os.path import dirname as dn -rc_path = dn(dn(dn(os.path.realpath(__file__)))) -sys.path.append(rc_path) - - -class Command(AbstractInstallCommand): +import kallithea +from kallithea.lib.db_manage import DbManage +from kallithea.model.meta import Session - default_verbosity = 1 - max_args = 1 - min_args = 1 - summary = "Setup an application, given a config file" - usage = "CONFIG_FILE" - group_name = "Kallithea" +@cli_base.register_command(config_file=True) +@click.option('--user', help='Username of administrator account.') +@click.option('--password', help='Password for administrator account.') +@click.option('--email', help='Email address of administrator account.') +@click.option('--repos', help='Absolute path to repositories location.') +@click.option('--force-yes', is_flag=True, help='Answer yes to every question.') +@click.option('--force-no', is_flag=True, help='Answer no to every question.') +@click.option('--public-access/--no-public-access', default=True, + help='Enable/disable public access on this installation (default: enable)') +def db_create(user, password, email, repos, force_yes, force_no, public_access): + """Initialize the database. - description = """\ + Create all required tables in the database specified in the configuration + file. Create the administrator account. Set certain settings based on + values you provide. - Setup Kallithea according to its configuration file. This is - the second part of a two-phase web application installation - process (the first phase is prepare-app). The setup process - consist of things like setting up databases, creating super user + You can pass the answers to all questions as options to this command. """ + dbconf = kallithea.CONFIG['sqlalchemy.url'] - parser = AbstractInstallCommand.standard_parser( - simulate=True, quiet=True, interactive=True) - parser.add_option('--user', - action='store', - dest='username', - default=None, - help='Admin Username') - parser.add_option('--email', - action='store', - dest='email', - default=None, - help='Admin Email') - parser.add_option('--password', - action='store', - dest='password', - default=None, - help='Admin password min 6 chars') - parser.add_option('--repos', - action='store', - dest='repos_location', - default=None, - help='Absolute path to repositories location') - parser.add_option('--name', - action='store', - dest='section_name', - default=None, - help='The name of the section to set up (default: app:main)') - parser.add_option('--force-yes', - action='store_true', - dest='force_ask', - default=None, - help='Force yes to every question') - parser.add_option('--force-no', - action='store_false', - dest='force_ask', - default=None, - help='Force no to every question') - parser.add_option('--public-access', - action='store_true', - dest='public_access', - default=None, - help='Enable public access on this installation (default)') - parser.add_option('--no-public-access', - action='store_false', - dest='public_access', - default=None, - help='Disable public access on this installation ') - def command(self): - config_spec = self.args[0] - section = self.options.section_name - if section is None: - if '#' in config_spec: - config_spec, section = config_spec.split('#', 1) - else: - section = 'main' - if not ':' in section: - plain_section = section - section = 'app:' + section - else: - plain_section = section.split(':', 1)[0] - if not config_spec.startswith('config:'): - config_spec = 'config:' + config_spec - if plain_section != 'main': - config_spec += '#' + plain_section - config_file = config_spec[len('config:'):].split('#', 1)[0] - config_file = os.path.join(os.getcwd(), config_file) - self.logging_file_config(config_file) - conf = appconfig(config_spec, relative_to=os.getcwd()) - ep_name = conf.context.entry_point_name - ep_group = conf.context.protocol - dist = conf.context.distribution - if dist is None: - raise BadCommand( - "The section %r is not the application (probably a filter). " - "You should add #section_name, where section_name is the " - "section that configures your application" % plain_section) - installer = self.get_installer(dist, ep_group, ep_name) - installer.setup_config( - self, config_file, section, self.sysconfig_install_vars(installer)) - self.call_sysconfig_functions( - 'post_setup_hook', installer, config_file) + # force_ask should be True (yes), False (no), or None (ask) + if force_yes: + force_ask = True + elif force_no: + force_ask = False + else: + force_ask = None - print 'Database set up successfully.' + cli_args = dict( + username=user, + password=password, + email=email, + repos_location=repos, + force_ask=force_ask, + public_access=public_access, + ) + dbmanage = DbManage(dbconf=dbconf, root=kallithea.CONFIG['here'], + tests=False, cli_args=cli_args) + dbmanage.create_tables(override=True) + opts = dbmanage.config_prompt(None) + dbmanage.create_settings(opts) + dbmanage.create_default_user() + dbmanage.admin_prompt() + dbmanage.create_permissions() + dbmanage.populate_default_permissions() + Session().commit() + + # initial repository scan + kallithea.config.middleware.make_app_without_logging( + kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf) + added, _ = kallithea.lib.utils.repo2db_mapper(kallithea.model.scm.ScmModel().repo_scan()) + if added: + click.echo('Initial repository scan: added following repositories:') + click.echo('\t%s' % '\n\t'.join(added)) + else: + click.echo('Initial repository scan: no repositories found.') + + click.echo('Database set up successfully.') + click.echo("Don't forget to build the front-end using 'kallithea-cli front-end-build'.") diff --git a/kallithea/lib/paster_commands/make_rcextensions.py b/kallithea/bin/kallithea_cli_extensions.py rename from kallithea/lib/paster_commands/make_rcextensions.py rename to kallithea/bin/kallithea_cli_extensions.py --- a/kallithea/lib/paster_commands/make_rcextensions.py +++ b/kallithea/bin/kallithea_cli_extensions.py @@ -12,70 +12,45 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . """ -kallithea.lib.paster_commands.make_rcextensions -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -make-rcext paster command for Kallithea - -This file was forked by the Kallithea project in July 2014. +This file was forked by the Kallithea project in July 2014 and later moved. Original author and date, and relevant copyright and licensing information is below: :created_on: Mar 6, 2012 :author: marcink :copyright: (c) 2013 RhodeCode GmbH, and others. :license: GPLv3, see LICENSE.md for more details. - """ - +import click +import kallithea.bin.kallithea_cli_base as cli_base import os -import sys import pkg_resources -from kallithea.lib.utils import BasePasterCommand, ask_ok - -# Add location of top level folder to sys.path -from os.path import dirname as dn -rc_path = dn(dn(dn(os.path.realpath(__file__)))) -sys.path.append(rc_path) - - -class Command(BasePasterCommand): +import kallithea +from kallithea.lib.utils2 import ask_ok - max_args = 1 - min_args = 1 - - group_name = "Kallithea" - takes_config_file = -1 - parser = BasePasterCommand.standard_parser(verbose=True) - summary = "Write template file for extending Kallithea in Python." - usage = "CONFIG_FILE" - description = '''\ - A rcextensions directory with a __init__.py file will be created next to - the ini file. Local customizations in that file will survive upgrades. - The file contains instructions on how it can be customized. - ''' +@cli_base.register_command(config_file=True) +def extensions_create(): + """Write template file for extending Kallithea in Python. - def command(self): - from pylons import config + An rcextensions directory with a __init__.py file will be created next to + the ini file. Local customizations in that file will survive upgrades. + The file contains instructions on how it can be customized. + """ + here = kallithea.CONFIG['here'] + content = pkg_resources.resource_string( + 'kallithea', os.path.join('config', 'rcextensions', '__init__.py') + ) + ext_file = os.path.join(here, 'rcextensions', '__init__.py') + if os.path.exists(ext_file): + msg = ('Extension file %s already exists, do you want ' + 'to overwrite it ? [y/n] ') % ext_file + if not ask_ok(msg): + click.echo('Nothing done, exiting...') + return - here = config['here'] - content = pkg_resources.resource_string( - 'kallithea', os.path.join('config', 'rcextensions', '__init__.py') - ) - ext_file = os.path.join(here, 'rcextensions', '__init__.py') - if os.path.exists(ext_file): - msg = ('Extension file already exists, do you want ' - 'to overwrite it ? [y/n]') - if not ask_ok(msg): - print 'Nothing done...' - return - - dirname = os.path.dirname(ext_file) - if not os.path.isdir(dirname): - os.makedirs(dirname) - with open(ext_file, 'wb') as f: - f.write(content) - print 'Wrote new extensions file to %s' % ext_file - - def update_parser(self): - pass + dirname = os.path.dirname(ext_file) + if not os.path.isdir(dirname): + os.makedirs(dirname) + with open(ext_file, 'wb') as f: + f.write(content) + click.echo('Wrote new extensions file to %s' % ext_file) diff --git a/kallithea/bin/kallithea_cli_front_end.py b/kallithea/bin/kallithea_cli_front_end.py new file mode 100644 --- /dev/null +++ b/kallithea/bin/kallithea_cli_front_end.py @@ -0,0 +1,108 @@ +# -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import click +import kallithea.bin.kallithea_cli_base as cli_base + +import os +import shutil +import subprocess +import json + +import kallithea + +@cli_base.register_command() +@click.option('--install-deps/--no-install-deps', default=True, + help='Skip installation of dependencies, via "npm".') +@click.option('--generate/--no-generate', default=True, + help='Skip generation of front-end files.') +def front_end_build(install_deps, generate): + """Build the front-end. + + Install required dependencies for the front-end and generate the necessary + files. This step is complementary to any 'pip install' step which only + covers Python dependencies. + + The installation of front-end dependencies happens via the tool 'npm' which + is expected to be installed already. + """ + front_end_dir = os.path.abspath(os.path.join(kallithea.__file__, '..', 'front-end')) + public_dir = os.path.abspath(os.path.join(kallithea.__file__, '..', 'public')) + + if install_deps: + click.echo("Running 'npm install' to install front-end dependencies from package.json") + subprocess.check_call(['npm', 'install'], cwd=front_end_dir, shell=kallithea.is_windows) + + if generate: + tmp_dir = os.path.join(front_end_dir, 'tmp') + if not os.path.isdir(tmp_dir): + os.mkdir(tmp_dir) + + click.echo("Building CSS styling based on Bootstrap") + with open(os.path.join(tmp_dir, 'pygments.css'), 'w') as f: + subprocess.check_call(['pygmentize', + '-S', 'default', + '-f', 'html', + '-a', '.code-highlight'], + stdout=f) + lesscpath = os.path.join(front_end_dir, 'node_modules', '.bin', 'lessc') + lesspath = os.path.join(front_end_dir, 'main.less') + csspath = os.path.join(public_dir, 'css', 'style.css') + subprocess.check_call([lesscpath, '--source-map', + '--source-map-less-inline', lesspath, csspath], + cwd=front_end_dir, shell=kallithea.is_windows) + + click.echo("Preparing Bootstrap JS") + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'bootstrap', 'dist', 'js', 'bootstrap.js'), os.path.join(public_dir, 'js', 'bootstrap.js')) + + click.echo("Preparing jQuery JS with Flot, Caret and Atwho") + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery', 'dist', 'jquery.min.js'), os.path.join(public_dir, 'js', 'jquery.min.js')) + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.js'), os.path.join(public_dir, 'js', 'jquery.flot.js')) + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.selection.js'), os.path.join(public_dir, 'js', 'jquery.flot.selection.js')) + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.flot', 'jquery.flot.time.js'), os.path.join(public_dir, 'js', 'jquery.flot.time.js')) + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'jquery.caret', 'dist', 'jquery.caret.min.js'), os.path.join(public_dir, 'js', 'jquery.caret.min.js')) + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'at.js', 'dist', 'js', 'jquery.atwho.min.js'), os.path.join(public_dir, 'js', 'jquery.atwho.min.js')) + + click.echo("Preparing DataTables JS") + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'datatables.net', 'js', 'jquery.dataTables.js'), os.path.join(public_dir, 'js', 'jquery.dataTables.js')) + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'datatables.net-bs', 'js', 'dataTables.bootstrap.js'), os.path.join(public_dir, 'js', 'dataTables.bootstrap.js')) + + click.echo("Preparing Select2 JS") + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2.js'), os.path.join(public_dir, 'js', 'select2.js')) + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2.png'), os.path.join(public_dir, 'css', 'select2.png')) + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2x2.png'), os.path.join(public_dir, 'css', 'select2x2.png')) + shutil.copy(os.path.join(front_end_dir, 'node_modules', 'select2', 'select2-spinner.gif'), os.path.join(public_dir, 'css', 'select2-spinner.gif')) + + click.echo("Preparing CodeMirror JS") + if os.path.isdir(os.path.join(public_dir, 'codemirror')): + shutil.rmtree(os.path.join(public_dir, 'codemirror')) + shutil.copytree(os.path.join(front_end_dir, 'node_modules', 'codemirror'), os.path.join(public_dir, 'codemirror')) + + click.echo("Generating LICENSES.txt") + license_checker_path = os.path.join(front_end_dir, 'node_modules', '.bin', 'license-checker') + check_licensing_json_path = os.path.join(tmp_dir, 'licensing.json') + licensing_txt_path = os.path.join(public_dir, 'LICENSES.txt') + subprocess.check_call([license_checker_path, '--json', '--out', check_licensing_json_path], + cwd=front_end_dir, shell=kallithea.is_windows) + with open(check_licensing_json_path) as jsonfile: + rows = json.loads(jsonfile.read()) + with open(licensing_txt_path, 'w') as out: + out.write("The Kallithea front-end was built using the following Node modules:\n\n") + for name_version, values in sorted(rows.items()): + name, version = name_version.rsplit('@', 1) + line = "%s from https://www.npmjs.com/package/%s/v/%s\n License: %s\n Repository: %s\n" % ( + name_version, name, version, values['licenses'], values.get('repository', '-')) + if values.get('copyright'): + line += " Copyright: %s\n" % (values['copyright']) + out.write(line + '\n') diff --git a/kallithea/lib/paster_commands/install_iis.py b/kallithea/bin/kallithea_cli_iis.py rename from kallithea/lib/paster_commands/install_iis.py rename to kallithea/bin/kallithea_cli_iis.py --- a/kallithea/lib/paster_commands/install_iis.py +++ b/kallithea/bin/kallithea_cli_iis.py @@ -1,43 +1,26 @@ +# -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +import click +import kallithea +import kallithea.bin.kallithea_cli_base as cli_base + import os import sys -from paste.script.appinstall import AbstractInstallCommand -from paste.script.command import BadCommand -# Add location of top level folder to sys.path -from os.path import dirname as dn -rc_path = dn(dn(dn(os.path.realpath(__file__)))) -sys.path.append(rc_path) - -class Command(AbstractInstallCommand): - default_verbosity = 1 - max_args = 1 - min_args = 1 - summary = 'Setup IIS given a config file' - usage = 'CONFIG_FILE' - - description = ''' - Script for installing into IIS using isapi-wsgi. - ''' - parser = AbstractInstallCommand.standard_parser( - simulate=True, quiet=True, interactive=True) - parser.add_option('--virtualdir', - action='store', - dest='virtualdir', - default='/', - help='The virtual folder to install into on IIS') - - def command(self): - config_spec = self.args[0] - if not config_spec.startswith('config:'): - config_spec = 'config:' + config_spec - config_file = config_spec[len('config:'):].split('#', 1)[0] - config_file = os.path.join(os.getcwd(), config_file) - try: - import isapi_wsgi - except ImportError: - raise BadCommand('missing requirement: isapi-wsgi not installed') - - file = '''import sys +dispath_py_template = '''\ +# Created by Kallithea 'kallithea-cli iis-install' +import sys if hasattr(sys, "isapidllhandle"): import win32traceutil @@ -47,7 +30,7 @@ import os def __ExtensionFactory__(): from paste.deploy import loadapp - from paste.script.util.logging_config import fileConfig + from logging.config import fileConfig fileConfig('%(inifile)s') application = loadapp('config:%(inifile)s') @@ -71,15 +54,28 @@ if __name__=='__main__': HandleCommandLine(params) ''' - outdata = file % { - 'inifile': config_file.replace('\\', '\\\\'), - 'virtualdir': self.options.virtualdir - } +@cli_base.register_command(config_file=True) +@click.option('--virtualdir', default='/', + help='The virtual folder to install into on IIS.') +def iis_install(virtualdir): + """Install into IIS using isapi-wsgi.""" + + config_file_abs = kallithea.CONFIG['__file__'] - dispatchfile = os.path.join(os.getcwd(), 'dispatch.py') - self.ensure_file(dispatchfile, outdata, False) - print 'generating', dispatchfile + try: + import isapi_wsgi + except ImportError: + sys.stderr.write('missing requirement: isapi-wsgi not installed\n') + sys.exit(1) - print ('run \'python "%s" install\' with administrative privileges ' - 'to generate the _dispatch.dll file and install it into the ' - 'default web site') % (dispatchfile,) + dispatchfile = os.path.join(os.getcwd(), 'dispatch.py') + click.echo('Writing %s' % dispatchfile) + with open(dispatchfile, 'w') as f: + f.write(dispath_py_template % { + 'inifile': config_file_abs.replace('\\', '\\\\'), + 'virtualdir': virtualdir, + }) + + click.echo('Run \'python "%s" install\' with administrative privileges ' + 'to generate the _dispatch.dll file and install it into the ' + 'default web site' % dispatchfile) diff --git a/kallithea/lib/paster_commands/make_index.py b/kallithea/bin/kallithea_cli_index.py rename from kallithea/lib/paster_commands/make_index.py rename to kallithea/bin/kallithea_cli_index.py --- a/kallithea/lib/paster_commands/make_index.py +++ b/kallithea/bin/kallithea_cli_index.py @@ -12,101 +12,51 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . """ -kallithea.lib.paster_commands.make_index -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -make-index paster command for Kallithea - -This file was forked by the Kallithea project in July 2014. +This file was forked by the Kallithea project in July 2014 and later moved. Original author and date, and relevant copyright and licensing information is below: :created_on: Aug 17, 2010 :author: marcink :copyright: (c) 2013 RhodeCode GmbH, and others. :license: GPLv3, see LICENSE.md for more details. - """ - +import click +import kallithea.bin.kallithea_cli_base as cli_base import os +from string import strip import sys -import logging - -from string import strip -from kallithea.model.repo import RepoModel -from kallithea.lib.utils import BasePasterCommand, load_rcextensions - -# Add location of top level folder to sys.path -from os.path import dirname as dn -rc_path = dn(dn(dn(os.path.realpath(__file__)))) -sys.path.append(rc_path) - - -class Command(BasePasterCommand): - - max_args = 1 - min_args = 1 - usage = "CONFIG_FILE" - group_name = "Kallithea" - takes_config_file = -1 - parser = BasePasterCommand.standard_parser(verbose=True) - summary = "Creates or updates full text search index" +import kallithea +from kallithea.lib.indexers.daemon import WhooshIndexingDaemon +from kallithea.lib.pidlock import LockHeld, DaemonLock +from kallithea.lib.utils import load_rcextensions +from kallithea.model.repo import RepoModel - def command(self): - logging.config.fileConfig(self.path_to_ini_file) - #get SqlAlchemy session - self._init_session() - from pylons import config - index_location = config['index_dir'] - load_rcextensions(config['here']) - - repo_location = self.options.repo_location \ - if self.options.repo_location else RepoModel().repos_path - repo_list = map(strip, self.options.repo_list.split(',')) \ - if self.options.repo_list else None - - repo_update_list = map(strip, self.options.repo_update_list.split(',')) \ - if self.options.repo_update_list else None +@cli_base.register_command(config_file_initialize_app=True) +@click.option('--repo-location', help='Base path of repositories to index. Default: all') +@click.option('--index-only', help='Comma-separated list of repositories to build index on. Default: all') +@click.option('--update-only', help='Comma-separated list of repositories to re-build index on. Default: all') +@click.option('-f', '--full', 'full_index', help='Recreate the index from scratch') +def index_create(repo_location, index_only, update_only, full_index): + """Create or update full text search index""" - #====================================================================== - # WHOOSH DAEMON - #====================================================================== - from kallithea.lib.pidlock import LockHeld, DaemonLock - from kallithea.lib.indexers.daemon import WhooshIndexingDaemon - try: - l = DaemonLock(file_=os.path.join(dn(dn(index_location)), - 'make_index.lock')) - WhooshIndexingDaemon(index_location=index_location, - repo_location=repo_location, - repo_list=repo_list, - repo_update_list=repo_update_list)\ - .run(full_index=self.options.full_index) - l.release() - except LockHeld: - sys.exit(1) + index_location = kallithea.CONFIG['index_dir'] + load_rcextensions(kallithea.CONFIG['here']) + + if not repo_location: + repo_location = RepoModel().repos_path + repo_list = map(strip, index_only.split(',')) \ + if index_only else None + repo_update_list = map(strip, update_only.split(',')) \ + if update_only else None - def update_parser(self): - self.parser.add_option('--repo-location', - action='store', - dest='repo_location', - help="Specifies repositories location to index OPTIONAL", - ) - self.parser.add_option('--index-only', - action='store', - dest='repo_list', - help="Specifies a comma separated list of repositories " - "to build index on. If not given all repositories " - "are scanned for indexing. OPTIONAL", - ) - self.parser.add_option('--update-only', - action='store', - dest='repo_update_list', - help="Specifies a comma separated list of repositories " - "to re-build index on. OPTIONAL", - ) - self.parser.add_option('-f', - action='store_true', - dest='full_index', - help="Specifies that index should be made full i.e" - " destroy old and build from scratch", - default=False) + try: + l = DaemonLock(os.path.join(index_location, 'make_index.lock')) + WhooshIndexingDaemon(index_location=index_location, + repo_location=repo_location, + repo_list=repo_list, + repo_update_list=repo_update_list) \ + .run(full_index=full_index) + l.release() + except LockHeld: + sys.exit(1) diff --git a/kallithea/lib/paster_commands/ishell.py b/kallithea/bin/kallithea_cli_ishell.py rename from kallithea/lib/paster_commands/ishell.py rename to kallithea/bin/kallithea_cli_ishell.py --- a/kallithea/lib/paster_commands/ishell.py +++ b/kallithea/bin/kallithea_cli_ishell.py @@ -12,66 +12,30 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . """ -kallithea.lib.paster_commands.ishell -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -interactive shell paster command for Kallithea - -This file was forked by the Kallithea project in July 2014. +This file was forked by the Kallithea project in July 2014 and later moved. Original author and date, and relevant copyright and licensing information is below: :created_on: Apr 4, 2013 :author: marcink :copyright: (c) 2013 RhodeCode GmbH, and others. :license: GPLv3, see LICENSE.md for more details. """ - - -import os -import sys -import logging - -from kallithea.lib.utils import BasePasterCommand +import click +import kallithea.bin.kallithea_cli_base as cli_base -# Add location of top level folder to sys.path -from os.path import dirname as dn -rc_path = dn(dn(dn(os.path.realpath(__file__)))) -sys.path.append(rc_path) +import sys -log = logging.getLogger(__name__) - - -class Command(BasePasterCommand): - - max_args = 1 - min_args = 1 +# make following imports directly available inside the ishell +from kallithea.model.db import * - usage = "CONFIG_FILE" - group_name = "Kallithea" - takes_config_file = -1 - parser = BasePasterCommand.standard_parser(verbose=True) - summary = "Interactive shell" - - def command(self): - #get SqlAlchemy session - self._init_session() - - # imports, used in ipython shell - import os - import sys - import time - import shutil - import datetime - from kallithea.model.db import * - - try: - from IPython import embed - from IPython.config.loader import Config - cfg = Config() - cfg.InteractiveShellEmbed.confirm_exit = False - embed(config=cfg, banner1="Kallithea IShell.") - except ImportError: - print 'ipython installation required for ishell' - sys.exit(-1) - - def update_parser(self): - pass +@cli_base.register_command(config_file_initialize_app=True) +def ishell(): + """Interactive shell for Kallithea.""" + try: + from IPython import embed + except ImportError: + print 'Kallithea ishell requires the Python package IPython 4 or later' + sys.exit(-1) + from traitlets.config.loader import Config + cfg = Config() + cfg.InteractiveShellEmbed.confirm_exit = False + embed(config=cfg, banner1="Kallithea IShell.") diff --git a/kallithea/bin/kallithea_cli_repo.py b/kallithea/bin/kallithea_cli_repo.py new file mode 100644 --- /dev/null +++ b/kallithea/bin/kallithea_cli_repo.py @@ -0,0 +1,185 @@ +# -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +""" +This file was forked by the Kallithea project in July 2014 and later moved. +Original author and date, and relevant copyright and licensing information is below: +:created_on: Feb 9, 2013 +:author: marcink +:copyright: (c) 2013 RhodeCode GmbH, and others. +:license: GPLv3, see LICENSE.md for more details. +""" +import click +import kallithea.bin.kallithea_cli_base as cli_base + +import datetime +import os +import re +import shutil + +from kallithea.lib.utils import repo2db_mapper, REMOVED_REPO_PAT +from kallithea.lib.utils2 import safe_unicode, safe_str, ask_ok +from kallithea.model.db import Repository, Ui +from kallithea.model.meta import Session +from kallithea.model.scm import ScmModel + +@cli_base.register_command(config_file_initialize_app=True) +@click.option('--remove-missing', is_flag=True, + help='Remove missing repositories from the Kallithea database.') +def repo_scan(remove_missing): + """Scan filesystem for repositories. + + Search the configured repository root for new repositories and add them + into Kallithea. + Additionally, report repositories that were previously known to Kallithea + but are no longer present on the filesystem. If option --remove-missing is + given, remove the missing repositories from the Kallithea database. + """ + click.echo('Now scanning root location for new repos ...') + added, removed = repo2db_mapper(ScmModel().repo_scan(), + remove_obsolete=remove_missing) + click.echo('Scan completed.') + if added: + click.echo('Added: %s' % ', '.join(added)) + if removed: + click.echo('%s: %s' % ('Removed' if remove_missing else 'Missing', + ', '.join(removed))) + +@cli_base.register_command(config_file_initialize_app=True) +@click.argument('repositories', nargs=-1) +def repo_update_metadata(repositories): + """ + Update repository metadata in database from repository content. + + In normal operation, Kallithea will keep caches up-to-date + automatically. However, if repositories are externally modified, e.g. by + a direct push via the filesystem rather than via a Kallithea URL, + Kallithea is not aware of it. In this case, you should manually run this + command to update the repository cache. + + If no repositories are specified, the caches of all repositories are + updated. + """ + if not repositories: + repo_list = Repository.query().all() + else: + repo_names = [safe_unicode(n.strip()) for n in repositories] + repo_list = list(Repository.query() + .filter(Repository.repo_name.in_(repo_names))) + + for repo in repo_list: + # update latest revision metadata in database + repo.update_changeset_cache() + # invalidate in-memory VCS object cache... will be repopulated on + # first access + repo.set_invalidate() + + Session().commit() + + click.echo('Updated database with information about latest change in the following %s repositories:' % (len(repo_list))) + click.echo('\n'.join(repo.repo_name for repo in repo_list)) + +@cli_base.register_command(config_file_initialize_app=True) +@click.option('--ask/--no-ask', default=True, help='Ask for confirmation or not. Default is --ask.') +@click.option('--older-than', + help="""Only purge repositories that have been removed at least the given time ago. + For example, '--older-than=30d' purges repositories deleted 30 days ago or longer. + Possible suffixes: d (days), h (hours), m (minutes), s (seconds).""") +def repo_purge_deleted(ask, older_than): + """Purge backups of deleted repositories. + + When a repository is deleted via the Kallithea web interface, the actual + data is still present on the filesystem but set aside using a special name. + This command allows to delete these files permanently. + """ + def _parse_older_than(val): + regex = re.compile(r'((?P\d+?)d)?((?P\d+?)h)?((?P\d+?)m)?((?P\d+?)s)?') + parts = regex.match(val) + if not parts: + return + parts = parts.groupdict() + time_params = {} + for (name, param) in parts.iteritems(): + if param: + time_params[name] = int(param) + return datetime.timedelta(**time_params) + + def _extract_date(name): + """ + Extract the date part from rm__ pattern of removed repos, + and convert it to datetime object + + :param name: + """ + date_part = name[4:19] # 4:19 since we don't parse milliseconds + return datetime.datetime.strptime(date_part, '%Y%m%d_%H%M%S') + + repos_location = Ui.get_repos_location() + to_remove = [] + for dn_, dirs, f in os.walk(safe_str(repos_location)): + alldirs = list(dirs) + del dirs[:] + if ('.hg' in alldirs or + '.git' in alldirs or + '.svn' in alldirs or + 'objects' in alldirs and ('refs' in alldirs or 'packed-refs' in f)): + continue + for loc in alldirs: + if REMOVED_REPO_PAT.match(loc): + to_remove.append([os.path.join(dn_, loc), + _extract_date(loc)]) + else: + dirs.append(loc) + if dirs: + click.echo('Scanning: %s' % dn_) + + if not to_remove: + click.echo('There are no deleted repositories.') + return + + # filter older than (if present)! + if older_than: + now = datetime.datetime.now() + to_remove_filtered = [] + older_than_date = _parse_older_than(older_than) + for name, date_ in to_remove: + repo_age = now - date_ + if repo_age > older_than_date: + to_remove_filtered.append([name, date_]) + + to_remove = to_remove_filtered + + if not to_remove: + click.echo('There are no deleted repositories older than %s (%s)' + % (older_than, older_than_date)) + return + + click.echo('Considering %s deleted repositories older than %s (%s).' + % (len(to_remove), older_than, older_than_date)) + else: + click.echo('Considering %s deleted repositories.' % len(to_remove)) + + if not ask: + remove = True + else: + remove = ask_ok('The following repositories will be removed completely:\n%s\n' + 'Do you want to proceed? [y/n] ' + % '\n'.join(['%s deleted on %s' % (safe_str(x[0]), safe_str(x[1])) + for x in to_remove])) + + if remove: + for path, date_ in to_remove: + click.echo('Purging repository %s' % path) + shutil.rmtree(path) + else: + click.echo('Nothing done, exiting...') diff --git a/kallithea/bin/ldap_sync.conf b/kallithea/bin/ldap_sync.conf --- a/kallithea/bin/ldap_sync.conf +++ b/kallithea/bin/ldap_sync.conf @@ -3,9 +3,9 @@ api_url = http://kallithea.example.com/_ api_user = admin api_key = XXXXXXXXXXXX -ldap_uri = ldap://ldap.example.com:389 +ldap_uri = ldaps://ldap.example.com:636 ldap_user = cn=kallithea,dc=example,dc=com ldap_key = XXXXXXXXX base_dn = dc=example,dc=com -sync_users = True \ No newline at end of file +sync_users = True diff --git a/kallithea/bin/ldap_sync.py b/kallithea/bin/ldap_sync.py --- a/kallithea/bin/ldap_sync.py +++ b/kallithea/bin/ldap_sync.py @@ -207,7 +207,7 @@ class LdapSync(object): groups = self.ldap_client.get_groups() for group in groups: try: - self.kallithea_api.create_repo_group(group) + self.kallithea_api.create_group(group) added += 1 except Exception: existing += 1 diff --git a/kallithea/bin/rebranddb.py b/kallithea/bin/rebranddb.py deleted file mode 100755 --- a/kallithea/bin/rebranddb.py +++ /dev/null @@ -1,173 +0,0 @@ -#!/usr/bin/env python2 - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -""" -Script for rebranding of database to and from what Kallithea expects - -Works on databases from v1.7.2 to v2.2.5 -""" - -import sys -from sqlalchemy import * -import sqlalchemy.orm -import sqlalchemy.ext.declarative -import migrate.changeset # a part of sqlalchemy-migrate which is available on pypi - -def do_migrate(db, old, new): - print 'Migrating %s from %s to %s' % (db, old or '?', new) - metadata = MetaData() - metadata.bind = create_engine(db) - metadata.reflect() - assert metadata.tables, 'Cannot reflect table names from db' - - if not old: - assert 'db_migrate_version' in metadata.tables, 'Cannot reflect db_migrate_version from db' - t = metadata.tables['db_migrate_version'] - l = t.select().where(t.c.repository_path == 'versions').execute().fetchall() - assert len(l) == 1, 'Cannot find a single versions entry in db_migrate_version' - assert l[0].repository_id.endswith('_db_migrations') - old = l[0].repository_id[:-len('_db_migrations')] - print 'Detected migration from old name %s' % old - if new != old: - assert not t.select().where(t.c.repository_id == new + '_db_migrations').execute().fetchall(), 'db_migrate_version has entries for both old and new name' - - def tablename(brand, s): - return s if brand == 'kallithea' else (brand + '_' + s) - new_ui_name = tablename(new, 'ui') - old_ui_name = tablename(old, 'ui') - new_settings_name = tablename(new, 'settings') - old_settings_name = tablename(old, 'settings') - - # Table renames using sqlalchemy-migrate (available on pypi) - if new_ui_name == old_ui_name: - print 'No renaming of %s' % new_ui_name - else: - try: - t = metadata.tables[old_ui_name] - print 'Renaming', t, 'to', new_ui_name - migrate.changeset.rename_table(t, new_ui_name) - except KeyError as e: - print 'Not renaming ui:', e - - if new_settings_name == old_settings_name: - print 'No renaming of %s' % new_settings_name - else: - try: - t = metadata.tables[old_settings_name] - print 'Renaming', t, 'to', new_settings_name - migrate.changeset.rename_table(t, new_settings_name) - except KeyError as e: - print 'Not renaming settings:', e - - old_auth_name = 'internal' if old == 'kallithea' else old - new_auth_name = 'internal' if new == 'kallithea' else new - - # using this API because ... dunno ... it is simple and works - conn = metadata.bind.connect() - trans = conn.begin() - t = metadata.tables['users'] - - print 'Bulk fixing of User extern_name' - try: - t.c.extern_name - except AttributeError: - print 'No extern_name to rename' - else: - t.update().where(t.c.extern_name == old_auth_name).values(extern_name=new_auth_name).execute() - - print 'Bulk fixing of User extern_type' - try: - t.c.extern_type - except AttributeError: - print 'No extern_type to rename' - else: - t.update().where(t.c.extern_type == old_auth_name).values(extern_type=new_auth_name).execute() - - trans.commit() - - # For the following conversions, use ORM ... and create stub models that works for that purpose - Base = sqlalchemy.ext.declarative.declarative_base() - - class Ui(Base): - __tablename__ = new_ui_name - ui_id = Column("ui_id", Integer(), primary_key=True) - ui_section = Column("ui_section", String()) - ui_key = Column("ui_key", String()) - ui_value = Column("ui_value", String()) - ui_active = Column("ui_active", Boolean()) - - class Setting(Base): - __tablename__ = new_settings_name - app_settings_id = Column("app_settings_id", Integer(), primary_key=True) - app_settings_name = Column("app_settings_name", String()) - app_settings_value = Column("app_settings_value", String()) - #app_settings_type = Column("app_settings_type", String()) # not present in v1.7.2 - - class DbMigrateVersion(Base): - __tablename__ = 'db_migrate_version' - repository_id = Column('repository_id', String(), primary_key=True) - repository_path = Column('repository_path', Text) - version = Column('version', Integer) - - Session = sqlalchemy.orm.sessionmaker(bind=metadata.bind) - session = Session() - - print 'Fixing hook names' - - oldhooks = u'python:%s.lib.hooks.' % old - newhooks = u'python:%s.lib.hooks.' % new - for u in session.query(Ui).filter(Ui.ui_section == 'hooks').all(): - if u.ui_value.startswith(oldhooks): - print '- fixing %s' % u.ui_key - u.ui_value = newhooks + u.ui_value[len(oldhooks):] - session.add(u) - session.commit() - - print 'Fixing auth module names' - for s in session.query(Setting).filter(Setting.app_settings_name == 'auth_plugins').all(): - print '- fixing %s' % s.app_settings_name - s.app_settings_value = (s.app_settings_value - .replace(old + '.lib.auth_modules.auth_', new + '.lib.auth_modules.auth_') - .replace('.auth_modules.auth_' + old_auth_name, '.auth_modules.auth_' + new_auth_name)) - session.add(s) - for s in session.query(Setting).filter(Setting.app_settings_name == 'auth_' + old_auth_name + '_enabled').all(): - print '- fixing %s' % s.app_settings_name - s.app_settings_name = 'auth_' + new_auth_name + '_enabled' - session.add(s) - session.commit() - - print 'Fixing db migration version number' - for s in session.query(DbMigrateVersion).filter(DbMigrateVersion.repository_id == old + '_db_migrations', DbMigrateVersion.repository_path == 'versions').all(): - print '- fixing %s' % s.repository_id - s.repository_id = new + '_db_migrations' - session.commit() - - print 'Done' - -def main(argv): - if len(argv) < 2 or argv[1] in ['-h', '--help']: - print 'usage: kallithea/bin/rebranddb.py DBSTRING [NEW] [OLD]' - print ' where DBSTRING is the value of sqlalchemy.db1.url from the .ini,' - print ' NEW defaults to "kallithea", OLD is by default detected from the db"' - raise SystemExit(0) - new = 'kallithea' - if len(argv) > 2: - new = argv[2] - old = None - if len(argv) > 3: - old = argv[3] - do_migrate(argv[1], old, new) - -if __name__ == '__main__': - main(sys.argv) diff --git a/kallithea/bin/template.ini.mako b/kallithea/bin/template.ini.mako deleted file mode 100644 --- a/kallithea/bin/template.ini.mako +++ /dev/null @@ -1,591 +0,0 @@ -## -*- coding: utf-8 -*- -<%text>################################################################################ -<%text>################################################################################ -# Kallithea - config file generated with kallithea-config # -<%text>################################################################################ -<%text>################################################################################ - -[DEFAULT] -debug = true -pdebug = false - -<%text>################################################################################ -<%text>## Email settings ## -<%text>## ## -<%text>## Refer to the documentation ("Email settings") for more details. ## -<%text>## ## -<%text>## It is recommended to use a valid sender address that passes access ## -<%text>## validation and spam filtering in mail servers. ## -<%text>################################################################################ - -<%text>## 'From' header for application emails. You can optionally add a name. -<%text>## Default: -#app_email_from = Kallithea -<%text>## Examples: -#app_email_from = Kallithea -#app_email_from = kallithea-noreply@example.com - -<%text>## Subject prefix for application emails. -<%text>## A space between this prefix and the real subject is automatically added. -<%text>## Default: -#email_prefix = -<%text>## Example: -#email_prefix = [Kallithea] - -<%text>## Recipients for error emails and fallback recipients of application mails. -<%text>## Multiple addresses can be specified, space-separated. -<%text>## Only addresses are allowed, do not add any name part. -<%text>## Default: -#email_to = -<%text>## Examples: -#email_to = admin@example.com -#email_to = admin@example.com another_admin@example.com - -<%text>## 'From' header for error emails. You can optionally add a name. -<%text>## Default: -#error_email_from = pylons@yourapp.com -<%text>## Examples: -#error_email_from = Kallithea Errors -#error_email_from = paste_error@example.com - -<%text>## SMTP server settings -<%text>## Only smtp_server is mandatory. All other settings take the specified default -<%text>## values. -#smtp_server = smtp.example.com -#smtp_username = -#smtp_password = -#smtp_port = 25 -#smtp_use_tls = false -#smtp_use_ssl = false -<%text>## SMTP authentication parameters to use (e.g. LOGIN PLAIN CRAM-MD5, etc.). -<%text>## If empty, use any of the authentication parameters supported by the server. -#smtp_auth = - -[server:main] -%if http_server == 'paste': -<%text>## PASTE ## -use = egg:Paste#http -<%text>## nr of worker threads to spawn -threadpool_workers = 1 -<%text>## max request before thread respawn -threadpool_max_requests = 100 -<%text>## option to use threads of process -use_threadpool = true - -%elif http_server == 'waitress': -<%text>## WAITRESS ## -use = egg:waitress#main -<%text>## number of worker threads -threads = 1 -<%text>## MAX BODY SIZE 100GB -max_request_body_size = 107374182400 -<%text>## use poll instead of select, fixes fd limits, may not work on old -<%text>## windows systems. -#asyncore_use_poll = True - -%elif http_server == 'gunicorn': -<%text>## GUNICORN ## -use = egg:gunicorn#main -<%text>## number of process workers. You must set `instance_id = *` when this option -<%text>## is set to more than one worker -workers = 1 -<%text>## process name -proc_name = kallithea -<%text>## type of worker class, one of sync, eventlet, gevent, tornado -<%text>## recommended for bigger setup is using of of other than sync one -worker_class = sync -max_requests = 1000 -<%text>## ammount of time a worker can handle request before it gets killed and -<%text>## restarted -timeout = 3600 - -%elif http_server == 'uwsgi': -<%text>## UWSGI ## -<%text>## run with uwsgi --ini-paste-logged -[uwsgi] -socket = /tmp/uwsgi.sock -master = true -http = 127.0.0.1:5000 - -<%text>## set as deamon and redirect all output to file -#daemonize = ./uwsgi_kallithea.log - -<%text>## master process PID -pidfile = ./uwsgi_kallithea.pid - -<%text>## stats server with workers statistics, use uwsgitop -<%text>## for monitoring, `uwsgitop 127.0.0.1:1717` -stats = 127.0.0.1:1717 -memory-report = true - -<%text>## log 5XX errors -log-5xx = true - -<%text>## Set the socket listen queue size. -listen = 256 - -<%text>## Gracefully Reload workers after the specified amount of managed requests -<%text>## (avoid memory leaks). -max-requests = 1000 - -<%text>## enable large buffers -buffer-size = 65535 - -<%text>## socket and http timeouts ## -http-timeout = 3600 -socket-timeout = 3600 - -<%text>## Log requests slower than the specified number of milliseconds. -log-slow = 10 - -<%text>## Exit if no app can be loaded. -need-app = true - -<%text>## Set lazy mode (load apps in workers instead of master). -lazy = true - -<%text>## scaling ## -<%text>## set cheaper algorithm to use, if not set default will be used -cheaper-algo = spare - -<%text>## minimum number of workers to keep at all times -cheaper = 1 - -<%text>## number of workers to spawn at startup -cheaper-initial = 1 - -<%text>## maximum number of workers that can be spawned -workers = 4 - -<%text>## how many workers should be spawned at a time -cheaper-step = 1 - -%endif -<%text>## COMMON ## -host = ${host} -port = ${port} - -<%text>## middleware for hosting the WSGI application under a URL prefix -#[filter:proxy-prefix] -#use = egg:PasteDeploy#prefix -#prefix = / - -[app:main] -use = egg:kallithea -<%text>## enable proxy prefix middleware -#filter-with = proxy-prefix - -full_stack = true -static_files = true -<%text>## Available Languages: -<%text>## cs de fr hu ja nl_BE pl pt_BR ru sk zh_CN zh_TW -lang = -cache_dir = ${here}/data -index_dir = ${here}/data/index - -<%text>## perform a full repository scan on each server start, this should be -<%text>## set to false after first startup, to allow faster server restarts. -initial_repo_scan = false - -<%text>## uncomment and set this path to use archive download cache -archive_cache_dir = ${here}/tarballcache - -<%text>## change this to unique ID for security -app_instance_uuid = ${uuid()} - -<%text>## cut off limit for large diffs (size in bytes) -cut_off_limit = 256000 - -<%text>## use cache version of scm repo everywhere -vcs_full_cache = true - -<%text>## force https in Kallithea, fixes https redirects, assumes it's always https -force_https = false - -<%text>## use Strict-Transport-Security headers -use_htsts = false - -<%text>## number of commits stats will parse on each iteration -commit_parse_limit = 25 - -<%text>## path to git executable -git_path = git - -<%text>## git rev filter option, --all is the default filter, if you need to -<%text>## hide all refs in changelog switch this to --branches --tags -#git_rev_filter = --branches --tags - -<%text>## RSS feed options -rss_cut_off_limit = 256000 -rss_items_per_page = 10 -rss_include_diff = false - -<%text>## options for showing and identifying changesets -show_sha_length = 12 -show_revision_number = false - -<%text>## gist URL alias, used to create nicer urls for gist. This should be an -<%text>## url that does rewrites to _admin/gists/. -<%text>## example: http://gist.example.com/{gistid}. Empty means use the internal -<%text>## Kallithea url, ie. http[s]://kallithea.example.com/_admin/gists/ -gist_alias_url = - -<%text>## white list of API enabled controllers. This allows to add list of -<%text>## controllers to which access will be enabled by api_key. eg: to enable -<%text>## api access to raw_files put `FilesController:raw`, to enable access to patches -<%text>## add `ChangesetController:changeset_patch`. This list should be "," separated -<%text>## Syntax is :. Check debug logs for generated names -<%text>## Recommended settings below are commented out: -api_access_controllers_whitelist = -# ChangesetController:changeset_patch, -# ChangesetController:changeset_raw, -# FilesController:raw, -# FilesController:archivefile - -<%text>## default encoding used to convert from and to unicode -<%text>## can be also a comma seperated list of encoding in case of mixed encodings -default_encoding = utf8 - -<%text>## issue tracker for Kallithea (leave blank to disable, absent for default) -#bugtracker = https://bitbucket.org/conservancy/kallithea/issues - -<%text>## issue tracking mapping for commits messages -<%text>## comment out issue_pat, issue_server, issue_prefix to enable - -<%text>## pattern to get the issues from commit messages -<%text>## default one used here is # with a regex passive group for `#` -<%text>## {id} will be all groups matched from this pattern - -issue_pat = (?:\s*#)(\d+) - -<%text>## server url to the issue, each {id} will be replaced with match -<%text>## fetched from the regex and {repo} is replaced with full repository name -<%text>## including groups {repo_name} is replaced with just name of repo - -issue_server_link = https://issues.example.com/{repo}/issue/{id} - -<%text>## prefix to add to link to indicate it's an url -<%text>## #314 will be replaced by - -issue_prefix = # - -<%text>## issue_pat, issue_server_link, issue_prefix can have suffixes to specify -<%text>## multiple patterns, to other issues server, wiki or others -<%text>## below an example how to create a wiki pattern -# wiki-some-id -> https://wiki.example.com/some-id - -#issue_pat_wiki = (?:wiki-)(.+) -#issue_server_link_wiki = https://wiki.example.com/{id} -#issue_prefix_wiki = WIKI- - -<%text>## instance-id prefix -<%text>## a prefix key for this instance used for cache invalidation when running -<%text>## multiple instances of kallithea, make sure it's globally unique for -<%text>## all running kallithea instances. Leave empty if you don't use it -instance_id = - -<%text>## alternative return HTTP header for failed authentication. Default HTTP -<%text>## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with -<%text>## handling that. Set this variable to 403 to return HTTPForbidden -auth_ret_code = - -<%text>## locking return code. When repository is locked return this HTTP code. 2XX -<%text>## codes don't break the transactions while 4XX codes do -lock_ret_code = 423 - -<%text>## allows to change the repository location in settings page -allow_repo_location_change = True - -<%text>## allows to setup custom hooks in settings page -allow_custom_hooks_settings = True - -<%text>#################################### -<%text>### CELERY CONFIG #### -<%text>#################################### - -use_celery = false -broker.host = localhost -broker.vhost = rabbitmqhost -broker.port = 5672 -broker.user = rabbitmq -broker.password = qweqwe - -celery.imports = kallithea.lib.celerylib.tasks - -celery.result.backend = amqp -celery.result.dburi = amqp:// -celery.result.serialier = json - -#celery.send.task.error.emails = true -#celery.amqp.task.result.expires = 18000 - -celeryd.concurrency = 2 -#celeryd.log.file = celeryd.log -celeryd.log.level = DEBUG -celeryd.max.tasks.per.child = 1 - -<%text>## tasks will never be sent to the queue, but executed locally instead. -celery.always.eager = false - -<%text>#################################### -<%text>### BEAKER CACHE #### -<%text>#################################### - -beaker.cache.data_dir = ${here}/data/cache/data -beaker.cache.lock_dir = ${here}/data/cache/lock - -beaker.cache.regions = short_term,long_term,sql_cache_short - -beaker.cache.short_term.type = memory -beaker.cache.short_term.expire = 60 -beaker.cache.short_term.key_length = 256 - -beaker.cache.long_term.type = memory -beaker.cache.long_term.expire = 36000 -beaker.cache.long_term.key_length = 256 - -beaker.cache.sql_cache_short.type = memory -beaker.cache.sql_cache_short.expire = 10 -beaker.cache.sql_cache_short.key_length = 256 - -<%text>#################################### -<%text>### BEAKER SESSION #### -<%text>#################################### - -<%text>## Name of session cookie. Should be unique for a given host and path, even when running -<%text>## on different ports. Otherwise, cookie sessions will be shared and messed up. -beaker.session.key = kallithea -<%text>## Sessions should always only be accessible by the browser, not directly by JavaScript. -beaker.session.httponly = true -<%text>## Session lifetime. 2592000 seconds is 30 days. -beaker.session.timeout = 2592000 - -<%text>## Server secret used with HMAC to ensure integrity of cookies. -beaker.session.secret = ${uuid()} -<%text>## Further, encrypt the data with AES. -#beaker.session.encrypt_key = -#beaker.session.validate_key = - -<%text>## Type of storage used for the session, current types are -<%text>## dbm, file, memcached, database, and memory. - -<%text>## File system storage of session data. (default) -#beaker.session.type = file - -<%text>## Cookie only, store all session data inside the cookie. Requires secure secrets. -#beaker.session.type = cookie - -<%text>## Database storage of session data. -#beaker.session.type = ext:database -#beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea -#beaker.session.table_name = db_session - -%if error_aggregation_service == 'appenlight': -<%text>############################ -<%text>## ERROR HANDLING SYSTEMS ## -<%text>############################ - -<%text>#################### -<%text>### [appenlight] ### -<%text>#################### - -<%text>## AppEnlight is tailored to work with Kallithea, see -<%text>## http://appenlight.com for details how to obtain an account -<%text>## you must install python package `appenlight_client` to make it work - -<%text>## appenlight enabled -appenlight = false - -appenlight.server_url = https://api.appenlight.com -appenlight.api_key = YOUR_API_KEY - -<%text>## TWEAK AMOUNT OF INFO SENT HERE - -<%text>## enables 404 error logging (default False) -appenlight.report_404 = false - -<%text>## time in seconds after request is considered being slow (default 1) -appenlight.slow_request_time = 1 - -<%text>## record slow requests in application -<%text>## (needs to be enabled for slow datastore recording and time tracking) -appenlight.slow_requests = true - -<%text>## enable hooking to application loggers -#appenlight.logging = true - -<%text>## minimum log level for log capture -#appenlight.logging.level = WARNING - -<%text>## send logs only from erroneous/slow requests -<%text>## (saves API quota for intensive logging) -appenlight.logging_on_error = false - -<%text>## list of additonal keywords that should be grabbed from environ object -<%text>## can be string with comma separated list of words in lowercase -<%text>## (by default client will always send following info: -<%text>## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that -<%text>## start with HTTP* this list be extended with additional keywords here -appenlight.environ_keys_whitelist = - -<%text>## list of keywords that should be blanked from request object -<%text>## can be string with comma separated list of words in lowercase -<%text>## (by default client will always blank keys that contain following words -<%text>## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf' -<%text>## this list be extended with additional keywords set here -appenlight.request_keys_blacklist = - -<%text>## list of namespaces that should be ignores when gathering log entries -<%text>## can be string with comma separated list of namespaces -<%text>## (by default the client ignores own entries: appenlight_client.client) -appenlight.log_namespace_blacklist = - -%elif error_aggregation_service == 'sentry': -<%text>################ -<%text>### [sentry] ### -<%text>################ - -<%text>## sentry is a alternative open source error aggregator -<%text>## you must install python packages `sentry` and `raven` to enable - -sentry.dsn = YOUR_DNS -sentry.servers = -sentry.name = -sentry.key = -sentry.public_key = -sentry.secret_key = -sentry.project = -sentry.site = -sentry.include_paths = -sentry.exclude_paths = - -%endif -<%text>################################################################################ -<%text>## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* ## -<%text>## Debug mode will enable the interactive debugging tool, allowing ANYONE to ## -<%text>## execute malicious code after an exception is raised. ## -<%text>################################################################################ -set debug = false - -<%text>################################## -<%text>### LOGVIEW CONFIG ### -<%text>################################## - -logview.sqlalchemy = #faa -logview.pylons.templating = #bfb -logview.pylons.util = #eee - -<%text>######################################################### -<%text>### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ### -<%text>######################################################### - -%if database_engine == 'sqlite': -# SQLITE [default] -sqlalchemy.db1.url = sqlite:///${here}/kallithea.db?timeout=60 - -%elif database_engine == 'postgres': -# POSTGRESQL -sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea - -%elif database_engine == 'mysql': -# MySQL -sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea - -%endif -# see sqlalchemy docs for others - -sqlalchemy.db1.echo = false -sqlalchemy.db1.pool_recycle = 3600 -sqlalchemy.db1.convert_unicode = true - -<%text>################################ -<%text>### LOGGING CONFIGURATION #### -<%text>################################ - -[loggers] -keys = root, routes, kallithea, sqlalchemy, beaker, templates, whoosh_indexer - -[handlers] -keys = console, console_sql - -[formatters] -keys = generic, color_formatter, color_formatter_sql - -<%text>############# -<%text>## LOGGERS ## -<%text>############# - -[logger_root] -level = NOTSET -handlers = console - -[logger_routes] -level = DEBUG -handlers = -qualname = routes.middleware -<%text>## "level = DEBUG" logs the route matched and routing variables. -propagate = 1 - -[logger_beaker] -level = DEBUG -handlers = -qualname = beaker.container -propagate = 1 - -[logger_templates] -level = INFO -handlers = -qualname = pylons.templating -propagate = 1 - -[logger_kallithea] -level = DEBUG -handlers = -qualname = kallithea -propagate = 1 - -[logger_sqlalchemy] -level = INFO -handlers = console_sql -qualname = sqlalchemy.engine -propagate = 0 - -[logger_whoosh_indexer] -level = DEBUG -handlers = -qualname = whoosh_indexer -propagate = 1 - -<%text>############## -<%text>## HANDLERS ## -<%text>############## - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = INFO -formatter = generic - -[handler_console_sql] -class = StreamHandler -args = (sys.stderr,) -level = WARN -formatter = generic - -<%text>################ -<%text>## FORMATTERS ## -<%text>################ - -[formatter_generic] -format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %Y-%m-%d %H:%M:%S - -[formatter_color_formatter] -class = kallithea.lib.colored_formatter.ColorFormatter -format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %Y-%m-%d %H:%M:%S - -[formatter_color_formatter_sql] -class = kallithea.lib.colored_formatter.ColorFormatterSql -format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %Y-%m-%d %H:%M:%S diff --git a/kallithea/config/app_cfg.py b/kallithea/config/app_cfg.py new file mode 100644 --- /dev/null +++ b/kallithea/config/app_cfg.py @@ -0,0 +1,214 @@ +# -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +""" +Global configuration file for TurboGears2 specific settings in Kallithea. + +This file complements the .ini file. +""" + +import platform +import os, sys, logging + +import tg +from tg import hooks +from tg.configuration import AppConfig +from tg.support.converters import asbool +import alembic.config +from alembic.script.base import ScriptDirectory +from alembic.migration import MigrationContext +from sqlalchemy import create_engine +import mercurial + +from kallithea.lib.middleware.https_fixup import HttpsFixup +from kallithea.lib.middleware.simplegit import SimpleGit +from kallithea.lib.middleware.simplehg import SimpleHg +from kallithea.lib.auth import set_available_permissions +from kallithea.lib.utils import load_rcextensions, make_ui, set_app_settings, set_vcs_config, \ + set_indexer_config, check_git_version, repo2db_mapper +from kallithea.lib.utils2 import str2bool +import kallithea.model.base +from kallithea.model.scm import ScmModel + +import formencode + +log = logging.getLogger(__name__) + + +class KallitheaAppConfig(AppConfig): + # Note: AppConfig has a misleading name, as it's not the application + # configuration, but the application configurator. The AppConfig values are + # used as a template to create the actual configuration, which might + # overwrite or extend the one provided by the configurator template. + + # To make it clear, AppConfig creates the config and sets into it the same + # values that AppConfig itself has. Then the values from the config file and + # gearbox options are loaded and merged into the configuration. Then an + # after_init_config(conf) method of AppConfig is called for any change that + # might depend on options provided by configuration files. + + def __init__(self): + super(KallitheaAppConfig, self).__init__() + + self['package'] = kallithea + + self['prefer_toscawidgets2'] = False + self['use_toscawidgets'] = False + + self['renderers'] = [] + + # Enable json in expose + self['renderers'].append('json') + + # Configure template rendering + self['renderers'].append('mako') + self['default_renderer'] = 'mako' + self['use_dotted_templatenames'] = False + + # Configure Sessions, store data as JSON to avoid pickle security issues + self['session.enabled'] = True + self['session.data_serializer'] = 'json' + + # Configure the base SQLALchemy Setup + self['use_sqlalchemy'] = True + self['model'] = kallithea.model.base + self['DBSession'] = kallithea.model.meta.Session + + # Configure App without an authentication backend. + self['auth_backend'] = None + + # Use custom error page for these errors. By default, Turbogears2 does not add + # 400 in this list. + # Explicitly listing all is considered more robust than appending to defaults, + # in light of possible future framework changes. + self['errorpage.status_codes'] = [400, 401, 403, 404] + + # Disable transaction manager -- currently Kallithea takes care of transactions itself + self['tm.enabled'] = False + + +base_config = KallitheaAppConfig() + +# TODO still needed as long as we use pylonslib +sys.modules['pylons'] = tg + +# DebugBar, a debug toolbar for TurboGears2. +# (https://github.com/TurboGears/tgext.debugbar) +# To enable it, install 'tgext.debugbar' and 'kajiki', and run Kallithea with +# 'debug = true' (not in production!) +# See the Kallithea documentation for more information. +try: + from tgext.debugbar import enable_debugbar + import kajiki # only to check its existence +except ImportError: + pass +else: + base_config['renderers'].append('kajiki') + enable_debugbar(base_config) + + +def setup_configuration(app): + config = app.config + + # Verify that things work when Dulwich passes unicode paths to the file system layer. + # Note: UTF-8 is preferred, but for example ISO-8859-1 or mbcs should also work under the right cirumstances. + try: + u'\xe9'.encode(sys.getfilesystemencoding()) # Test using é (é) + except UnicodeEncodeError: + log.error("Cannot encode Unicode paths to file system encoding %r", sys.getfilesystemencoding()) + for var in ['LC_CTYPE', 'LC_ALL', 'LANG']: + if var in os.environ: + val = os.environ[var] + log.error("Note: Environment variable %s is %r - perhaps change it to some other value from 'locale -a', like 'C.UTF-8' or 'en_US.UTF-8'", var, val) + break + else: + log.error("Note: No locale setting found in environment variables - perhaps set LC_CTYPE to some value from 'locale -a', like 'C.UTF-8' or 'en_US.UTF-8'") + log.error("Terminating ...") + sys.exit(1) + + # Mercurial sets encoding at module import time, so we have to monkey patch it + hgencoding = config.get('hgencoding') + if hgencoding: + mercurial.encoding.encoding = hgencoding + + if config.get('ignore_alembic_revision', False): + log.warn('database alembic revision checking is disabled') + else: + dbconf = config['sqlalchemy.url'] + alembic_cfg = alembic.config.Config() + alembic_cfg.set_main_option('script_location', 'kallithea:alembic') + alembic_cfg.set_main_option('sqlalchemy.url', dbconf) + script_dir = ScriptDirectory.from_config(alembic_cfg) + available_heads = sorted(script_dir.get_heads()) + + engine = create_engine(dbconf) + with engine.connect() as conn: + context = MigrationContext.configure(conn) + current_heads = sorted(str(s) for s in context.get_current_heads()) + if current_heads != available_heads: + log.error('Failed to run Kallithea:\n\n' + 'The database version does not match the Kallithea version.\n' + 'Please read the documentation on how to upgrade or downgrade the database.\n' + 'Current database version id(s): %s\n' + 'Expected database version id(s): %s\n' + 'If you are a developer and you know what you are doing, you can add `ignore_alembic_revision = True` ' + 'to your .ini file to skip the check.\n' % (' '.join(current_heads), ' '.join(available_heads))) + sys.exit(1) + + # store some globals into kallithea + kallithea.CELERY_ON = str2bool(config['app_conf'].get('use_celery')) + kallithea.CELERY_EAGER = str2bool(config['app_conf'].get('celery.always.eager')) + kallithea.CONFIG = config + + load_rcextensions(root_path=config['here']) + + set_available_permissions(config) + repos_path = make_ui('db').configitems('paths')[0][1] + config['base_path'] = repos_path + set_app_settings(config) + + instance_id = kallithea.CONFIG.get('instance_id', '*') + if instance_id == '*': + instance_id = '%s-%s' % (platform.uname()[1], os.getpid()) + kallithea.CONFIG['instance_id'] = instance_id + + # update kallithea.CONFIG with the meanwhile changed 'config' + kallithea.CONFIG.update(config) + + # configure vcs and indexer libraries (they are supposed to be independent + # as much as possible and thus avoid importing tg.config or + # kallithea.CONFIG). + set_vcs_config(kallithea.CONFIG) + set_indexer_config(kallithea.CONFIG) + + check_git_version() + + +hooks.register('configure_new_app', setup_configuration) + + +def setup_application(app): + config = app.config + + # we want our low level middleware to get to the request ASAP. We don't + # need any stack middleware in them - especially no StatusCodeRedirect buffering + app = SimpleHg(app, config) + app = SimpleGit(app, config) + + # Enable https redirects based on HTTP_X_URL_SCHEME set by proxy + if any(asbool(config.get(x)) for x in ['https_fixup', 'force_https', 'use_htsts']): + app = HttpsFixup(app, config) + return app + + +hooks.register('before_config', setup_application) diff --git a/kallithea/config/conf.py b/kallithea/config/conf.py --- a/kallithea/config/conf.py +++ b/kallithea/config/conf.py @@ -25,19 +25,21 @@ Original author and date, and relevant c :license: GPLv3, see LICENSE.md for more details. """ -from kallithea.lib.utils2 import __get_lem +from kallithea.lib import pygmentsutils # language map is also used by whoosh indexer, which for those specified # extensions will index it's content -LANGUAGES_EXTENSIONS_MAP = __get_lem() +LANGUAGES_EXTENSIONS_MAP = pygmentsutils.get_extension_descriptions() + +# Whoosh index targets -#============================================================================== -# WHOOSH INDEX EXTENSIONS -#============================================================================== -# EXTENSIONS WE WANT TO INDEX CONTENT OFF USING WHOOSH +# Extensions we want to index content of using whoosh INDEX_EXTENSIONS = LANGUAGES_EXTENSIONS_MAP.keys() +# Filenames we want to index content of using whoosh +INDEX_FILENAMES = pygmentsutils.get_index_filenames() + # list of readme files to search in file tree and display in summary # attached weights defines the search order lower is first ALL_READMES = [ @@ -65,7 +67,3 @@ MARKDOWN_EXTS = [ PLAIN_EXTS = [('.text', 2), ('.TEXT', 2)] ALL_EXTS = MARKDOWN_EXTS + RST_EXTS + PLAIN_EXTS - -DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S" - -DATE_FORMAT = "%Y-%m-%d" diff --git a/kallithea/config/deployment.ini_tmpl b/kallithea/config/deployment.ini_tmpl deleted file mode 100644 --- a/kallithea/config/deployment.ini_tmpl +++ /dev/null @@ -1,580 +0,0 @@ -################################################################################ -################################################################################ -# Kallithea - Example config # -# # -# The %(here)s variable will be replaced with the parent directory of this file# -################################################################################ -################################################################################ - -[DEFAULT] -debug = true -pdebug = false - -################################################################################ -## Email settings ## -## ## -## Refer to the documentation ("Email settings") for more details. ## -## ## -## It is recommended to use a valid sender address that passes access ## -## validation and spam filtering in mail servers. ## -################################################################################ - -## 'From' header for application emails. You can optionally add a name. -## Default: -#app_email_from = Kallithea -## Examples: -#app_email_from = Kallithea -#app_email_from = kallithea-noreply@example.com - -## Subject prefix for application emails. -## A space between this prefix and the real subject is automatically added. -## Default: -#email_prefix = -## Example: -#email_prefix = [Kallithea] - -## Recipients for error emails and fallback recipients of application mails. -## Multiple addresses can be specified, space-separated. -## Only addresses are allowed, do not add any name part. -## Default: -#email_to = -## Examples: -#email_to = admin@example.com -#email_to = admin@example.com another_admin@example.com - -## 'From' header for error emails. You can optionally add a name. -## Default: -#error_email_from = pylons@yourapp.com -## Examples: -#error_email_from = Kallithea Errors -#error_email_from = paste_error@example.com - -## SMTP server settings -## Only smtp_server is mandatory. All other settings take the specified default -## values. -#smtp_server = smtp.example.com -#smtp_username = -#smtp_password = -#smtp_port = 25 -#smtp_use_tls = false -#smtp_use_ssl = false -## SMTP authentication parameters to use (e.g. LOGIN PLAIN CRAM-MD5, etc.). -## If empty, use any of the authentication parameters supported by the server. -#smtp_auth = - -[server:main] -## PASTE ## -#use = egg:Paste#http -## nr of worker threads to spawn -#threadpool_workers = 1 -## max request before thread respawn -#threadpool_max_requests = 100 -## option to use threads of process -#use_threadpool = true - -## WAITRESS ## -use = egg:waitress#main -## number of worker threads -threads = 1 -## MAX BODY SIZE 100GB -max_request_body_size = 107374182400 -## use poll instead of select, fixes fd limits, may not work on old -## windows systems. -#asyncore_use_poll = True - -## GUNICORN ## -#use = egg:gunicorn#main -## number of process workers. You must set `instance_id = *` when this option -## is set to more than one worker -#workers = 1 -## process name -#proc_name = kallithea -## type of worker class, one of sync, eventlet, gevent, tornado -## recommended for bigger setup is using of of other than sync one -#worker_class = sync -#max_requests = 1000 -## ammount of time a worker can handle request before it gets killed and -## restarted -#timeout = 3600 - -## UWSGI ## -## run with uwsgi --ini-paste-logged -#[uwsgi] -#socket = /tmp/uwsgi.sock -#master = true -#http = 127.0.0.1:5000 - -## set as deamon and redirect all output to file -#daemonize = ./uwsgi_kallithea.log - -## master process PID -#pidfile = ./uwsgi_kallithea.pid - -## stats server with workers statistics, use uwsgitop -## for monitoring, `uwsgitop 127.0.0.1:1717` -#stats = 127.0.0.1:1717 -#memory-report = true - -## log 5XX errors -#log-5xx = true - -## Set the socket listen queue size. -#listen = 256 - -## Gracefully Reload workers after the specified amount of managed requests -## (avoid memory leaks). -#max-requests = 1000 - -## enable large buffers -#buffer-size = 65535 - -## socket and http timeouts ## -#http-timeout = 3600 -#socket-timeout = 3600 - -## Log requests slower than the specified number of milliseconds. -#log-slow = 10 - -## Exit if no app can be loaded. -#need-app = true - -## Set lazy mode (load apps in workers instead of master). -#lazy = true - -## scaling ## -## set cheaper algorithm to use, if not set default will be used -#cheaper-algo = spare - -## minimum number of workers to keep at all times -#cheaper = 1 - -## number of workers to spawn at startup -#cheaper-initial = 1 - -## maximum number of workers that can be spawned -#workers = 4 - -## how many workers should be spawned at a time -#cheaper-step = 1 - -## COMMON ## -host = 127.0.0.1 -port = 5000 - -## middleware for hosting the WSGI application under a URL prefix -#[filter:proxy-prefix] -#use = egg:PasteDeploy#prefix -#prefix = / - -[app:main] -use = egg:kallithea -## enable proxy prefix middleware -#filter-with = proxy-prefix - -full_stack = true -static_files = true -## Available Languages: -## cs de fr hu ja nl_BE pl pt_BR ru sk zh_CN zh_TW -lang = -cache_dir = %(here)s/data -index_dir = %(here)s/data/index - -## perform a full repository scan on each server start, this should be -## set to false after first startup, to allow faster server restarts. -initial_repo_scan = false - -## uncomment and set this path to use archive download cache -archive_cache_dir = %(here)s/tarballcache - -## change this to unique ID for security -app_instance_uuid = ${app_instance_uuid} - -## cut off limit for large diffs (size in bytes) -cut_off_limit = 256000 - -## use cache version of scm repo everywhere -vcs_full_cache = true - -## force https in Kallithea, fixes https redirects, assumes it's always https -force_https = false - -## use Strict-Transport-Security headers -use_htsts = false - -## number of commits stats will parse on each iteration -commit_parse_limit = 25 - -## path to git executable -git_path = git - -## git rev filter option, --all is the default filter, if you need to -## hide all refs in changelog switch this to --branches --tags -#git_rev_filter = --branches --tags - -## RSS feed options -rss_cut_off_limit = 256000 -rss_items_per_page = 10 -rss_include_diff = false - -## options for showing and identifying changesets -show_sha_length = 12 -show_revision_number = false - -## gist URL alias, used to create nicer urls for gist. This should be an -## url that does rewrites to _admin/gists/. -## example: http://gist.example.com/{gistid}. Empty means use the internal -## Kallithea url, ie. http[s]://kallithea.example.com/_admin/gists/ -gist_alias_url = - -## white list of API enabled controllers. This allows to add list of -## controllers to which access will be enabled by api_key. eg: to enable -## api access to raw_files put `FilesController:raw`, to enable access to patches -## add `ChangesetController:changeset_patch`. This list should be "," separated -## Syntax is :. Check debug logs for generated names -## Recommended settings below are commented out: -api_access_controllers_whitelist = -# ChangesetController:changeset_patch, -# ChangesetController:changeset_raw, -# FilesController:raw, -# FilesController:archivefile - -## default encoding used to convert from and to unicode -## can be also a comma seperated list of encoding in case of mixed encodings -default_encoding = utf8 - -## issue tracker for Kallithea (leave blank to disable, absent for default) -#bugtracker = https://bitbucket.org/conservancy/kallithea/issues - -## issue tracking mapping for commits messages -## comment out issue_pat, issue_server, issue_prefix to enable - -## pattern to get the issues from commit messages -## default one used here is # with a regex passive group for `#` -## {id} will be all groups matched from this pattern - -issue_pat = (?:\s*#)(\d+) - -## server url to the issue, each {id} will be replaced with match -## fetched from the regex and {repo} is replaced with full repository name -## including groups {repo_name} is replaced with just name of repo - -issue_server_link = https://issues.example.com/{repo}/issue/{id} - -## prefix to add to link to indicate it's an url -## #314 will be replaced by - -issue_prefix = # - -## issue_pat, issue_server_link, issue_prefix can have suffixes to specify -## multiple patterns, to other issues server, wiki or others -## below an example how to create a wiki pattern -# wiki-some-id -> https://wiki.example.com/some-id - -#issue_pat_wiki = (?:wiki-)(.+) -#issue_server_link_wiki = https://wiki.example.com/{id} -#issue_prefix_wiki = WIKI- - -## instance-id prefix -## a prefix key for this instance used for cache invalidation when running -## multiple instances of kallithea, make sure it's globally unique for -## all running kallithea instances. Leave empty if you don't use it -instance_id = - -## alternative return HTTP header for failed authentication. Default HTTP -## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with -## handling that. Set this variable to 403 to return HTTPForbidden -auth_ret_code = - -## locking return code. When repository is locked return this HTTP code. 2XX -## codes don't break the transactions while 4XX codes do -lock_ret_code = 423 - -## allows to change the repository location in settings page -allow_repo_location_change = True - -## allows to setup custom hooks in settings page -allow_custom_hooks_settings = True - -#################################### -### CELERY CONFIG #### -#################################### - -use_celery = false -broker.host = localhost -broker.vhost = rabbitmqhost -broker.port = 5672 -broker.user = rabbitmq -broker.password = qweqwe - -celery.imports = kallithea.lib.celerylib.tasks - -celery.result.backend = amqp -celery.result.dburi = amqp:// -celery.result.serialier = json - -#celery.send.task.error.emails = true -#celery.amqp.task.result.expires = 18000 - -celeryd.concurrency = 2 -#celeryd.log.file = celeryd.log -celeryd.log.level = DEBUG -celeryd.max.tasks.per.child = 1 - -## tasks will never be sent to the queue, but executed locally instead. -celery.always.eager = false - -#################################### -### BEAKER CACHE #### -#################################### - -beaker.cache.data_dir = %(here)s/data/cache/data -beaker.cache.lock_dir = %(here)s/data/cache/lock - -beaker.cache.regions = short_term,long_term,sql_cache_short - -beaker.cache.short_term.type = memory -beaker.cache.short_term.expire = 60 -beaker.cache.short_term.key_length = 256 - -beaker.cache.long_term.type = memory -beaker.cache.long_term.expire = 36000 -beaker.cache.long_term.key_length = 256 - -beaker.cache.sql_cache_short.type = memory -beaker.cache.sql_cache_short.expire = 10 -beaker.cache.sql_cache_short.key_length = 256 - -#################################### -### BEAKER SESSION #### -#################################### - -## Name of session cookie. Should be unique for a given host and path, even when running -## on different ports. Otherwise, cookie sessions will be shared and messed up. -beaker.session.key = kallithea -## Sessions should always only be accessible by the browser, not directly by JavaScript. -beaker.session.httponly = true -## Session lifetime. 2592000 seconds is 30 days. -beaker.session.timeout = 2592000 - -## Server secret used with HMAC to ensure integrity of cookies. -beaker.session.secret = ${app_instance_uuid} -## Further, encrypt the data with AES. -#beaker.session.encrypt_key = -#beaker.session.validate_key = - -## Type of storage used for the session, current types are -## dbm, file, memcached, database, and memory. - -## File system storage of session data. (default) -#beaker.session.type = file - -## Cookie only, store all session data inside the cookie. Requires secure secrets. -#beaker.session.type = cookie - -## Database storage of session data. -#beaker.session.type = ext:database -#beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea -#beaker.session.table_name = db_session - -############################ -## ERROR HANDLING SYSTEMS ## -############################ - -#################### -### [appenlight] ### -#################### - -## AppEnlight is tailored to work with Kallithea, see -## http://appenlight.com for details how to obtain an account -## you must install python package `appenlight_client` to make it work - -## appenlight enabled -appenlight = false - -appenlight.server_url = https://api.appenlight.com -appenlight.api_key = YOUR_API_KEY - -## TWEAK AMOUNT OF INFO SENT HERE - -## enables 404 error logging (default False) -appenlight.report_404 = false - -## time in seconds after request is considered being slow (default 1) -appenlight.slow_request_time = 1 - -## record slow requests in application -## (needs to be enabled for slow datastore recording and time tracking) -appenlight.slow_requests = true - -## enable hooking to application loggers -#appenlight.logging = true - -## minimum log level for log capture -#appenlight.logging.level = WARNING - -## send logs only from erroneous/slow requests -## (saves API quota for intensive logging) -appenlight.logging_on_error = false - -## list of additonal keywords that should be grabbed from environ object -## can be string with comma separated list of words in lowercase -## (by default client will always send following info: -## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that -## start with HTTP* this list be extended with additional keywords here -appenlight.environ_keys_whitelist = - -## list of keywords that should be blanked from request object -## can be string with comma separated list of words in lowercase -## (by default client will always blank keys that contain following words -## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf' -## this list be extended with additional keywords set here -appenlight.request_keys_blacklist = - -## list of namespaces that should be ignores when gathering log entries -## can be string with comma separated list of namespaces -## (by default the client ignores own entries: appenlight_client.client) -appenlight.log_namespace_blacklist = - -################ -### [sentry] ### -################ - -## sentry is a alternative open source error aggregator -## you must install python packages `sentry` and `raven` to enable - -sentry.dsn = YOUR_DNS -sentry.servers = -sentry.name = -sentry.key = -sentry.public_key = -sentry.secret_key = -sentry.project = -sentry.site = -sentry.include_paths = -sentry.exclude_paths = - -################################################################################ -## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* ## -## Debug mode will enable the interactive debugging tool, allowing ANYONE to ## -## execute malicious code after an exception is raised. ## -################################################################################ -set debug = false - -################################## -### LOGVIEW CONFIG ### -################################## - -logview.sqlalchemy = #faa -logview.pylons.templating = #bfb -logview.pylons.util = #eee - -######################################################### -### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ### -######################################################### - -# SQLITE [default] -sqlalchemy.db1.url = sqlite:///%(here)s/kallithea.db?timeout=60 - -# POSTGRESQL -#sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea - -# MySQL -#sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea - -# see sqlalchemy docs for others - -sqlalchemy.db1.echo = false -sqlalchemy.db1.pool_recycle = 3600 -sqlalchemy.db1.convert_unicode = true - -################################ -### LOGGING CONFIGURATION #### -################################ - -[loggers] -keys = root, routes, kallithea, sqlalchemy, beaker, templates, whoosh_indexer - -[handlers] -keys = console, console_sql - -[formatters] -keys = generic, color_formatter, color_formatter_sql - -############# -## LOGGERS ## -############# - -[logger_root] -level = NOTSET -handlers = console - -[logger_routes] -level = DEBUG -handlers = -qualname = routes.middleware -## "level = DEBUG" logs the route matched and routing variables. -propagate = 1 - -[logger_beaker] -level = DEBUG -handlers = -qualname = beaker.container -propagate = 1 - -[logger_templates] -level = INFO -handlers = -qualname = pylons.templating -propagate = 1 - -[logger_kallithea] -level = DEBUG -handlers = -qualname = kallithea -propagate = 1 - -[logger_sqlalchemy] -level = INFO -handlers = console_sql -qualname = sqlalchemy.engine -propagate = 0 - -[logger_whoosh_indexer] -level = DEBUG -handlers = -qualname = whoosh_indexer -propagate = 1 - -############## -## HANDLERS ## -############## - -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = INFO -formatter = generic - -[handler_console_sql] -class = StreamHandler -args = (sys.stderr,) -level = WARN -formatter = generic - -################ -## FORMATTERS ## -################ - -[formatter_generic] -format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %Y-%m-%d %H:%M:%S - -[formatter_color_formatter] -class = kallithea.lib.colored_formatter.ColorFormatter -format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %Y-%m-%d %H:%M:%S - -[formatter_color_formatter_sql] -class = kallithea.lib.colored_formatter.ColorFormatterSql -format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %Y-%m-%d %H:%M:%S diff --git a/kallithea/config/environment.py b/kallithea/config/environment.py --- a/kallithea/config/environment.py +++ b/kallithea/config/environment.py @@ -11,130 +11,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -""" - Pylons environment configuration -""" - -import os -import logging -import kallithea -import platform - -import pylons -import mako.lookup -import beaker - -# don't remove this import it does magic for celery -from kallithea.lib import celerypylons - -import kallithea.lib.app_globals as app_globals - -from kallithea.config.routing import make_map - -from kallithea.lib import helpers -from kallithea.lib.auth import set_available_permissions -from kallithea.lib.utils import repo2db_mapper, make_ui, set_app_settings,\ - load_rcextensions, check_git_version, set_vcs_config -from kallithea.lib.utils2 import engine_from_config, str2bool -from kallithea.lib.db_manage import DbManage -from kallithea.model import init_model -from kallithea.model.scm import ScmModel - -log = logging.getLogger(__name__) +"""WSGI environment setup for Kallithea.""" - -def load_environment(global_conf, app_conf, initial=False, - test_env=None, test_index=None): - """ - Configure the Pylons environment via the ``pylons.config`` - object - """ - config = pylons.configuration.PylonsConfig() - - # Pylons paths - root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - paths = dict( - root=root, - controllers=os.path.join(root, 'controllers'), - static_files=os.path.join(root, 'public'), - templates=[os.path.join(root, 'templates')] - ) - - # Initialize config with the basic options - config.init_app(global_conf, app_conf, package='kallithea', paths=paths) - - # store some globals into kallithea - kallithea.CELERY_ON = str2bool(config['app_conf'].get('use_celery')) - kallithea.CELERY_EAGER = str2bool(config['app_conf'].get('celery.always.eager')) - - config['routes.map'] = make_map(config) - config['pylons.app_globals'] = app_globals.Globals(config) - config['pylons.h'] = helpers - kallithea.CONFIG = config - - load_rcextensions(root_path=config['here']) +from kallithea.config.app_cfg import base_config - # Setup cache object as early as possible - pylons.cache._push_object(config['pylons.app_globals'].cache) - - # Create the Mako TemplateLookup, with the default auto-escaping - config['pylons.app_globals'].mako_lookup = mako.lookup.TemplateLookup( - directories=paths['templates'], - error_handler=pylons.error.handle_mako_error, - module_directory=os.path.join(app_conf['cache_dir'], 'templates'), - input_encoding='utf-8', default_filters=['escape'], - imports=['from webhelpers.html import escape']) - - # sets the c attribute access when don't existing attribute are accessed - config['pylons.strict_tmpl_context'] = True - test = os.path.split(config['__file__'])[-1] == 'test.ini' - if test: - if test_env is None: - test_env = not int(os.environ.get('KALLITHEA_NO_TMP_PATH', 0)) - if test_index is None: - test_index = not int(os.environ.get('KALLITHEA_WHOOSH_TEST_DISABLE', 0)) - if os.environ.get('TEST_DB'): - # swap config if we pass enviroment variable - config['sqlalchemy.db1.url'] = os.environ.get('TEST_DB') +__all__ = ['load_environment'] - from kallithea.lib.utils import create_test_env, create_test_index - from kallithea.tests import TESTS_TMP_PATH - #set KALLITHEA_NO_TMP_PATH=1 to disable re-creating the database and - #test repos - if test_env: - create_test_env(TESTS_TMP_PATH, config) - #set KALLITHEA_WHOOSH_TEST_DISABLE=1 to disable whoosh index during tests - if test_index: - create_test_index(TESTS_TMP_PATH, config, True) - - DbManage.check_waitress() - # MULTIPLE DB configs - # Setup the SQLAlchemy database engine - sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.') - init_model(sa_engine_db1) - - set_available_permissions(config) - repos_path = make_ui('db').configitems('paths')[0][1] - config['base_path'] = repos_path - set_app_settings(config) - - instance_id = kallithea.CONFIG.get('instance_id') - if instance_id == '*': - instance_id = '%s-%s' % (platform.uname()[1], os.getpid()) - kallithea.CONFIG['instance_id'] = instance_id - - # CONFIGURATION OPTIONS HERE (note: all config options will override - # any Pylons config options) - - # store config reference into our module to skip import magic of - # pylons - kallithea.CONFIG.update(config) - set_vcs_config(kallithea.CONFIG) - - #check git version - check_git_version() - - if str2bool(config.get('initial_repo_scan', True)): - repo2db_mapper(ScmModel().repo_scan(repos_path), - remove_obsolete=False, install_git_hooks=False) - return config +# Use base_config to setup the environment loader function +load_environment = base_config.make_load_environment() diff --git a/kallithea/config/middleware.py b/kallithea/config/middleware.py --- a/kallithea/config/middleware.py +++ b/kallithea/config/middleware.py @@ -11,102 +11,41 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -""" - Pylons middleware initialization -""" +"""WSGI middleware initialization for the Kallithea application.""" + +import logging.config +from kallithea.config.app_cfg import base_config +from kallithea.config.environment import load_environment + +__all__ = ['make_app'] -from routes.middleware import RoutesMiddleware -from paste.cascade import Cascade -from paste.registry import RegistryManager -from paste.urlparser import StaticURLParser -from paste.deploy.converters import asbool -from paste.gzipper import make_gzip_middleware +# Use base_config to setup the necessary PasteDeploy application factory. +# make_base_app will wrap the TurboGears2 app with all the middleware it needs. +make_base_app = base_config.setup_tg_wsgi_app(load_environment) -from pylons.middleware import ErrorHandler, StatusCodeRedirect -from pylons.wsgiapp import PylonsApp -from kallithea.lib.middleware.simplehg import SimpleHg -from kallithea.lib.middleware.simplegit import SimpleGit -from kallithea.lib.middleware.https_fixup import HttpsFixup -from kallithea.lib.middleware.sessionmiddleware import SecureSessionMiddleware -from kallithea.config.environment import load_environment -from kallithea.lib.middleware.wrapper import RequestWrapper +def make_app_without_logging(global_conf, full_stack=True, **app_conf): + """The core of make_app for use from gearbox commands (other than 'serve')""" + return make_base_app(global_conf, full_stack=full_stack, **app_conf) -def make_app(global_conf, full_stack=True, static_files=True, **app_conf): - """Create a Pylons WSGI application and return it - - ``global_conf`` - The inherited configuration for this application. Normally from - the [DEFAULT] section of the Paste ini file. - - ``full_stack`` - Whether or not this application provides a full WSGI stack (by - default, meaning it handles its own exceptions and errors). - Disable full_stack when this application is "managed" by - another WSGI middleware. - - ``app_conf`` - The application's local configuration. Normally specified in - the [app:] section of the Paste ini file (where - defaults to main). - +def make_app(global_conf, full_stack=True, **app_conf): """ - # Configure the Pylons environment - config = load_environment(global_conf, app_conf) - - # The Pylons WSGI app - app = PylonsApp(config=config) - - # Routing/Session/Cache Middleware - app = RoutesMiddleware(app, config['routes.map']) - app = SecureSessionMiddleware(app, config) - - # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares) - if asbool(config['pdebug']): - from kallithea.lib.profiler import ProfilingMiddleware - app = ProfilingMiddleware(app) - - if asbool(full_stack): + Set up Kallithea with the settings found in the PasteDeploy configuration + file used. - from kallithea.lib.middleware.sentry import Sentry - from kallithea.lib.middleware.appenlight import AppEnlight - if AppEnlight and asbool(config['app_conf'].get('appenlight')): - app = AppEnlight(app, config) - elif Sentry: - app = Sentry(app, config) - - # Handle Python exceptions - app = ErrorHandler(app, global_conf, **config['pylons.errorware']) - - # Display error documents for 401, 403, 404 status codes (and - # 500 when debug is disabled) - # Note: will buffer the output in memory! - if asbool(config['debug']): - app = StatusCodeRedirect(app) - else: - app = StatusCodeRedirect(app, [400, 401, 403, 404, 500]) + :param global_conf: The global settings for Kallithea (those + defined under the ``[DEFAULT]`` section). + :type global_conf: dict + :param full_stack: Should the whole TurboGears2 stack be set up? + :type full_stack: str or bool + :return: The Kallithea application with all the relevant middleware + loaded. - # we want our low level middleware to get to the request ASAP. We don't - # need any pylons stack middleware in them - especially no StatusCodeRedirect buffering - app = SimpleHg(app, config) - app = SimpleGit(app, config) - - # Enable https redirects based on HTTP_X_URL_SCHEME set by proxy - if any(asbool(config.get(x)) for x in ['https_fixup', 'force_https', 'use_htsts']): - app = HttpsFixup(app, config) - - app = RequestWrapper(app, config) # logging + This is the PasteDeploy factory for the Kallithea application. - # Establish the Registry for this application - app = RegistryManager(app) # thread / request-local module globals / variables - - if asbool(static_files): - # Serve static files - static_app = StaticURLParser(config['pylons.paths']['static_files']) - app = Cascade([static_app, app]) - app = make_gzip_middleware(app, global_conf, compress_level=1) - - app.config = config - - return app + ``app_conf`` contains all the application-specific settings (those defined + under ``[app:main]``. + """ + logging.config.fileConfig(global_conf['__file__']) + return make_app_without_logging(global_conf, full_stack=full_stack, **app_conf) diff --git a/kallithea/config/post_receive_tmpl.py b/kallithea/config/post_receive_tmpl.py --- a/kallithea/config/post_receive_tmpl.py +++ b/kallithea/config/post_receive_tmpl.py @@ -1,34 +1,35 @@ -#!/usr/bin/env python2 +"""Kallithea Git hook + +This hook is installed and maintained by Kallithea. It will be overwritten +by Kallithea - don't customize it manually! + +When Kallithea invokes Git, the KALLITHEA_EXTRAS environment variable will +contain additional info like the Kallithea instance and user info that this +hook will use. +""" + import os import sys -try: - import kallithea - KALLITHEA_HOOK_VER = '_TMPL_' - os.environ['KALLITHEA_HOOK_VER'] = KALLITHEA_HOOK_VER - from kallithea.lib.hooks import handle_git_post_receive as _handler -except ImportError: - if os.environ.get('RC_DEBUG_GIT_HOOK'): - import traceback - print traceback.format_exc() - kallithea = None +# Set output mode on windows to binary for stderr. +# This prevents python (or the windows console) from replacing \n with \r\n. +# Git doesn't display remote output lines that contain \r, +# and therefore without this modification git would display empty lines +# instead of the exception output. +if sys.platform == "win32": + import msvcrt + msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) + +KALLITHEA_HOOK_VER = '_TMPL_' +os.environ['KALLITHEA_HOOK_VER'] = KALLITHEA_HOOK_VER +import kallithea.lib.hooks def main(): - if kallithea is None: - # exit with success if we cannot import kallithea !! - # this allows simply push to this repo even without - # kallithea - sys.exit(0) + repo_path = os.path.abspath('.') + git_stdin_lines = sys.stdin.readlines() + sys.exit(kallithea.lib.hooks.handle_git_post_receive(repo_path, git_stdin_lines)) - repo_path = os.path.abspath('.') - push_data = sys.stdin.readlines() - # os.environ is modified here by a subprocess call that - # runs git and later git executes this hook. - # Environ gets some additional info from kallithea system - # like IP or username from basic-auth - _handler(repo_path, push_data, os.environ) - sys.exit(0) if __name__ == '__main__': main() diff --git a/kallithea/config/pre_receive_tmpl.py b/kallithea/config/pre_receive_tmpl.py --- a/kallithea/config/pre_receive_tmpl.py +++ b/kallithea/config/pre_receive_tmpl.py @@ -1,34 +1,35 @@ -#!/usr/bin/env python2 +"""Kallithea Git hook + +This hook is installed and maintained by Kallithea. It will be overwritten +by Kallithea - don't customize it manually! + +When Kallithea invokes Git, the KALLITHEA_EXTRAS environment variable will +contain additional info like the Kallithea instance and user info that this +hook will use. +""" + import os import sys -try: - import kallithea - KALLITHEA_HOOK_VER = '_TMPL_' - os.environ['KALLITHEA_HOOK_VER'] = KALLITHEA_HOOK_VER - from kallithea.lib.hooks import handle_git_pre_receive as _handler -except ImportError: - if os.environ.get('RC_DEBUG_GIT_HOOK'): - import traceback - print traceback.format_exc() - kallithea = None +# Set output mode on windows to binary for stderr. +# This prevents python (or the windows console) from replacing \n with \r\n. +# Git doesn't display remote output lines that contain \r, +# and therefore without this modification git would display empty lines +# instead of the exception output. +if sys.platform == "win32": + import msvcrt + msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) + +KALLITHEA_HOOK_VER = '_TMPL_' +os.environ['KALLITHEA_HOOK_VER'] = KALLITHEA_HOOK_VER +import kallithea.lib.hooks def main(): - if kallithea is None: - # exit with success if we cannot import kallithea !! - # this allows simply push to this repo even without - # kallithea - sys.exit(0) + repo_path = os.path.abspath('.') + git_stdin_lines = sys.stdin.readlines() + sys.exit(kallithea.lib.hooks.handle_git_pre_receive(repo_path, git_stdin_lines)) - repo_path = os.path.abspath('.') - push_data = sys.stdin.readlines() - # os.environ is modified here by a subprocess call that - # runs git and later git executes this hook. - # Environ gets some additional info from kallithea system - # like IP or username from basic-auth - _handler(repo_path, push_data, os.environ) - sys.exit(0) if __name__ == '__main__': main() diff --git a/kallithea/config/rcextensions/__init__.py b/kallithea/config/rcextensions/__init__.py --- a/kallithea/config/rcextensions/__init__.py +++ b/kallithea/config/rcextensions/__init__.py @@ -41,7 +41,7 @@ def _crrepohook(*args, **kwargs): :param created_on: :param enable_downloads: :param repo_id: - :param user_id: + :param owner_id: :param enable_statistics: :param clone_uri: :param fork_id: @@ -49,6 +49,8 @@ def _crrepohook(*args, **kwargs): :param created_by: """ return 0 + + CREATE_REPO_HOOK = _crrepohook @@ -73,6 +75,8 @@ def _pre_cruserhook(*args, **kwargs): """ reason = 'allowed' return True, reason + + PRE_CREATE_USER_HOOK = _pre_cruserhook #============================================================================== @@ -105,6 +109,8 @@ def _cruserhook(*args, **kwargs): :param created_by: """ return 0 + + CREATE_USER_HOOK = _cruserhook @@ -123,7 +129,7 @@ def _dlrepohook(*args, **kwargs): :param created_on: :param enable_downloads: :param repo_id: - :param user_id: + :param owner_id: :param enable_statistics: :param clone_uri: :param fork_id: @@ -132,6 +138,8 @@ def _dlrepohook(*args, **kwargs): :param deleted_on: """ return 0 + + DELETE_REPO_HOOK = _dlrepohook @@ -165,6 +173,8 @@ def _dluserhook(*args, **kwargs): :param deleted_by: """ return 0 + + DELETE_USER_HOOK = _dluserhook @@ -189,6 +199,8 @@ def _pushhook(*args, **kwargs): :param pushed_revs: list of pushed revisions """ return 0 + + PUSH_HOOK = _pushhook @@ -212,4 +224,6 @@ def _pullhook(*args, **kwargs): :param repository: repository name """ return 0 + + PULL_HOOK = _pullhook diff --git a/kallithea/config/routing.py b/kallithea/config/routing.py --- a/kallithea/config/routing.py +++ b/kallithea/config/routing.py @@ -19,6 +19,7 @@ may take precedent over the more generic refer to the routes manual at http://routes.groovie.org/docs/ """ +from tg import request from routes import Mapper # prefix for non repository related links needs to be prefixed with `/` @@ -27,7 +28,7 @@ ADMIN_PREFIX = '/_admin' def make_map(config): """Create, configure and return the routes Mapper""" - rmap = Mapper(directory=config['pylons.paths']['controllers'], + rmap = Mapper(directory=config['paths']['controllers'], always_scan=config['debug']) rmap.minimization = False rmap.explicit = False @@ -45,7 +46,7 @@ def make_map(config): repo_name = match_dict.get('repo_name') if match_dict.get('f_path'): - #fix for multiple initial slashes that causes errors + # fix for multiple initial slashes that causes errors match_dict['f_path'] = match_dict['f_path'].lstrip('/') by_id_match = get_repo_by_id(repo_name) @@ -89,20 +90,18 @@ def make_map(config): def check_int(environ, match_dict): return match_dict.get('id').isdigit() - # The ErrorController route (handles 404/500 error pages); it should - # likely stay at the top, ensuring it can always be resolved - rmap.connect('/error/{action}', controller='error') - rmap.connect('/error/{action}/{id}', controller='error') - #========================================================================== # CUSTOM ROUTES HERE #========================================================================== - #MAIN PAGE + # MAIN PAGE rmap.connect('home', '/', controller='home', action='index') rmap.connect('about', '/about', controller='home', action='about') + rmap.redirect('/favicon.ico', '/images/favicon.ico') rmap.connect('repo_switcher_data', '/_repos', controller='home', action='repo_switcher_data') + rmap.connect('users_and_groups_data', '/_users_and_groups', controller='home', + action='users_and_groups_data') rmap.connect('rst_help', "http://docutils.sourceforge.net/docs/user/rst/quickref.html", @@ -110,7 +109,7 @@ def make_map(config): rmap.connect('kallithea_project_url', "https://kallithea-scm.org/", _static=True) rmap.connect('issues_url', 'https://bitbucket.org/conservancy/kallithea/issues', _static=True) - #ADMIN REPOSITORY ROUTES + # ADMIN REPOSITORY ROUTES with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/repos') as m: m.connect("repos", "/repos", @@ -119,14 +118,13 @@ def make_map(config): action="index", conditions=dict(method=["GET"])) m.connect("new_repo", "/create_repository", action="create_repository", conditions=dict(method=["GET"])) - m.connect("put_repo", "/repos/{repo_name:.*?}", - action="update", conditions=dict(method=["PUT"], + m.connect("update_repo", "/repos/{repo_name:.*?}", + action="update", conditions=dict(method=["POST"], function=check_repo)) - m.connect("delete_repo", "/repos/{repo_name:.*?}", - action="delete", conditions=dict(method=["DELETE"], - )) + m.connect("delete_repo", "/repos/{repo_name:.*?}/delete", + action="delete", conditions=dict(method=["POST"])) - #ADMIN REPOSITORY GROUPS ROUTES + # ADMIN REPOSITORY GROUPS ROUTES with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/repo_groups') as m: m.connect("repos_groups", "/repo_groups", @@ -136,47 +134,40 @@ def make_map(config): m.connect("new_repos_group", "/repo_groups/new", action="new", conditions=dict(method=["GET"])) m.connect("update_repos_group", "/repo_groups/{group_name:.*?}", - action="update", conditions=dict(method=["PUT"], + action="update", conditions=dict(method=["POST"], function=check_group)) m.connect("repos_group", "/repo_groups/{group_name:.*?}", action="show", conditions=dict(method=["GET"], function=check_group)) - #EXTRAS REPO GROUP ROUTES + # EXTRAS REPO GROUP ROUTES m.connect("edit_repo_group", "/repo_groups/{group_name:.*?}/edit", action="edit", conditions=dict(method=["GET"], function=check_group)) - m.connect("edit_repo_group", "/repo_groups/{group_name:.*?}/edit", - action="edit", - conditions=dict(method=["PUT"], function=check_group)) m.connect("edit_repo_group_advanced", "/repo_groups/{group_name:.*?}/edit/advanced", action="edit_repo_group_advanced", conditions=dict(method=["GET"], function=check_group)) - m.connect("edit_repo_group_advanced", "/repo_groups/{group_name:.*?}/edit/advanced", - action="edit_repo_group_advanced", - conditions=dict(method=["PUT"], function=check_group)) m.connect("edit_repo_group_perms", "/repo_groups/{group_name:.*?}/edit/permissions", action="edit_repo_group_perms", conditions=dict(method=["GET"], function=check_group)) - m.connect("edit_repo_group_perms", "/repo_groups/{group_name:.*?}/edit/permissions", + m.connect("edit_repo_group_perms_update", "/repo_groups/{group_name:.*?}/edit/permissions", action="update_perms", - conditions=dict(method=["PUT"], function=check_group)) - m.connect("edit_repo_group_perms", "/repo_groups/{group_name:.*?}/edit/permissions", + conditions=dict(method=["POST"], function=check_group)) + m.connect("edit_repo_group_perms_delete", "/repo_groups/{group_name:.*?}/edit/permissions/delete", action="delete_perms", - conditions=dict(method=["DELETE"], function=check_group)) + conditions=dict(method=["POST"], function=check_group)) - m.connect("delete_repo_group", "/repo_groups/{group_name:.*?}", - action="delete", conditions=dict(method=["DELETE"], + m.connect("delete_repo_group", "/repo_groups/{group_name:.*?}/delete", + action="delete", conditions=dict(method=["POST"], function=check_group_skip_path)) - - #ADMIN USER ROUTES + # ADMIN USER ROUTES with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/users') as m: - m.connect("users", "/users", + m.connect("new_user", "/users/new", action="create", conditions=dict(method=["POST"])) m.connect("users", "/users", action="index", conditions=dict(method=["GET"])) @@ -185,47 +176,43 @@ def make_map(config): m.connect("new_user", "/users/new", action="new", conditions=dict(method=["GET"])) m.connect("update_user", "/users/{id}", - action="update", conditions=dict(method=["PUT"])) - m.connect("delete_user", "/users/{id}", - action="delete", conditions=dict(method=["DELETE"])) + action="update", conditions=dict(method=["POST"])) + m.connect("delete_user", "/users/{id}/delete", + action="delete", conditions=dict(method=["POST"])) m.connect("edit_user", "/users/{id}/edit", action="edit", conditions=dict(method=["GET"])) - m.connect("user", "/users/{id}", - action="show", conditions=dict(method=["GET"])) - #EXTRAS USER ROUTES + # EXTRAS USER ROUTES m.connect("edit_user_advanced", "/users/{id}/edit/advanced", action="edit_advanced", conditions=dict(method=["GET"])) - m.connect("edit_user_advanced", "/users/{id}/edit/advanced", - action="update_advanced", conditions=dict(method=["PUT"])) m.connect("edit_user_api_keys", "/users/{id}/edit/api_keys", action="edit_api_keys", conditions=dict(method=["GET"])) - m.connect("edit_user_api_keys", "/users/{id}/edit/api_keys", + m.connect("edit_user_api_keys_update", "/users/{id}/edit/api_keys", action="add_api_key", conditions=dict(method=["POST"])) - m.connect("edit_user_api_keys", "/users/{id}/edit/api_keys", - action="delete_api_key", conditions=dict(method=["DELETE"])) + m.connect("edit_user_api_keys_delete", "/users/{id}/edit/api_keys/delete", + action="delete_api_key", conditions=dict(method=["POST"])) m.connect("edit_user_perms", "/users/{id}/edit/permissions", action="edit_perms", conditions=dict(method=["GET"])) - m.connect("edit_user_perms", "/users/{id}/edit/permissions", - action="update_perms", conditions=dict(method=["PUT"])) + m.connect("edit_user_perms_update", "/users/{id}/edit/permissions", + action="update_perms", conditions=dict(method=["POST"])) m.connect("edit_user_emails", "/users/{id}/edit/emails", action="edit_emails", conditions=dict(method=["GET"])) - m.connect("edit_user_emails", "/users/{id}/edit/emails", - action="add_email", conditions=dict(method=["PUT"])) - m.connect("edit_user_emails", "/users/{id}/edit/emails", - action="delete_email", conditions=dict(method=["DELETE"])) + m.connect("edit_user_emails_update", "/users/{id}/edit/emails", + action="add_email", conditions=dict(method=["POST"])) + m.connect("edit_user_emails_delete", "/users/{id}/edit/emails/delete", + action="delete_email", conditions=dict(method=["POST"])) m.connect("edit_user_ips", "/users/{id}/edit/ips", action="edit_ips", conditions=dict(method=["GET"])) - m.connect("edit_user_ips", "/users/{id}/edit/ips", - action="add_ip", conditions=dict(method=["PUT"])) - m.connect("edit_user_ips", "/users/{id}/edit/ips", - action="delete_ip", conditions=dict(method=["DELETE"])) + m.connect("edit_user_ips_update", "/users/{id}/edit/ips", + action="add_ip", conditions=dict(method=["POST"])) + m.connect("edit_user_ips_delete", "/users/{id}/edit/ips/delete", + action="delete_ip", conditions=dict(method=["POST"])) - #ADMIN USER GROUPS REST ROUTES + # ADMIN USER GROUPS REST ROUTES with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/user_groups') as m: m.connect("users_groups", "/user_groups", @@ -235,28 +222,25 @@ def make_map(config): m.connect("new_users_group", "/user_groups/new", action="new", conditions=dict(method=["GET"])) m.connect("update_users_group", "/user_groups/{id}", - action="update", conditions=dict(method=["PUT"])) - m.connect("delete_users_group", "/user_groups/{id}", - action="delete", conditions=dict(method=["DELETE"])) + action="update", conditions=dict(method=["POST"])) + m.connect("delete_users_group", "/user_groups/{id}/delete", + action="delete", conditions=dict(method=["POST"])) m.connect("edit_users_group", "/user_groups/{id}/edit", action="edit", conditions=dict(method=["GET"]), function=check_user_group) - m.connect("users_group", "/user_groups/{id}", - action="show", conditions=dict(method=["GET"])) - #EXTRAS USER GROUP ROUTES + # EXTRAS USER GROUP ROUTES m.connect("edit_user_group_default_perms", "/user_groups/{id}/edit/default_perms", action="edit_default_perms", conditions=dict(method=["GET"])) - m.connect("edit_user_group_default_perms", "/user_groups/{id}/edit/default_perms", - action="update_default_perms", conditions=dict(method=["PUT"])) - + m.connect("edit_user_group_default_perms_update", "/user_groups/{id}/edit/default_perms", + action="update_default_perms", conditions=dict(method=["POST"])) m.connect("edit_user_group_perms", "/user_groups/{id}/edit/perms", action="edit_perms", conditions=dict(method=["GET"])) - m.connect("edit_user_group_perms", "/user_groups/{id}/edit/perms", - action="update_perms", conditions=dict(method=["PUT"])) - m.connect("edit_user_group_perms", "/user_groups/{id}/edit/perms", - action="delete_perms", conditions=dict(method=["DELETE"])) + m.connect("edit_user_group_perms_update", "/user_groups/{id}/edit/perms", + action="update_perms", conditions=dict(method=["POST"])) + m.connect("edit_user_group_perms_delete", "/user_groups/{id}/edit/perms/delete", + action="delete_perms", conditions=dict(method=["POST"])) m.connect("edit_user_group_advanced", "/user_groups/{id}/edit/advanced", action="edit_advanced", conditions=dict(method=["GET"])) @@ -264,9 +248,7 @@ def make_map(config): m.connect("edit_user_group_members", "/user_groups/{id}/edit/members", action="edit_members", conditions=dict(method=["GET"])) - - - #ADMIN PERMISSIONS ROUTES + # ADMIN PERMISSIONS ROUTES with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/permissions') as m: m.connect("admin_permissions", "/permissions", @@ -275,28 +257,27 @@ def make_map(config): action="permission_globals", conditions=dict(method=["GET"])) m.connect("admin_permissions_ips", "/permissions/ips", - action="permission_ips", conditions=dict(method=["POST"])) - m.connect("admin_permissions_ips", "/permissions/ips", action="permission_ips", conditions=dict(method=["GET"])) m.connect("admin_permissions_perms", "/permissions/perms", - action="permission_perms", conditions=dict(method=["POST"])) - m.connect("admin_permissions_perms", "/permissions/perms", action="permission_perms", conditions=dict(method=["GET"])) + # ADMIN DEFAULTS ROUTES + with rmap.submapper(path_prefix=ADMIN_PREFIX, + controller='admin/defaults') as m: + m.connect('defaults', 'defaults', + action="index") + m.connect('defaults_update', 'defaults/{id}/update', + action="update", conditions=dict(method=["POST"])) - #ADMIN DEFAULTS REST ROUTES - rmap.resource('default', 'defaults', - controller='admin/defaults', path_prefix=ADMIN_PREFIX) - - #ADMIN AUTH SETTINGS + # ADMIN AUTH SETTINGS rmap.connect('auth_settings', '%s/auth' % ADMIN_PREFIX, controller='admin/auth_settings', action='auth_settings', conditions=dict(method=["POST"])) rmap.connect('auth_home', '%s/auth' % ADMIN_PREFIX, controller='admin/auth_settings') - #ADMIN SETTINGS ROUTES + # ADMIN SETTINGS ROUTES with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/settings') as m: m.connect("admin_settings", "/settings", @@ -326,8 +307,8 @@ def make_map(config): m.connect("admin_settings_hooks", "/settings/hooks", action="settings_hooks", conditions=dict(method=["POST"])) - m.connect("admin_settings_hooks", "/settings/hooks", - action="settings_hooks", conditions=dict(method=["DELETE"])) + m.connect("admin_settings_hooks_delete", "/settings/hooks/delete", + action="settings_hooks", conditions=dict(method=["POST"])) m.connect("admin_settings_hooks", "/settings/hooks", action="settings_hooks", conditions=dict(method=["GET"])) @@ -343,7 +324,7 @@ def make_map(config): m.connect("admin_settings_system_update", "/settings/system/updates", action="settings_system_update", conditions=dict(method=["GET"])) - #ADMIN MY ACCOUNT + # ADMIN MY ACCOUNT with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/my_account') as m: @@ -370,46 +351,17 @@ def make_map(config): action="my_account_emails", conditions=dict(method=["GET"])) m.connect("my_account_emails", "/my_account/emails", action="my_account_emails_add", conditions=dict(method=["POST"])) - m.connect("my_account_emails", "/my_account/emails", - action="my_account_emails_delete", conditions=dict(method=["DELETE"])) + m.connect("my_account_emails_delete", "/my_account/emails/delete", + action="my_account_emails_delete", conditions=dict(method=["POST"])) m.connect("my_account_api_keys", "/my_account/api_keys", action="my_account_api_keys", conditions=dict(method=["GET"])) m.connect("my_account_api_keys", "/my_account/api_keys", action="my_account_api_keys_add", conditions=dict(method=["POST"])) - m.connect("my_account_api_keys", "/my_account/api_keys", - action="my_account_api_keys_delete", conditions=dict(method=["DELETE"])) + m.connect("my_account_api_keys_delete", "/my_account/api_keys/delete", + action="my_account_api_keys_delete", conditions=dict(method=["POST"])) - #NOTIFICATION REST ROUTES - with rmap.submapper(path_prefix=ADMIN_PREFIX, - controller='admin/notifications') as m: - m.connect("notifications", "/notifications", - action="create", conditions=dict(method=["POST"])) - m.connect("notifications", "/notifications", - action="index", conditions=dict(method=["GET"])) - m.connect("notifications_mark_all_read", "/notifications/mark_all_read", - action="mark_all_read", conditions=dict(method=["GET"])) - m.connect("formatted_notifications", "/notifications.{format}", - action="index", conditions=dict(method=["GET"])) - m.connect("new_notification", "/notifications/new", - action="new", conditions=dict(method=["GET"])) - m.connect("formatted_new_notification", "/notifications/new.{format}", - action="new", conditions=dict(method=["GET"])) - m.connect("/notifications/{notification_id}", - action="update", conditions=dict(method=["PUT"])) - m.connect("/notifications/{notification_id}", - action="delete", conditions=dict(method=["DELETE"])) - m.connect("edit_notification", "/notifications/{notification_id}/edit", - action="edit", conditions=dict(method=["GET"])) - m.connect("formatted_edit_notification", - "/notifications/{notification_id}.{format}/edit", - action="edit", conditions=dict(method=["GET"])) - m.connect("notification", "/notifications/{notification_id}", - action="show", conditions=dict(method=["GET"])) - m.connect("formatted_notification", "/notifications/{notification_id}.{format}", - action="show", conditions=dict(method=["GET"])) - - #ADMIN GIST + # ADMIN GIST with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/gists') as m: m.connect("gists", "/gists", @@ -419,17 +371,13 @@ def make_map(config): m.connect("new_gist", "/gists/new", action="new", conditions=dict(method=["GET"])) - - m.connect("/gists/{gist_id}", - action="update", conditions=dict(method=["PUT"])) - m.connect("/gists/{gist_id}", - action="delete", conditions=dict(method=["DELETE"])) + m.connect("gist_delete", "/gists/{gist_id}/delete", + action="delete", conditions=dict(method=["POST"])) m.connect("edit_gist", "/gists/{gist_id}/edit", action="edit", conditions=dict(method=["GET", "POST"])) m.connect("edit_gist_check_revision", "/gists/{gist_id}/edit/check_revision", action="check_revision", conditions=dict(method=["POST"])) - m.connect("gist", "/gists/{gist_id}", action="show", conditions=dict(method=["GET"])) m.connect("gist_rev", "/gists/{gist_id}/{revision}", @@ -442,7 +390,7 @@ def make_map(config): revision='tip', action="show", conditions=dict(method=["GET"])) - #ADMIN MAIN PAGES + # ADMIN MAIN PAGES with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='admin/admin') as m: m.connect('admin_home', '', action='index') @@ -451,11 +399,11 @@ def make_map(config): #========================================================================== # API V2 #========================================================================== - with rmap.submapper(path_prefix=ADMIN_PREFIX, - controller='api/api') as m: + with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='api/api', + action='_dispatch') as m: m.connect('api', '/api') - #USER JOURNAL + # USER JOURNAL rmap.connect('journal', '%s/journal' % ADMIN_PREFIX, controller='journal', action='index') rmap.connect('journal_rss', '%s/journal/rss' % ADMIN_PREFIX, @@ -484,7 +432,7 @@ def make_map(config): controller='journal', action='toggle_following', conditions=dict(method=["POST"])) - #SEARCH + # SEARCH rmap.connect('search', '%s/search' % ADMIN_PREFIX, controller='search',) rmap.connect('search_repo_admin', '%s/search/{repo_name:.*}' % ADMIN_PREFIX, controller='search', @@ -494,7 +442,7 @@ def make_map(config): conditions=dict(function=check_repo), ) - #LOGIN/LOGOUT/REGISTER/SIGN IN + # LOGIN/LOGOUT/REGISTER/SIGN IN rmap.connect('authentication_token', '%s/authentication_token' % ADMIN_PREFIX, controller='login', action='authentication_token') rmap.connect('login_home', '%s/login' % ADMIN_PREFIX, controller='login') rmap.connect('logout_home', '%s/logout' % ADMIN_PREFIX, controller='login', @@ -510,7 +458,7 @@ def make_map(config): '%s/password_reset_confirmation' % ADMIN_PREFIX, controller='login', action='password_reset_confirmation') - #FEEDS + # FEEDS rmap.connect('rss_feed_home', '/{repo_name:.*?}/feed/rss', controller='feed', action='rss', conditions=dict(function=check_repo)) @@ -543,8 +491,6 @@ def make_map(config): controller='summary', action='repo_size', conditions=dict(function=check_repo)) - rmap.connect('branch_tag_switcher', '/{repo_name:.*?}/branches-tags', - controller='home', action='branch_tag_switcher') rmap.connect('repo_refs_data', '/{repo_name:.*?}/refs-data', controller='home', action='repo_refs_data') @@ -568,21 +514,20 @@ def make_map(config): conditions=dict(method=["GET"], function=check_repo)) rmap.connect("edit_repo_perms_update", "/{repo_name:.*?}/settings/permissions", controller='admin/repos', action="edit_permissions_update", - conditions=dict(method=["PUT"], function=check_repo)) - rmap.connect("edit_repo_perms_revoke", "/{repo_name:.*?}/settings/permissions", + conditions=dict(method=["POST"], function=check_repo)) + rmap.connect("edit_repo_perms_revoke", "/{repo_name:.*?}/settings/permissions/delete", controller='admin/repos', action="edit_permissions_revoke", - conditions=dict(method=["DELETE"], function=check_repo)) + conditions=dict(method=["POST"], function=check_repo)) rmap.connect("edit_repo_fields", "/{repo_name:.*?}/settings/fields", controller='admin/repos', action="edit_fields", conditions=dict(method=["GET"], function=check_repo)) rmap.connect('create_repo_fields', "/{repo_name:.*?}/settings/fields/new", controller='admin/repos', action="create_repo_field", - conditions=dict(method=["PUT"], function=check_repo)) - rmap.connect('delete_repo_fields', "/{repo_name:.*?}/settings/fields/{field_id}", + conditions=dict(method=["POST"], function=check_repo)) + rmap.connect('delete_repo_fields', "/{repo_name:.*?}/settings/fields/{field_id}/delete", controller='admin/repos', action="delete_repo_field", - conditions=dict(method=["DELETE"], function=check_repo)) - + conditions=dict(method=["POST"], function=check_repo)) rmap.connect("edit_repo_advanced", "/{repo_name:.*?}/settings/advanced", controller='admin/repos', action="edit_advanced", @@ -590,43 +535,41 @@ def make_map(config): rmap.connect("edit_repo_advanced_locking", "/{repo_name:.*?}/settings/advanced/locking", controller='admin/repos', action="edit_advanced_locking", - conditions=dict(method=["PUT"], function=check_repo)) + conditions=dict(method=["POST"], function=check_repo)) rmap.connect('toggle_locking', "/{repo_name:.*?}/settings/advanced/locking_toggle", controller='admin/repos', action="toggle_locking", conditions=dict(method=["GET"], function=check_repo)) rmap.connect("edit_repo_advanced_journal", "/{repo_name:.*?}/settings/advanced/journal", controller='admin/repos', action="edit_advanced_journal", - conditions=dict(method=["PUT"], function=check_repo)) + conditions=dict(method=["POST"], function=check_repo)) rmap.connect("edit_repo_advanced_fork", "/{repo_name:.*?}/settings/advanced/fork", controller='admin/repos', action="edit_advanced_fork", - conditions=dict(method=["PUT"], function=check_repo)) - + conditions=dict(method=["POST"], function=check_repo)) rmap.connect("edit_repo_caches", "/{repo_name:.*?}/settings/caches", controller='admin/repos', action="edit_caches", conditions=dict(method=["GET"], function=check_repo)) - rmap.connect("edit_repo_caches", "/{repo_name:.*?}/settings/caches", + rmap.connect("update_repo_caches", "/{repo_name:.*?}/settings/caches", controller='admin/repos', action="edit_caches", - conditions=dict(method=["PUT"], function=check_repo)) - + conditions=dict(method=["POST"], function=check_repo)) rmap.connect("edit_repo_remote", "/{repo_name:.*?}/settings/remote", controller='admin/repos', action="edit_remote", conditions=dict(method=["GET"], function=check_repo)) - rmap.connect("edit_repo_remote", "/{repo_name:.*?}/settings/remote", + rmap.connect("edit_repo_remote_update", "/{repo_name:.*?}/settings/remote", controller='admin/repos', action="edit_remote", - conditions=dict(method=["PUT"], function=check_repo)) + conditions=dict(method=["POST"], function=check_repo)) rmap.connect("edit_repo_statistics", "/{repo_name:.*?}/settings/statistics", controller='admin/repos', action="edit_statistics", conditions=dict(method=["GET"], function=check_repo)) - rmap.connect("edit_repo_statistics", "/{repo_name:.*?}/settings/statistics", + rmap.connect("edit_repo_statistics_update", "/{repo_name:.*?}/settings/statistics", controller='admin/repos', action="edit_statistics", - conditions=dict(method=["PUT"], function=check_repo)) + conditions=dict(method=["POST"], function=check_repo)) - #still working url for backward compat. + # still working url for backward compat. rmap.connect('raw_changeset_home_depraced', '/{repo_name:.*?}/raw-changeset/{revision}', controller='changeset', action='changeset_raw', @@ -653,16 +596,11 @@ def make_map(config): controller='changeset', revision='tip', action='comment', conditions=dict(function=check_repo)) - rmap.connect('changeset_comment_preview', - '/{repo_name:.*?}/changeset-comment-preview', - controller='changeset', action='preview_comment', + rmap.connect('changeset_comment_delete', + '/{repo_name:.*?}/changeset-comment/{comment_id}/delete', + controller='changeset', action='delete_comment', conditions=dict(function=check_repo, method=["POST"])) - rmap.connect('changeset_comment_delete', - '/{repo_name:.*?}/changeset-comment-delete/{comment_id}', - controller='changeset', action='delete_comment', - conditions=dict(function=check_repo, method=["DELETE"])) - rmap.connect('changeset_info', '/changeset_info/{repo_name:.*?}/{revision}', controller='changeset', action='changeset_info') @@ -706,10 +644,10 @@ def make_map(config): action='post', conditions=dict(function=check_repo, method=["POST"])) rmap.connect('pullrequest_delete', - '/{repo_name:.*?}/pull-request/{pull_request_id}', + '/{repo_name:.*?}/pull-request/{pull_request_id}/delete', controller='pullrequests', action='delete', conditions=dict(function=check_repo, - method=["DELETE"])) + method=["POST"])) rmap.connect('pullrequest_show_all', '/{repo_name:.*?}/pull-request', @@ -731,27 +669,14 @@ def make_map(config): rmap.connect('pullrequest_comment_delete', '/{repo_name:.*?}/pull-request-comment/{comment_id}/delete', controller='pullrequests', action='delete_comment', - conditions=dict(function=check_repo, method=["DELETE"])) + conditions=dict(function=check_repo, method=["POST"])) rmap.connect('summary_home_summary', '/{repo_name:.*?}/summary', controller='summary', conditions=dict(function=check_repo)) - rmap.connect('branches_home', '/{repo_name:.*?}/branches', - controller='branches', conditions=dict(function=check_repo)) - - rmap.connect('tags_home', '/{repo_name:.*?}/tags', - controller='tags', conditions=dict(function=check_repo)) - - rmap.connect('bookmarks_home', '/{repo_name:.*?}/bookmarks', - controller='bookmarks', conditions=dict(function=check_repo)) - rmap.connect('changelog_home', '/{repo_name:.*?}/changelog', controller='changelog', conditions=dict(function=check_repo)) - rmap.connect('changelog_summary_home', '/{repo_name:.*?}/changelog_summary', - controller='changelog', action='changelog_summary', - conditions=dict(function=check_repo)) - rmap.connect('changelog_file_home', '/{repo_name:.*?}/changelog/{revision}/{f_path:.*}', controller='changelog', f_path=None, conditions=dict(function=check_repo)) @@ -842,3 +767,29 @@ def make_map(config): conditions=dict(function=check_repo)) return rmap + + +class UrlGenerator(object): + """Emulate pylons.url in providing a wrapper around routes.url + + This code was added during migration from Pylons to Turbogears2. Pylons + already provided a wrapper like this, but Turbogears2 does not. + + When the routing of Kallithea is changed to use less Routes and more + Turbogears2-style routing, this class may disappear or change. + + url() (the __call__ method) returns the URL based on a route name and + arguments. + url.current() returns the URL of the current page with arguments applied. + + Refer to documentation of Routes for details: + https://routes.readthedocs.io/en/latest/generating.html#generation + """ + def __call__(self, *args, **kwargs): + return request.environ['routes.url'](*args, **kwargs) + + def current(self, *args, **kwargs): + return request.environ['routes.url'].current(*args, **kwargs) + + +url = UrlGenerator() diff --git a/kallithea/controllers/admin/admin.py b/kallithea/controllers/admin/admin.py --- a/kallithea/controllers/admin/admin.py +++ b/kallithea/controllers/admin/admin.py @@ -28,19 +28,20 @@ Original author and date, and relevant c import logging -from pylons import request, tmpl_context as c, url +from tg import request, tmpl_context as c from sqlalchemy.orm import joinedload from whoosh.qparser.default import QueryParser from whoosh.qparser.dateparse import DateParserPlugin from whoosh import query from sqlalchemy.sql.expression import or_, and_, func +from kallithea.config.routing import url from kallithea.model.db import UserLog -from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator +from kallithea.lib.auth import LoginRequired, HasPermissionAnyDecorator from kallithea.lib.base import BaseController, render from kallithea.lib.utils2 import safe_int, remove_prefix, remove_suffix from kallithea.lib.indexers import JOURNAL_SCHEMA -from kallithea.lib.helpers import Page +from kallithea.lib.page import Page log = logging.getLogger(__name__) @@ -64,14 +65,14 @@ def _journal_filter(user_log, search_ter def wildcard_handler(col, wc_term): if wc_term.startswith('*') and not wc_term.endswith('*'): - #postfix == endswith + # postfix == endswith wc_term = remove_prefix(wc_term, prefix='*') - return func.lower(col).endswith(wc_term) + return func.lower(col).endswith(func.lower(wc_term)) elif wc_term.startswith('*') and wc_term.endswith('*'): - #wildcard == ilike + # wildcard == ilike wc_term = remove_prefix(wc_term, prefix='*') wc_term = remove_suffix(wc_term, suffix='*') - return func.lower(col).contains(wc_term) + return func.lower(col).contains(func.lower(wc_term)) def get_filterion(field, val, term): @@ -87,7 +88,7 @@ def _journal_filter(user_log, search_ter field = getattr(UserLog, field) log.debug('filter field: %s val=>%s', field, val) - #sql filtering + # sql filtering if isinstance(term, query.Wildcard): return wildcard_handler(field, val) elif isinstance(term, query.Prefix): @@ -119,23 +120,23 @@ def _journal_filter(user_log, search_ter class AdminController(BaseController): - @LoginRequired() - def __before__(self): - super(AdminController, self).__before__() + @LoginRequired(allow_default_user=True) + def _before(self, *args, **kwargs): + super(AdminController, self)._before(*args, **kwargs) - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin') def index(self): - users_log = UserLog.query()\ - .options(joinedload(UserLog.user))\ + users_log = UserLog.query() \ + .options(joinedload(UserLog.user)) \ .options(joinedload(UserLog.repository)) - #FILTERING + # FILTERING c.search_term = request.GET.get('filter') users_log = _journal_filter(users_log, c.search_term) users_log = users_log.order_by(UserLog.action_date.desc()) - p = safe_int(request.GET.get('page', 1), 1) + p = safe_int(request.GET.get('page'), 1) def url_generator(**kw): return url.current(filter=c.search_term, **kw) diff --git a/kallithea/controllers/admin/auth_settings.py b/kallithea/controllers/admin/auth_settings.py --- a/kallithea/controllers/admin/auth_settings.py +++ b/kallithea/controllers/admin/auth_settings.py @@ -27,14 +27,15 @@ import logging import formencode.htmlfill import traceback -from pylons import request, tmpl_context as c, url -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound +from kallithea.config.routing import url from kallithea.lib import helpers as h from kallithea.lib.compat import formatted_json from kallithea.lib.base import BaseController, render -from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator +from kallithea.lib.auth import LoginRequired, HasPermissionAnyDecorator from kallithea.lib import auth_modules from kallithea.model.forms import AuthSettingsForm from kallithea.model.db import Setting @@ -46,9 +47,9 @@ log = logging.getLogger(__name__) class AuthSettingsController(BaseController): @LoginRequired() - @HasPermissionAllDecorator('hg.admin') - def __before__(self): - super(AuthSettingsController, self).__before__() + @HasPermissionAnyDecorator('hg.admin') + def _before(self, *args, **kwargs): + super(AuthSettingsController, self)._before(*args, **kwargs) def __load_defaults(self): c.available_plugins = [ @@ -58,32 +59,32 @@ class AuthSettingsController(BaseControl 'kallithea.lib.auth_modules.auth_crowd', 'kallithea.lib.auth_modules.auth_pam' ] - c.enabled_plugins = Setting.get_auth_plugins() + self.enabled_plugins = auth_modules.get_auth_plugins() + c.enabled_plugin_names = [plugin.__class__.__module__ for plugin in self.enabled_plugins] def __render(self, defaults, errors): c.defaults = {} c.plugin_settings = {} c.plugin_shortnames = {} - for module in c.enabled_plugins: - plugin = auth_modules.loadplugin(module) - plugin_name = plugin.name - c.plugin_shortnames[module] = plugin_name + for plugin in self.enabled_plugins: + module = plugin.__class__.__module__ + c.plugin_shortnames[module] = plugin.name c.plugin_settings[module] = plugin.plugin_settings() for v in c.plugin_settings[module]: - fullname = ("auth_" + plugin_name + "_" + v["name"]) + fullname = "auth_%s_%s" % (plugin.name, v["name"]) if "default" in v: c.defaults[fullname] = v["default"] # Current values will be the default on the form, if there are any setting = Setting.get_by_name(fullname) if setting is not None: c.defaults[fullname] = setting.app_settings_value - # we want to show , separated list of enabled plugins - c.defaults['auth_plugins'] = ','.join(c.enabled_plugins) - if defaults: c.defaults.update(defaults) + # we want to show , separated list of enabled plugins + c.defaults['auth_plugins'] = ','.join(c.enabled_plugin_names) + log.debug(formatted_json(defaults)) return formencode.htmlfill.render( render('admin/auth/auth_settings.html'), @@ -117,10 +118,10 @@ class AuthSettingsController(BaseControl # (yet), since that'll cause validation errors and/or wrong # settings being applied (e.g. checkboxes being cleared), # since the plugin settings will not be in the POST data. - c.enabled_plugins = [ p for p in c.enabled_plugins if p in new_enabled_plugins ] + c.enabled_plugin_names = [p for p in c.enabled_plugin_names if p in new_enabled_plugins] # Next, parse everything including plugin settings. - _form = AuthSettingsForm(c.enabled_plugins)() + _form = AuthSettingsForm(c.enabled_plugin_names)() try: form_result = _form.to_python(dict(request.POST)) @@ -130,7 +131,6 @@ class AuthSettingsController(BaseControl v = ','.join(v) log.debug("%s = %s", k, str(v)) setting = Setting.create_or_update(k, v) - Session().add(setting) Session().commit() h.flash(_('Auth settings updated successfully'), category='success') @@ -146,4 +146,4 @@ class AuthSettingsController(BaseControl h.flash(_('error occurred during update of auth settings'), category='error') - return redirect(url('auth_home')) + raise HTTPFound(location=url('auth_home')) diff --git a/kallithea/controllers/admin/defaults.py b/kallithea/controllers/admin/defaults.py --- a/kallithea/controllers/admin/defaults.py +++ b/kallithea/controllers/admin/defaults.py @@ -30,12 +30,13 @@ import traceback import formencode from formencode import htmlfill -from pylons import request, tmpl_context as c, url -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound +from kallithea.config.routing import url from kallithea.lib import helpers as h -from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator +from kallithea.lib.auth import LoginRequired, HasPermissionAnyDecorator from kallithea.lib.base import BaseController, render from kallithea.model.forms import DefaultsForm from kallithea.model.meta import Session @@ -46,19 +47,13 @@ log = logging.getLogger(__name__) class DefaultsController(BaseController): - """REST Controller styled on the Atom Publishing Protocol""" - # To properly map this controller, ensure your config/routing.py - # file has a resource setup: - # map.resource('default', 'defaults') @LoginRequired() - @HasPermissionAllDecorator('hg.admin') - def __before__(self): - super(DefaultsController, self).__before__() + @HasPermissionAnyDecorator('hg.admin') + def _before(self, *args, **kwargs): + super(DefaultsController, self)._before(*args, **kwargs) def index(self, format='html'): - """GET /defaults: All items in the collection""" - # url('defaults') c.backends = BACKENDS.keys() defaults = Setting.get_default_repo_settings() @@ -69,30 +64,13 @@ class DefaultsController(BaseController) force_defaults=False ) - def create(self): - """POST /defaults: Create a new item""" - # url('defaults') - - def new(self, format='html'): - """GET /defaults/new: Form to create a new item""" - # url('new_default') - def update(self, id): - """PUT /defaults/id: Update an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('default', id=ID), - # method='put') - # url('default', id=ID) - _form = DefaultsForm()() try: form_result = _form.to_python(dict(request.POST)) for k, v in form_result.iteritems(): setting = Setting.create_or_update(k, v) - Session().add(setting) Session().commit() h.flash(_('Default settings updated successfully'), category='success') @@ -112,21 +90,4 @@ class DefaultsController(BaseController) h.flash(_('Error occurred during update of defaults'), category='error') - return redirect(url('defaults')) - - def delete(self, id): - """DELETE /defaults/id: Delete an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('default', id=ID), - # method='delete') - # url('default', id=ID) - - def show(self, id, format='html'): - """GET /defaults/id: Show a specific item""" - # url('default', id=ID) - - def edit(self, id, format='html'): - """GET /defaults/id/edit: Form to edit an existing item""" - # url('edit_default', id=ID) + raise HTTPFound(location=url('defaults')) diff --git a/kallithea/controllers/admin/gists.py b/kallithea/controllers/admin/gists.py --- a/kallithea/controllers/admin/gists.py +++ b/kallithea/controllers/admin/gists.py @@ -30,21 +30,20 @@ import logging import traceback import formencode.htmlfill -from pylons import request, response, tmpl_context as c, url -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, response, tmpl_context as c +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound, HTTPNotFound, HTTPForbidden +from kallithea.config.routing import url from kallithea.model.forms import GistForm from kallithea.model.gist import GistModel from kallithea.model.meta import Session from kallithea.model.db import Gist, User from kallithea.lib import helpers as h -from kallithea.lib.base import BaseController, render -from kallithea.lib.auth import LoginRequired, NotAnonymous -from kallithea.lib.utils import jsonify +from kallithea.lib.base import BaseController, render, jsonify +from kallithea.lib.auth import LoginRequired from kallithea.lib.utils2 import safe_int, safe_unicode, time_to_datetime -from kallithea.lib.helpers import Page -from webob.exc import HTTPNotFound, HTTPForbidden +from kallithea.lib.page import Page from sqlalchemy.sql.expression import or_ from kallithea.lib.vcs.exceptions import VCSError, NodeNotChangedError @@ -66,52 +65,47 @@ class GistsController(BaseController): c.lifetime_values.append(extra_values) c.lifetime_options = [(c.lifetime_values, _("Lifetime"))] - @LoginRequired() + @LoginRequired(allow_default_user=True) def index(self): - """GET /admin/gists: All items in the collection""" - # url('gists') - not_default_user = c.authuser.username != User.DEFAULT_USER + not_default_user = not request.authuser.is_default_user c.show_private = request.GET.get('private') and not_default_user c.show_public = request.GET.get('public') and not_default_user - gists = Gist().query()\ - .filter(or_(Gist.gist_expires == -1, Gist.gist_expires >= time.time()))\ + gists = Gist().query() \ + .filter_by(is_expired=False) \ .order_by(Gist.created_on.desc()) # MY private if c.show_private and not c.show_public: - gists = gists.filter(Gist.gist_type == Gist.GIST_PRIVATE)\ - .filter(Gist.gist_owner == c.authuser.user_id) + gists = gists.filter(Gist.gist_type == Gist.GIST_PRIVATE) \ + .filter(Gist.owner_id == request.authuser.user_id) # MY public elif c.show_public and not c.show_private: - gists = gists.filter(Gist.gist_type == Gist.GIST_PUBLIC)\ - .filter(Gist.gist_owner == c.authuser.user_id) + gists = gists.filter(Gist.gist_type == Gist.GIST_PUBLIC) \ + .filter(Gist.owner_id == request.authuser.user_id) # MY public+private elif c.show_private and c.show_public: gists = gists.filter(or_(Gist.gist_type == Gist.GIST_PUBLIC, - Gist.gist_type == Gist.GIST_PRIVATE))\ - .filter(Gist.gist_owner == c.authuser.user_id) + Gist.gist_type == Gist.GIST_PRIVATE)) \ + .filter(Gist.owner_id == request.authuser.user_id) # default show ALL public gists if not c.show_public and not c.show_private: gists = gists.filter(Gist.gist_type == Gist.GIST_PUBLIC) c.gists = gists - p = safe_int(request.GET.get('page', 1), 1) + p = safe_int(request.GET.get('page'), 1) c.gists_pager = Page(c.gists, page=p, items_per_page=10) return render('admin/gists/index.html') @LoginRequired() - @NotAnonymous() def create(self): - """POST /admin/gists: Create a new item""" - # url('gists') self.__load_defaults() gist_form = GistForm([x[0] for x in c.lifetime_values])() try: form_result = gist_form.to_python(dict(request.POST)) - #TODO: multiple files support, from the form + # TODO: multiple files support, from the form filename = form_result['filename'] or Gist.DEFAULT_FILENAME nodes = { filename: { @@ -123,7 +117,7 @@ class GistsController(BaseController): gist_type = Gist.GIST_PUBLIC if _public else Gist.GIST_PRIVATE gist = GistModel().create( description=form_result['description'], - owner=c.authuser.user_id, + owner=request.authuser.user_id, gist_mapping=nodes, gist_type=gist_type, lifetime=form_result['lifetime'] @@ -144,40 +138,18 @@ class GistsController(BaseController): except Exception as e: log.error(traceback.format_exc()) h.flash(_('Error occurred during gist creation'), category='error') - return redirect(url('new_gist')) - return redirect(url('gist', gist_id=new_gist_id)) + raise HTTPFound(location=url('new_gist')) + raise HTTPFound(location=url('gist', gist_id=new_gist_id)) @LoginRequired() - @NotAnonymous() def new(self, format='html'): - """GET /admin/gists/new: Form to create a new item""" - # url('new_gist') self.__load_defaults() return render('admin/gists/new.html') @LoginRequired() - @NotAnonymous() - def update(self, gist_id): - """PUT /admin/gists/gist_id: Update an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('gist', gist_id=ID), - # method='put') - # url('gist', gist_id=ID) - - @LoginRequired() - @NotAnonymous() def delete(self, gist_id): - """DELETE /admin/gists/gist_id: Delete an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('gist', gist_id=ID), - # method='delete') - # url('gist', gist_id=ID) gist = GistModel().get_gist(gist_id) - owner = gist.gist_owner == c.authuser.user_id + owner = gist.owner_id == request.authuser.user_id if h.HasPermissionAny('hg.admin')() or owner: GistModel().delete(gist) Session().commit() @@ -185,20 +157,16 @@ class GistsController(BaseController): else: raise HTTPForbidden() - return redirect(url('gists')) + raise HTTPFound(location=url('gists')) - @LoginRequired() + @LoginRequired(allow_default_user=True) def show(self, gist_id, revision='tip', format='html', f_path=None): - """GET /admin/gists/gist_id: Show a specific item""" - # url('gist', gist_id=ID) c.gist = Gist.get_or_404(gist_id) - #check if this gist is not expired - if c.gist.gist_expires != -1: - if time.time() > c.gist.gist_expires: - log.error('Gist expired at %s', - time_to_datetime(c.gist.gist_expires)) - raise HTTPNotFound() + if c.gist.is_expired: + log.error('Gist expired at %s', + time_to_datetime(c.gist.gist_expires)) + raise HTTPNotFound() try: c.file_changeset, c.files = GistModel().get_gist_files(gist_id, revision=revision) @@ -212,18 +180,13 @@ class GistsController(BaseController): return render('admin/gists/show.html') @LoginRequired() - @NotAnonymous() def edit(self, gist_id, format='html'): - """GET /admin/gists/gist_id/edit: Form to edit an existing item""" - # url('edit_gist', gist_id=ID) c.gist = Gist.get_or_404(gist_id) - #check if this gist is not expired - if c.gist.gist_expires != -1: - if time.time() > c.gist.gist_expires: - log.error('Gist expired at %s', - time_to_datetime(c.gist.gist_expires)) - raise HTTPNotFound() + if c.gist.is_expired: + log.error('Gist expired at %s', + time_to_datetime(c.gist.gist_expires)) + raise HTTPNotFound() try: c.file_changeset, c.files = GistModel().get_gist_files(gist_id) except VCSError: @@ -270,12 +233,11 @@ class GistsController(BaseController): h.flash(_('Error occurred during update of gist %s') % gist_id, category='error') - return redirect(url('gist', gist_id=gist_id)) + raise HTTPFound(location=url('gist', gist_id=gist_id)) return rendered @LoginRequired() - @NotAnonymous() @jsonify def check_revision(self, gist_id): c.gist = Gist.get_or_404(gist_id) @@ -283,7 +245,7 @@ class GistsController(BaseController): success = True revision = request.POST.get('revision') - ##TODO: maybe move this to model ? + # TODO: maybe move this to model ? if revision != last_rev.raw_id: log.error('Last revision %s is different than submitted %s', revision, last_rev) diff --git a/kallithea/controllers/admin/my_account.py b/kallithea/controllers/admin/my_account.py --- a/kallithea/controllers/admin/my_account.py +++ b/kallithea/controllers/admin/my_account.py @@ -31,17 +31,16 @@ import formencode from sqlalchemy import func from formencode import htmlfill -from pylons import request, tmpl_context as c, url -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound -from kallithea import EXTERN_TYPE_INTERNAL +from kallithea.config.routing import url from kallithea.lib import helpers as h from kallithea.lib import auth_modules -from kallithea.lib.auth import LoginRequired, NotAnonymous, AuthUser +from kallithea.lib.auth import LoginRequired, AuthUser from kallithea.lib.base import BaseController, render from kallithea.lib.utils2 import generate_api_key, safe_int -from kallithea.lib.compat import json from kallithea.model.db import Repository, UserEmailMap, User, UserFollowing from kallithea.model.forms import UserForm, PasswordChangeForm from kallithea.model.user import UserModel @@ -60,48 +59,37 @@ class MyAccountController(BaseController # path_prefix='/admin', name_prefix='admin_') @LoginRequired() - @NotAnonymous() - def __before__(self): - super(MyAccountController, self).__before__() + def _before(self, *args, **kwargs): + super(MyAccountController, self)._before(*args, **kwargs) def __load_data(self): - c.user = User.get(self.authuser.user_id) - if c.user.username == User.DEFAULT_USER: + c.user = User.get(request.authuser.user_id) + if c.user.is_default_user: h.flash(_("You can't edit this user since it's" " crucial for entire application"), category='warning') - return redirect(url('users')) - c.EXTERN_TYPE_INTERNAL = EXTERN_TYPE_INTERNAL + raise HTTPFound(location=url('users')) def _load_my_repos_data(self, watched=False): if watched: admin = False - repos_list = [x.follows_repository for x in - Session().query(UserFollowing).filter( - UserFollowing.user_id == - self.authuser.user_id).all()] + repos_list = Session().query(Repository) \ + .join(UserFollowing) \ + .filter(UserFollowing.user_id == + request.authuser.user_id).all() else: admin = True - repos_list = Session().query(Repository)\ - .filter(Repository.user_id == - self.authuser.user_id)\ - .order_by(func.lower(Repository.repo_name)).all() + repos_list = Session().query(Repository) \ + .filter(Repository.owner_id == + request.authuser.user_id).all() - repos_data = RepoModel().get_repos_as_dict(repos_list=repos_list, - admin=admin) - #json used to render the grid - return json.dumps(repos_data) + return RepoModel().get_repos_as_dict(repos_list, admin=admin) def my_account(self): - """ - GET /_admin/my_account Displays info about my account - """ - # url('my_account') c.active = 'profile' self.__load_data() - c.perm_user = AuthUser(user_id=self.authuser.user_id) - c.ip_addr = self.ip_addr + c.perm_user = AuthUser(user_id=request.authuser.user_id) managed_fields = auth_modules.get_managed_fields(c.user) - def_user_perms = User.get_default_user().AuthUser.permissions['global'] + def_user_perms = AuthUser(dbuser=User.get_default_user()).permissions['global'] if 'hg.register.none' in def_user_perms: managed_fields.extend(['username', 'firstname', 'lastname', 'email']) @@ -111,8 +99,8 @@ class MyAccountController(BaseController update = False if request.POST: _form = UserForm(edit=True, - old_data={'user_id': self.authuser.user_id, - 'email': self.authuser.email})() + old_data={'user_id': request.authuser.user_id, + 'email': request.authuser.email})() form_result = {} try: post_data = dict(request.POST) @@ -124,7 +112,7 @@ class MyAccountController(BaseController 'new_password', 'password_confirmation', ] + managed_fields - UserModel().update(self.authuser.user_id, form_result, + UserModel().update(request.authuser.user_id, form_result, skip_attrs=skip_attrs) h.flash(_('Your account was updated successfully'), category='success') @@ -141,10 +129,10 @@ class MyAccountController(BaseController force_defaults=False) except Exception: log.error(traceback.format_exc()) - h.flash(_('Error occurred during update of user %s') \ + h.flash(_('Error occurred during update of user %s') % form_result.get('username'), category='error') if update: - return redirect('my_account') + raise HTTPFound(location='my_account') return htmlfill.render( render('admin/my_account/my_account.html'), defaults=defaults, @@ -159,10 +147,10 @@ class MyAccountController(BaseController c.can_change_password = 'password' not in managed_fields if request.POST and c.can_change_password: - _form = PasswordChangeForm(self.authuser.username)() + _form = PasswordChangeForm(request.authuser.username)() try: form_result = _form.to_python(request.POST) - UserModel().update(self.authuser.user_id, form_result) + UserModel().update(request.authuser.user_id, form_result) Session().commit() h.flash(_("Successfully updated password"), category='success') except formencode.Invalid as errors: @@ -183,7 +171,7 @@ class MyAccountController(BaseController c.active = 'repos' self.__load_data() - #json used to render the grid + # data used to render the grid c.data = self._load_my_repos_data() return render('admin/my_account/my_account.html') @@ -191,15 +179,14 @@ class MyAccountController(BaseController c.active = 'watched' self.__load_data() - #json used to render the grid + # data used to render the grid c.data = self._load_my_repos_data(watched=True) return render('admin/my_account/my_account.html') def my_account_perms(self): c.active = 'perms' self.__load_data() - c.perm_user = AuthUser(user_id=self.authuser.user_id) - c.ip_addr = self.ip_addr + c.perm_user = AuthUser(user_id=request.authuser.user_id) return render('admin/my_account/my_account.html') @@ -207,7 +194,7 @@ class MyAccountController(BaseController c.active = 'emails' self.__load_data() - c.user_email_map = UserEmailMap.query()\ + c.user_email_map = UserEmailMap.query() \ .filter(UserEmailMap.user == c.user).all() return render('admin/my_account/my_account.html') @@ -215,7 +202,7 @@ class MyAccountController(BaseController email = request.POST.get('new_email') try: - UserModel().add_extra_email(self.authuser.user_id, email) + UserModel().add_extra_email(request.authuser.user_id, email) Session().commit() h.flash(_("Added email %s to user") % email, category='success') except formencode.Invalid as error: @@ -225,15 +212,15 @@ class MyAccountController(BaseController log.error(traceback.format_exc()) h.flash(_('An error occurred during email saving'), category='error') - return redirect(url('my_account_emails')) + raise HTTPFound(location=url('my_account_emails')) def my_account_emails_delete(self): email_id = request.POST.get('del_email_id') user_model = UserModel() - user_model.delete_extra_email(self.authuser.user_id, email_id) + user_model.delete_extra_email(request.authuser.user_id, email_id) Session().commit() h.flash(_("Removed email from user"), category='success') - return redirect(url('my_account_emails')) + raise HTTPFound(location=url('my_account_emails')) def my_account_api_keys(self): c.active = 'api_keys' @@ -247,31 +234,28 @@ class MyAccountController(BaseController (str(60 * 24 * 30), _('1 month')), ] c.lifetime_options = [(c.lifetime_values, _("Lifetime"))] - c.user_api_keys = ApiKeyModel().get_api_keys(self.authuser.user_id, + c.user_api_keys = ApiKeyModel().get_api_keys(request.authuser.user_id, show_expired=show_expired) return render('admin/my_account/my_account.html') def my_account_api_keys_add(self): lifetime = safe_int(request.POST.get('lifetime'), -1) description = request.POST.get('description') - ApiKeyModel().create(self.authuser.user_id, description, lifetime) + ApiKeyModel().create(request.authuser.user_id, description, lifetime) Session().commit() h.flash(_("API key successfully created"), category='success') - return redirect(url('my_account_api_keys')) + raise HTTPFound(location=url('my_account_api_keys')) def my_account_api_keys_delete(self): api_key = request.POST.get('del_api_key') - user_id = self.authuser.user_id if request.POST.get('del_api_key_builtin'): - user = User.get(user_id) - if user is not None: - user.api_key = generate_api_key() - Session().add(user) - Session().commit() - h.flash(_("API key successfully reset"), category='success') + user = User.get(request.authuser.user_id) + user.api_key = generate_api_key() + Session().commit() + h.flash(_("API key successfully reset"), category='success') elif api_key: - ApiKeyModel().delete(api_key, self.authuser.user_id) + ApiKeyModel().delete(api_key, request.authuser.user_id) Session().commit() h.flash(_("API key successfully deleted"), category='success') - return redirect(url('my_account_api_keys')) + raise HTTPFound(location=url('my_account_api_keys')) diff --git a/kallithea/controllers/admin/notifications.py b/kallithea/controllers/admin/notifications.py deleted file mode 100644 --- a/kallithea/controllers/admin/notifications.py +++ /dev/null @@ -1,175 +0,0 @@ -# -*- coding: utf-8 -*- -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -""" -kallithea.controllers.admin.notifications -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -notifications controller for Kallithea - -This file was forked by the Kallithea project in July 2014. -Original author and date, and relevant copyright and licensing information is below: -:created_on: Nov 23, 2010 -:author: marcink -:copyright: (c) 2013 RhodeCode GmbH, and others. -:license: GPLv3, see LICENSE.md for more details. -""" - -import logging -import traceback - -from pylons import request -from pylons import tmpl_context as c -from pylons.controllers.util import abort -from webob.exc import HTTPBadRequest - -from kallithea.model.db import Notification -from kallithea.model.notification import NotificationModel -from kallithea.model.meta import Session -from kallithea.lib.auth import LoginRequired, NotAnonymous -from kallithea.lib.base import BaseController, render -from kallithea.lib import helpers as h -from kallithea.lib.helpers import Page -from kallithea.lib.utils2 import safe_int - - -log = logging.getLogger(__name__) - - -class NotificationsController(BaseController): - """REST Controller styled on the Atom Publishing Protocol""" - # To properly map this controller, ensure your config/routing.py - # file has a resource setup: - # map.resource('notification', 'notifications', controller='_admin/notifications', - # path_prefix='/_admin', name_prefix='_admin_') - - @LoginRequired() - @NotAnonymous() - def __before__(self): - super(NotificationsController, self).__before__() - - def index(self, format='html'): - """GET /_admin/notifications: All items in the collection""" - # url('notifications') - c.user = self.authuser - notif = NotificationModel().get_for_user(self.authuser.user_id, - filter_=request.GET.getall('type')) - - p = safe_int(request.GET.get('page', 1), 1) - c.notifications = Page(notif, page=p, items_per_page=10) - c.pull_request_type = Notification.TYPE_PULL_REQUEST - c.comment_type = [Notification.TYPE_CHANGESET_COMMENT, - Notification.TYPE_PULL_REQUEST_COMMENT] - - _current_filter = request.GET.getall('type') - c.current_filter = 'all' - if _current_filter == [c.pull_request_type]: - c.current_filter = 'pull_request' - elif _current_filter == c.comment_type: - c.current_filter = 'comment' - - return render('admin/notifications/notifications.html') - - def mark_all_read(self): - if request.environ.get('HTTP_X_PARTIAL_XHR'): - nm = NotificationModel() - # mark all read - nm.mark_all_read_for_user(self.authuser.user_id, - filter_=request.GET.getall('type')) - Session().commit() - c.user = self.authuser - notif = nm.get_for_user(self.authuser.user_id, - filter_=request.GET.getall('type')) - c.notifications = Page(notif, page=1, items_per_page=10) - return render('admin/notifications/notifications_data.html') - - def create(self): - """POST /_admin/notifications: Create a new item""" - # url('notifications') - - def new(self, format='html'): - """GET /_admin/notifications/new: Form to create a new item""" - # url('new_notification') - - def update(self, notification_id): - """PUT /_admin/notifications/id: Update an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('notification', notification_id=ID), - # method='put') - # url('notification', notification_id=ID) - try: - no = Notification.get(notification_id) - owner = all(un.user.user_id == c.authuser.user_id - for un in no.notifications_to_users) - if h.HasPermissionAny('hg.admin')() or owner: - # deletes only notification2user - NotificationModel().mark_read(c.authuser.user_id, no) - Session().commit() - return 'ok' - except Exception: - Session().rollback() - log.error(traceback.format_exc()) - raise HTTPBadRequest() - - def delete(self, notification_id): - """DELETE /_admin/notifications/id: Delete an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('notification', notification_id=ID), - # method='delete') - # url('notification', notification_id=ID) - try: - no = Notification.get(notification_id) - owner = any(un.user.user_id == c.authuser.user_id - for un in no.notifications_to_users) - if h.HasPermissionAny('hg.admin')() or owner: - # deletes only notification2user - NotificationModel().delete(c.authuser.user_id, no) - Session().commit() - return 'ok' - except Exception: - Session().rollback() - log.error(traceback.format_exc()) - raise HTTPBadRequest() - - def show(self, notification_id, format='html'): - """GET /_admin/notifications/id: Show a specific item""" - # url('notification', notification_id=ID) - c.user = self.authuser - no = Notification.get(notification_id) - - owner = any(un.user.user_id == c.authuser.user_id - for un in no.notifications_to_users) - repo_admin = h.HasRepoPermissionAny('repository.admin') - if no and (h.HasPermissionAny('hg.admin')() or repo_admin or owner): - unotification = NotificationModel()\ - .get_user_notification(c.user.user_id, no) - - # if this association to user is not valid, we don't want to show - # this message - if unotification is not None: - if not unotification.read: - unotification.mark_as_read() - Session().commit() - c.notification = no - - return render('admin/notifications/show_notification.html') - - return abort(403) - - def edit(self, notification_id, format='html'): - """GET /_admin/notifications/id/edit: Form to edit an existing item""" - # url('edit_notification', notification_id=ID) diff --git a/kallithea/controllers/admin/permissions.py b/kallithea/controllers/admin/permissions.py --- a/kallithea/controllers/admin/permissions.py +++ b/kallithea/controllers/admin/permissions.py @@ -31,12 +31,13 @@ import traceback import formencode from formencode import htmlfill -from pylons import request, tmpl_context as c, url -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound +from kallithea.config.routing import url from kallithea.lib import helpers as h -from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator +from kallithea.lib.auth import LoginRequired, HasPermissionAnyDecorator, AuthUser from kallithea.lib.base import BaseController, render from kallithea.model.forms import DefaultPermissionsForm from kallithea.model.permission import PermissionModel @@ -53,9 +54,9 @@ class PermissionsController(BaseControll # map.resource('permission', 'permissions') @LoginRequired() - @HasPermissionAllDecorator('hg.admin') - def __before__(self): - super(PermissionsController, self).__before__() + @HasPermissionAnyDecorator('hg.admin') + def _before(self, *args, **kwargs): + super(PermissionsController, self)._before(*args, **kwargs) def __load_data(self): c.repo_perms_choices = [('repository.none', _('None'),), @@ -139,7 +140,7 @@ class PermissionsController(BaseControll h.flash(_('Error occurred during update of permissions'), category='error') - return redirect(url('admin_permissions')) + raise HTTPFound(location=url('admin_permissions')) c.user = User.get_default_user() defaults = {'anonymous': c.user.active} @@ -184,7 +185,7 @@ class PermissionsController(BaseControll def permission_ips(self): c.active = 'ips' c.user = User.get_default_user() - c.user_ip_map = UserIpMap.query()\ + c.user_ip_map = UserIpMap.query() \ .filter(UserIpMap.user == c.user).all() return render('admin/permissions/permissions.html') @@ -192,5 +193,5 @@ class PermissionsController(BaseControll def permission_perms(self): c.active = 'perms' c.user = User.get_default_user() - c.perm_user = c.user.AuthUser + c.perm_user = AuthUser(dbuser=c.user) return render('admin/permissions/permissions.html') diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py --- a/kallithea/controllers/admin/repo_groups.py +++ b/kallithea/controllers/admin/repo_groups.py @@ -32,16 +32,16 @@ import itertools from formencode import htmlfill -from pylons import request, tmpl_context as c, url -from pylons.controllers.util import abort, redirect -from pylons.i18n.translation import _, ungettext +from tg import request, tmpl_context as c, app_globals +from tg.i18n import ugettext as _, ungettext +from webob.exc import HTTPFound, HTTPForbidden, HTTPNotFound, HTTPInternalServerError import kallithea +from kallithea.config.routing import url from kallithea.lib import helpers as h -from kallithea.lib.compat import json from kallithea.lib.auth import LoginRequired, \ - HasRepoGroupPermissionAnyDecorator, HasRepoGroupPermissionAll, \ - HasPermissionAll + HasRepoGroupPermissionLevelDecorator, HasRepoGroupPermissionLevel, \ + HasPermissionAny from kallithea.lib.base import BaseController, render from kallithea.model.db import RepoGroup, Repository from kallithea.model.scm import RepoGroupList, AvailableRepoGroupChoices @@ -49,7 +49,6 @@ from kallithea.model.repo_group import R from kallithea.model.forms import RepoGroupForm, RepoGroupPermsForm from kallithea.model.meta import Session from kallithea.model.repo import RepoModel -from webob.exc import HTTPInternalServerError, HTTPNotFound from kallithea.lib.utils2 import safe_int from sqlalchemy.sql.expression import func @@ -59,24 +58,20 @@ log = logging.getLogger(__name__) class RepoGroupsController(BaseController): - @LoginRequired() - def __before__(self): - super(RepoGroupsController, self).__before__() + @LoginRequired(allow_default_user=True) + def _before(self, *args, **kwargs): + super(RepoGroupsController, self)._before(*args, **kwargs) def __load_defaults(self, extras=(), exclude=()): """extras is used for keeping current parent ignoring permissions exclude is used for not moving group to itself TODO: also exclude descendants Note: only admin can create top level groups """ - repo_groups = AvailableRepoGroupChoices([], ['group.admin'], extras) + repo_groups = AvailableRepoGroupChoices([], 'admin', extras) exclude_group_ids = set(rg.group_id for rg in exclude) c.repo_groups = [rg for rg in repo_groups if rg[0] not in exclude_group_ids] - repo_model = RepoModel() - c.users_array = repo_model.get_users_js() - c.user_groups_array = repo_model.get_user_groups_js() - def __load_data(self, group_id): """ Load defaults settings for edit, and update @@ -100,24 +95,20 @@ class RepoGroupsController(BaseControlle return data def _revoke_perms_on_yourself(self, form_result): - _up = filter(lambda u: c.authuser.username == u[0], + _up = filter(lambda u: request.authuser.username == u[0], form_result['perms_updates']) - _new = filter(lambda u: c.authuser.username == u[0], + _new = filter(lambda u: request.authuser.username == u[0], form_result['perms_new']) if _new and _new[0][1] != 'group.admin' or _up and _up[0][1] != 'group.admin': return True return False def index(self, format='html'): - """GET /repo_groups: All items in the collection""" - # url('repos_groups') - _list = RepoGroup.query()\ - .order_by(func.lower(RepoGroup.group_name))\ - .all() - group_iter = RepoGroupList(_list, perm_set=['group.admin']) + _list = RepoGroup.query(sorted=True).all() + group_iter = RepoGroupList(_list, perm_level='admin') repo_groups_data = [] total_records = len(group_iter) - _tmpl_lookup = kallithea.CONFIG['pylons.app_globals'].mako_lookup + _tmpl_lookup = app_globals.mako_lookup template = _tmpl_lookup.get_template('data_table/_dt_elements.html') repo_group_name = lambda repo_group_name, children_groups: ( @@ -140,25 +131,20 @@ class RepoGroupsController(BaseControlle "group_name": repo_group_name(repo_gr.group_name, children_groups), "desc": h.escape(repo_gr.group_description), "repos": repo_count, - "owner": h.person(repo_gr.user), + "owner": h.person(repo_gr.owner), "action": repo_group_actions(repo_gr.group_id, repo_gr.group_name, repo_count) }) - c.data = json.dumps({ - "totalRecords": total_records, - "startIndex": 0, + c.data = { "sort": None, "dir": "asc", "records": repo_groups_data - }) + } return render('admin/repo_groups/repo_groups.html') def create(self): - """POST /repo_groups: Create a new item""" - # url('repos_groups') - self.__load_defaults() # permissions for can create group based on parent_id are checked @@ -169,12 +155,12 @@ class RepoGroupsController(BaseControlle gr = RepoGroupModel().create( group_name=form_result['group_name'], group_description=form_result['group_description'], - parent=form_result['group_parent_id'], - owner=self.authuser.user_id, # TODO: make editable + parent=form_result['parent_group_id'], + owner=request.authuser.user_id, # TODO: make editable copy_permissions=form_result['group_copy_permissions'] ) Session().commit() - #TODO: in futureaction_logger(, '', '', '', self.sa) + # TODO: in future action_logger(, '', '', '') except formencode.Invalid as errors: return htmlfill.render( render('admin/repo_groups/repo_group_add.html'), @@ -185,20 +171,18 @@ class RepoGroupsController(BaseControlle force_defaults=False) except Exception: log.error(traceback.format_exc()) - h.flash(_('Error occurred during creation of repository group %s') \ + h.flash(_('Error occurred during creation of repository group %s') % request.POST.get('group_name'), category='error') - parent_group_id = form_result['group_parent_id'] - #TODO: maybe we should get back to the main view, not the admin one - return redirect(url('repos_groups', parent_group=parent_group_id)) + parent_group_id = form_result['parent_group_id'] + # TODO: maybe we should get back to the main view, not the admin one + raise HTTPFound(location=url('repos_groups', parent_group=parent_group_id)) h.flash(_('Created repository group %s') % gr.group_name, category='success') - return redirect(url('repos_group_home', group_name=gr.group_name)) + raise HTTPFound(location=url('repos_group_home', group_name=gr.group_name)) def new(self): - """GET /repo_groups/new: Form to create a new item""" - # url('new_repos_group') - if HasPermissionAll('hg.admin')('group create'): - #we're global admin, we're ok and we can create TOP level groups + if HasPermissionAny('hg.admin')('group create'): + # we're global admin, we're ok and we can create TOP level groups pass else: # we pass in parent group into creation form, thus we know @@ -206,31 +190,23 @@ class RepoGroupsController(BaseControlle group_id = safe_int(request.GET.get('parent_group')) group = RepoGroup.get(group_id) if group_id else None group_name = group.group_name if group else None - if HasRepoGroupPermissionAll('group.admin')(group_name, 'group create'): + if HasRepoGroupPermissionLevel('admin')(group_name, 'group create'): pass else: - return abort(403) + raise HTTPForbidden() self.__load_defaults() return render('admin/repo_groups/repo_group_add.html') - @HasRepoGroupPermissionAnyDecorator('group.admin') + @HasRepoGroupPermissionLevelDecorator('admin') def update(self, group_name): - """PUT /repo_groups/group_name: Update an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('repos_group', group_name=GROUP_NAME), - # method='put') - # url('repos_group', group_name=GROUP_NAME) - - c.repo_group = RepoGroupModel()._get_repo_group(group_name) + c.repo_group = RepoGroup.guess_instance(group_name) self.__load_defaults(extras=[c.repo_group.parent_group], exclude=[c.repo_group]) # TODO: kill allow_empty_group - it is only used for redundant form validation! - if HasPermissionAll('hg.admin')('group edit'): - #we're global admin, we're ok and we can create TOP level groups + if HasPermissionAny('hg.admin')('group edit'): + # we're global admin, we're ok and we can create TOP level groups allow_empty_group = True elif not c.repo_group.parent_group: allow_empty_group = True @@ -247,13 +223,13 @@ class RepoGroupsController(BaseControlle new_gr = RepoGroupModel().update(group_name, form_result) Session().commit() - h.flash(_('Updated repository group %s') \ + h.flash(_('Updated repository group %s') % form_result['group_name'], category='success') # we now have new name ! group_name = new_gr.group_name - #TODO: in future action_logger(, '', '', '', self.sa) + # TODO: in future action_logger(, '', '', '') except formencode.Invalid as errors: - + c.active = 'settings' return htmlfill.render( render('admin/repo_groups/repo_group_edit.html'), defaults=errors.value, @@ -263,48 +239,40 @@ class RepoGroupsController(BaseControlle force_defaults=False) except Exception: log.error(traceback.format_exc()) - h.flash(_('Error occurred during update of repository group %s') \ + h.flash(_('Error occurred during update of repository group %s') % request.POST.get('group_name'), category='error') - return redirect(url('edit_repo_group', group_name=group_name)) + raise HTTPFound(location=url('edit_repo_group', group_name=group_name)) - @HasRepoGroupPermissionAnyDecorator('group.admin') + @HasRepoGroupPermissionLevelDecorator('admin') def delete(self, group_name): - """DELETE /repo_groups/group_name: Delete an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('repos_group', group_name=GROUP_NAME), - # method='delete') - # url('repos_group', group_name=GROUP_NAME) - - gr = c.repo_group = RepoGroupModel()._get_repo_group(group_name) + gr = c.repo_group = RepoGroup.guess_instance(group_name) repos = gr.repositories.all() if repos: h.flash(_('This group contains %s repositories and cannot be ' 'deleted') % len(repos), category='warning') - return redirect(url('repos_groups')) + raise HTTPFound(location=url('repos_groups')) children = gr.children.all() if children: h.flash(_('This group contains %s subgroups and cannot be deleted' % (len(children))), category='warning') - return redirect(url('repos_groups')) + raise HTTPFound(location=url('repos_groups')) try: RepoGroupModel().delete(group_name) Session().commit() h.flash(_('Removed repository group %s') % group_name, category='success') - #TODO: in future action_logger(, '', '', '', self.sa) + # TODO: in future action_logger(, '', '', '') except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during deletion of repository group %s') % group_name, category='error') if gr.parent_group: - return redirect(url('repos_group_home', group_name=gr.parent_group.group_name)) - return redirect(url('repos_groups')) + raise HTTPFound(location=url('repos_group_home', group_name=gr.parent_group.group_name)) + raise HTTPFound(location=url('repos_groups')) def show_by_name(self, group_name): """ @@ -317,42 +285,27 @@ class RepoGroupsController(BaseControlle return self.show(group_name) raise HTTPNotFound - @HasRepoGroupPermissionAnyDecorator('group.read', 'group.write', - 'group.admin') + @HasRepoGroupPermissionLevelDecorator('read') def show(self, group_name): - """GET /repo_groups/group_name: Show a specific item""" - # url('repos_group', group_name=GROUP_NAME) c.active = 'settings' - c.group = c.repo_group = RepoGroupModel()._get_repo_group(group_name) - c.group_repos = c.group.repositories.all() + c.group = c.repo_group = RepoGroup.guess_instance(group_name) - #overwrite our cached list with current filter - c.repo_cnt = 0 - - groups = RepoGroup.query().order_by(RepoGroup.group_name)\ - .filter(RepoGroup.group_parent_id == c.group.group_id).all() - c.groups = self.scm_model.get_repo_groups(groups) + groups = RepoGroup.query(sorted=True).filter_by(parent_group=c.group).all() + repo_groups_list = self.scm_model.get_repo_groups(groups) - c.repos_list = Repository.query()\ - .filter(Repository.group_id == c.group.group_id)\ - .order_by(func.lower(Repository.repo_name))\ - .all() - - repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list, - admin=False) - #json used to render the grid - c.data = json.dumps(repos_data) + repos_list = Repository.query(sorted=True).filter_by(group=c.group).all() + c.data = RepoModel().get_repos_as_dict(repos_list, + repo_groups_list=repo_groups_list, + short_name=True) return render('admin/repo_groups/repo_group_show.html') - @HasRepoGroupPermissionAnyDecorator('group.admin') + @HasRepoGroupPermissionLevelDecorator('admin') def edit(self, group_name): - """GET /repo_groups/group_name/edit: Form to edit an existing item""" - # url('edit_repo_group', group_name=GROUP_NAME) c.active = 'settings' - c.repo_group = RepoGroupModel()._get_repo_group(group_name) + c.repo_group = RepoGroup.guess_instance(group_name) self.__load_defaults(extras=[c.repo_group.parent_group], exclude=[c.repo_group]) defaults = self.__load_data(c.repo_group.group_id) @@ -364,21 +317,17 @@ class RepoGroupsController(BaseControlle force_defaults=False ) - @HasRepoGroupPermissionAnyDecorator('group.admin') + @HasRepoGroupPermissionLevelDecorator('admin') def edit_repo_group_advanced(self, group_name): - """GET /repo_groups/group_name/edit: Form to edit an existing item""" - # url('edit_repo_group', group_name=GROUP_NAME) c.active = 'advanced' - c.repo_group = RepoGroupModel()._get_repo_group(group_name) + c.repo_group = RepoGroup.guess_instance(group_name) return render('admin/repo_groups/repo_group_edit.html') - @HasRepoGroupPermissionAnyDecorator('group.admin') + @HasRepoGroupPermissionLevelDecorator('admin') def edit_repo_group_perms(self, group_name): - """GET /repo_groups/group_name/edit: Form to edit an existing item""" - # url('edit_repo_group', group_name=GROUP_NAME) c.active = 'perms' - c.repo_group = RepoGroupModel()._get_repo_group(group_name) + c.repo_group = RepoGroup.guess_instance(group_name) self.__load_defaults() defaults = self.__load_data(c.repo_group.group_id) @@ -389,7 +338,7 @@ class RepoGroupsController(BaseControlle force_defaults=False ) - @HasRepoGroupPermissionAnyDecorator('group.admin') + @HasRepoGroupPermissionLevelDecorator('admin') def update_perms(self, group_name): """ Update permissions for given repository group @@ -397,14 +346,14 @@ class RepoGroupsController(BaseControlle :param group_name: """ - c.repo_group = RepoGroupModel()._get_repo_group(group_name) + c.repo_group = RepoGroup.guess_instance(group_name) valid_recursive_choices = ['none', 'repos', 'groups', 'all'] form_result = RepoGroupPermsForm(valid_recursive_choices)().to_python(request.POST) - if not c.authuser.is_admin: + if not request.authuser.is_admin: if self._revoke_perms_on_yourself(form_result): msg = _('Cannot revoke permission for yourself as admin') h.flash(msg, category='warning') - return redirect(url('edit_repo_group_perms', group_name=group_name)) + raise HTTPFound(location=url('edit_repo_group_perms', group_name=group_name)) recursive = form_result['recursive'] # iterate over all members(if in recursive mode) of this groups and # set the permissions ! @@ -413,20 +362,15 @@ class RepoGroupsController(BaseControlle form_result['perms_new'], form_result['perms_updates'], recursive) - #TODO: implement this - #action_logger(self.authuser, 'admin_changed_repo_permissions', - # repo_name, self.ip_addr, self.sa) + # TODO: implement this + #action_logger(request.authuser, 'admin_changed_repo_permissions', + # repo_name, request.ip_addr) Session().commit() h.flash(_('Repository group permissions updated'), category='success') - return redirect(url('edit_repo_group_perms', group_name=group_name)) + raise HTTPFound(location=url('edit_repo_group_perms', group_name=group_name)) - @HasRepoGroupPermissionAnyDecorator('group.admin') + @HasRepoGroupPermissionLevelDecorator('admin') def delete_perms(self, group_name): - """ - DELETE an existing repository group permission user - - :param group_name: - """ try: obj_type = request.POST.get('obj_type') obj_id = None @@ -435,8 +379,8 @@ class RepoGroupsController(BaseControlle elif obj_type == 'user_group': obj_id = safe_int(request.POST.get('user_group_id')) - if not c.authuser.is_admin: - if obj_type == 'user' and c.authuser.user_id == obj_id: + if not request.authuser.is_admin: + if obj_type == 'user' and request.authuser.user_id == obj_id: msg = _('Cannot revoke permission for yourself as admin') h.flash(msg, category='warning') raise Exception('revoke admin permission on self') diff --git a/kallithea/controllers/admin/repos.py b/kallithea/controllers/admin/repos.py --- a/kallithea/controllers/admin/repos.py +++ b/kallithea/controllers/admin/repos.py @@ -29,26 +29,24 @@ import logging import traceback import formencode from formencode import htmlfill -from webob.exc import HTTPInternalServerError, HTTPForbidden, HTTPNotFound -from pylons import request, tmpl_context as c, url -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c +from tg.i18n import ugettext as _ from sqlalchemy.sql.expression import func +from webob.exc import HTTPFound, HTTPInternalServerError, HTTPForbidden, HTTPNotFound +from kallithea.config.routing import url from kallithea.lib import helpers as h from kallithea.lib.auth import LoginRequired, \ - HasRepoPermissionAllDecorator, NotAnonymous, HasPermissionAny, \ - HasRepoPermissionAnyDecorator -from kallithea.lib.base import BaseRepoController, render -from kallithea.lib.utils import action_logger, jsonify + HasRepoPermissionLevelDecorator, NotAnonymous, HasPermissionAny +from kallithea.lib.base import BaseRepoController, render, jsonify +from kallithea.lib.utils import action_logger from kallithea.lib.vcs import RepositoryError from kallithea.model.meta import Session -from kallithea.model.db import User, Repository, UserFollowing, RepoGroup,\ +from kallithea.model.db import User, Repository, UserFollowing, RepoGroup, \ Setting, RepositoryField from kallithea.model.forms import RepoForm, RepoFieldForm, RepoPermsForm from kallithea.model.scm import ScmModel, AvailableRepoGroupChoices, RepoList from kallithea.model.repo import RepoModel -from kallithea.lib.compat import json from kallithea.lib.exceptions import AttachedForksError from kallithea.lib.utils2 import safe_int @@ -62,81 +60,68 @@ class ReposController(BaseRepoController # file has a resource setup: # map.resource('repo', 'repos') - @LoginRequired() - def __before__(self): - super(ReposController, self).__before__() + @LoginRequired(allow_default_user=True) + def _before(self, *args, **kwargs): + super(ReposController, self)._before(*args, **kwargs) - def _load_repo(self, repo_name): - repo_obj = Repository.get_by_repo_name(repo_name) + def _load_repo(self): + repo_obj = c.db_repo if repo_obj is None: - h.not_mapped_error(repo_name) - return redirect(url('repos')) + h.not_mapped_error(c.repo_name) + raise HTTPFound(location=url('repos')) return repo_obj def __load_defaults(self, repo=None): top_perms = ['hg.create.repository'] - repo_group_perms = ['group.admin'] if HasPermissionAny('hg.create.write_on_repogroup.true')(): - repo_group_perms.append('group.write') + repo_group_perm_level = 'write' + else: + repo_group_perm_level = 'admin' extras = [] if repo is None else [repo.group] - c.repo_groups = AvailableRepoGroupChoices(top_perms, repo_group_perms, extras) + c.repo_groups = AvailableRepoGroupChoices(top_perms, repo_group_perm_level, extras) c.landing_revs_choices, c.landing_revs = ScmModel().get_repo_landing_revs(repo) - def __load_data(self, repo_name=None): + def __load_data(self): """ Load defaults settings for edit, and update - - :param repo_name: """ - c.repo_info = self._load_repo(repo_name) + c.repo_info = self._load_repo() self.__load_defaults(c.repo_info) - defaults = RepoModel()._get_defaults(repo_name) + defaults = RepoModel()._get_defaults(c.repo_name) defaults['clone_uri'] = c.repo_info.clone_uri_hidden # don't show password return defaults def index(self, format='html'): - """GET /repos: All items in the collection""" - # url('repos') - _list = Repository.query()\ - .order_by(func.lower(Repository.repo_name))\ - .all() + _list = Repository.query(sorted=True).all() - c.repos_list = RepoList(_list, perm_set=['repository.admin']) - repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list, - admin=True, - super_user_actions=True) - #json used to render the grid - c.data = json.dumps(repos_data) + c.repos_list = RepoList(_list, perm_level='admin') + # the repo list will be filtered to only show repos where the user has read permissions + repos_data = RepoModel().get_repos_as_dict(c.repos_list, admin=True) + # data used to render the grid + c.data = repos_data return render('admin/repos/repos.html') @NotAnonymous() def create(self): - """ - POST /repos: Create a new item""" - # url('repos') - self.__load_defaults() form_result = {} - task_id = None try: # CanWriteGroup validators checks permissions of this POST form_result = RepoForm(repo_groups=c.repo_groups, - landing_revs=c.landing_revs_choices)()\ + landing_revs=c.landing_revs_choices)() \ .to_python(dict(request.POST)) # create is done sometimes async on celery, db transaction # management is handled there. - task = RepoModel().create(form_result, self.authuser.user_id) - from celery.result import BaseAsyncResult - if isinstance(task, BaseAsyncResult): - task_id = task.task_id + task = RepoModel().create(form_result, request.authuser.user_id) + task_id = task.task_id except formencode.Invalid as errors: log.info(errors) return htmlfill.render( @@ -152,15 +137,14 @@ class ReposController(BaseRepoController msg = (_('Error creating repository %s') % form_result.get('repo_name')) h.flash(msg, category='error') - return redirect(url('home')) + raise HTTPFound(location=url('home')) - return redirect(h.url('repo_creating_home', + raise HTTPFound(location=h.url('repo_creating_home', repo_name=form_result['repo_name_full'], task_id=task_id)) @NotAnonymous() def create_repository(self): - """GET /_admin/create_repository: Form to create a new item""" self.__load_defaults() if not c.repo_groups: raise HTTPForbidden @@ -184,7 +168,6 @@ class ReposController(BaseRepoController force_defaults=False) @LoginRequired() - @NotAnonymous() def repo_creating(self, repo_name): c.repo = repo_name c.task_id = request.GET.get('task_id') @@ -193,7 +176,6 @@ class ReposController(BaseRepoController return render('admin/repos/repo_creating.html') @LoginRequired() - @NotAnonymous() @jsonify def repo_check(self, repo_name): c.repo = repo_name @@ -201,9 +183,9 @@ class ReposController(BaseRepoController if task_id and task_id not in ['None']: from kallithea import CELERY_ON - from celery.result import AsyncResult + from kallithea.lib import celerypylons if CELERY_ON: - task = AsyncResult(task_id) + task = celerypylons.result.AsyncResult(task_id) if task.failed(): raise HTTPInternalServerError(task.traceback) @@ -227,20 +209,12 @@ class ReposController(BaseRepoController return {'result': True} return {'result': False} - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def update(self, repo_name): - """ - PUT /repos/repo_name: Update an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('put_repo', repo_name=ID), - # method='put') - # url('put_repo', repo_name=ID) - c.repo_info = self._load_repo(repo_name) + c.repo_info = self._load_repo() self.__load_defaults(c.repo_info) c.active = 'settings' - c.repo_fields = RepositoryField.query()\ + c.repo_fields = RepositoryField.query() \ .filter(RepositoryField.repository == c.repo_info).all() repo_model = RepoModel() @@ -262,14 +236,13 @@ class ReposController(BaseRepoController h.flash(_('Repository %s updated successfully') % repo_name, category='success') changed_name = repo.repo_name - action_logger(self.authuser, 'admin_updated_repo', - changed_name, self.ip_addr, self.sa) + action_logger(request.authuser, 'admin_updated_repo', + changed_name, request.ip_addr) Session().commit() except formencode.Invalid as errors: log.info(errors) - defaults = self.__load_data(repo_name) + defaults = self.__load_data() defaults.update(errors.value) - c.users_array = repo_model.get_users_js() return htmlfill.render( render('admin/repos/repo_edit.html'), defaults=defaults, @@ -280,26 +253,17 @@ class ReposController(BaseRepoController except Exception: log.error(traceback.format_exc()) - h.flash(_('Error occurred during update of repository %s') \ + h.flash(_('Error occurred during update of repository %s') % repo_name, category='error') - return redirect(url('edit_repo', repo_name=changed_name)) + raise HTTPFound(location=url('edit_repo', repo_name=changed_name)) - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def delete(self, repo_name): - """ - DELETE /repos/repo_name: Delete an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('delete_repo', repo_name=ID), - # method='delete') - # url('delete_repo', repo_name=ID) - repo_model = RepoModel() repo = repo_model.get_by_repo_name(repo_name) if not repo: h.not_mapped_error(repo_name) - return redirect(url('repos')) + raise HTTPFound(location=url('repos')) try: _forks = repo.forks.count() handle_forks = None @@ -312,8 +276,8 @@ class ReposController(BaseRepoController handle_forks = 'delete' h.flash(_('Deleted %s forks') % _forks, category='success') repo_model.delete(repo, forks=handle_forks) - action_logger(self.authuser, 'admin_deleted_repo', - repo_name, self.ip_addr, self.sa) + action_logger(request.authuser, 'admin_deleted_repo', + repo_name, request.ip_addr) ScmModel().mark_for_invalidation(repo_name) h.flash(_('Deleted repository %s') % repo_name, category='success') Session().commit() @@ -327,18 +291,14 @@ class ReposController(BaseRepoController category='error') if repo.group: - return redirect(url('repos_group_home', group_name=repo.group.group_name)) - return redirect(url('repos')) + raise HTTPFound(location=url('repos_group_home', group_name=repo.group.group_name)) + raise HTTPFound(location=url('repos')) - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit(self, repo_name): - """GET /repo_name/settings: Form to edit an existing item""" - # url('edit_repo', repo_name=ID) - defaults = self.__load_data(repo_name) - c.repo_fields = RepositoryField.query()\ + defaults = self.__load_data() + c.repo_fields = RepositoryField.query() \ .filter(RepositoryField.repository == c.repo_info).all() - repo_model = RepoModel() - c.users_array = repo_model.get_users_js() c.active = 'settings' return htmlfill.render( render('admin/repos/repo_edit.html'), @@ -346,14 +306,9 @@ class ReposController(BaseRepoController encoding="UTF-8", force_defaults=False) - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_permissions(self, repo_name): - """GET /repo_name/settings: Form to edit an existing item""" - # url('edit_repo', repo_name=ID) - c.repo_info = self._load_repo(repo_name) - repo_model = RepoModel() - c.users_array = repo_model.get_users_js() - c.user_groups_array = repo_model.get_user_groups_js() + c.repo_info = self._load_repo() c.active = 'permissions' defaults = RepoModel()._get_defaults(repo_name) @@ -363,19 +318,19 @@ class ReposController(BaseRepoController encoding="UTF-8", force_defaults=False) - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_permissions_update(self, repo_name): form = RepoPermsForm()().to_python(request.POST) RepoModel()._update_permissions(repo_name, form['perms_new'], form['perms_updates']) - #TODO: implement this - #action_logger(self.authuser, 'admin_changed_repo_permissions', - # repo_name, self.ip_addr, self.sa) + # TODO: implement this + #action_logger(request.authuser, 'admin_changed_repo_permissions', + # repo_name, request.ip_addr) Session().commit() h.flash(_('Repository permissions updated'), category='success') - return redirect(url('edit_repo_perms', repo_name=repo_name)) + raise HTTPFound(location=url('edit_repo_perms', repo_name=repo_name)) - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_permissions_revoke(self, repo_name): try: obj_type = request.POST.get('obj_type') @@ -384,6 +339,7 @@ class ReposController(BaseRepoController obj_id = safe_int(request.POST.get('user_id')) elif obj_type == 'user_group': obj_id = safe_int(request.POST.get('user_group_id')) + else: assert False if obj_type == 'user': RepoModel().revoke_user_permission(repo=repo_name, user=obj_id) @@ -391,30 +347,30 @@ class ReposController(BaseRepoController RepoModel().revoke_user_group_permission( repo=repo_name, group_name=obj_id ) - #TODO: implement this - #action_logger(self.authuser, 'admin_revoked_repo_permissions', - # repo_name, self.ip_addr, self.sa) + else: assert False + # TODO: implement this + #action_logger(request.authuser, 'admin_revoked_repo_permissions', + # repo_name, request.ip_addr) Session().commit() except Exception: log.error(traceback.format_exc()) h.flash(_('An error occurred during revoking of permission'), category='error') raise HTTPInternalServerError() + return [] - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_fields(self, repo_name): - """GET /repo_name/settings: Form to edit an existing item""" - # url('edit_repo', repo_name=ID) - c.repo_info = self._load_repo(repo_name) - c.repo_fields = RepositoryField.query()\ + c.repo_info = self._load_repo() + c.repo_fields = RepositoryField.query() \ .filter(RepositoryField.repository == c.repo_info).all() c.active = 'fields' if request.POST: - return redirect(url('repo_edit_fields')) + raise HTTPFound(location=url('repo_edit_fields')) return render('admin/repos/repo_edit.html') - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def create_repo_field(self, repo_name): try: form_result = RepoFieldForm()().to_python(dict(request.POST)) @@ -427,15 +383,14 @@ class ReposController(BaseRepoController new_field.field_label = form_result['new_field_label'] Session().add(new_field) Session().commit() + except formencode.Invalid as e: + h.flash(_('Field validation error: %s') % e.msg, category='error') except Exception as e: log.error(traceback.format_exc()) - msg = _('An error occurred during creation of field') - if isinstance(e, formencode.Invalid): - msg += ". " + e.msg - h.flash(msg, category='error') - return redirect(url('edit_repo_fields', repo_name=repo_name)) + h.flash(_('An error occurred during creation of field: %r') % e, category='error') + raise HTTPFound(location=url('edit_repo_fields', repo_name=repo_name)) - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def delete_repo_field(self, repo_name, field_id): field = RepositoryField.get_or_404(field_id) try: @@ -445,39 +400,37 @@ class ReposController(BaseRepoController log.error(traceback.format_exc()) msg = _('An error occurred during removal of field') h.flash(msg, category='error') - return redirect(url('edit_repo_fields', repo_name=repo_name)) + raise HTTPFound(location=url('edit_repo_fields', repo_name=repo_name)) - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_advanced(self, repo_name): - """GET /repo_name/settings: Form to edit an existing item""" - # url('edit_repo', repo_name=ID) - c.repo_info = self._load_repo(repo_name) + c.repo_info = self._load_repo() c.default_user_id = User.get_default_user().user_id - c.in_public_journal = UserFollowing.query()\ - .filter(UserFollowing.user_id == c.default_user_id)\ + c.in_public_journal = UserFollowing.query() \ + .filter(UserFollowing.user_id == c.default_user_id) \ .filter(UserFollowing.follows_repository == c.repo_info).scalar() - _repos = Repository.query().order_by(Repository.repo_name).all() - read_access_repos = RepoList(_repos) + _repos = Repository.query(sorted=True).all() + read_access_repos = RepoList(_repos, perm_level='read') c.repos_list = [(None, _('-- Not a fork --'))] c.repos_list += [(x.repo_id, x.repo_name) for x in read_access_repos if x.repo_id != c.repo_info.repo_id] defaults = { - 'id_fork_of': c.repo_info.fork.repo_id if c.repo_info.fork else '' + 'id_fork_of': c.repo_info.fork_id if c.repo_info.fork_id else '' } c.active = 'advanced' if request.POST: - return redirect(url('repo_edit_advanced')) + raise HTTPFound(location=url('repo_edit_advanced')) return htmlfill.render( render('admin/repos/repo_edit.html'), defaults=defaults, encoding="UTF-8", force_defaults=False) - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_advanced_journal(self, repo_name): """ Sets this repository to be visible in public journal, @@ -497,10 +450,9 @@ class ReposController(BaseRepoController h.flash(_('An error occurred during setting this' ' repository in public journal'), category='error') - return redirect(url('edit_repo_advanced', repo_name=repo_name)) + raise HTTPFound(location=url('edit_repo_advanced', repo_name=repo_name)) - - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_advanced_fork(self, repo_name): """ Mark given repository as a fork of another @@ -510,7 +462,7 @@ class ReposController(BaseRepoController try: fork_id = request.POST.get('id_fork_of') repo = ScmModel().mark_as_fork(repo_name, fork_id, - self.authuser.username) + request.authuser.username) fork = repo.fork.repo_name if repo.fork else _('Nothing') Session().commit() h.flash(_('Marked repository %s as fork of %s') % (repo_name, fork), @@ -523,9 +475,9 @@ class ReposController(BaseRepoController h.flash(_('An error occurred during this operation'), category='error') - return redirect(url('edit_repo_advanced', repo_name=repo_name)) + raise HTTPFound(location=url('edit_repo_advanced', repo_name=repo_name)) - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_advanced_locking(self, repo_name): """ Unlock repository when it is locked ! @@ -535,7 +487,7 @@ class ReposController(BaseRepoController try: repo = Repository.get_by_repo_name(repo_name) if request.POST.get('set_lock'): - Repository.lock(repo, c.authuser.user_id) + Repository.lock(repo, request.authuser.user_id) h.flash(_('Repository has been locked'), category='success') elif request.POST.get('set_unlock'): Repository.unlock(repo) @@ -544,16 +496,10 @@ class ReposController(BaseRepoController log.error(traceback.format_exc()) h.flash(_('An error occurred during unlocking'), category='error') - return redirect(url('edit_repo_advanced', repo_name=repo_name)) + raise HTTPFound(location=url('edit_repo_advanced', repo_name=repo_name)) - @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin') + @HasRepoPermissionLevelDecorator('write') def toggle_locking(self, repo_name): - """ - Toggle locking of repository by simple GET call to url - - :param repo_name: - """ - try: repo = Repository.get_by_repo_name(repo_name) @@ -562,24 +508,22 @@ class ReposController(BaseRepoController Repository.unlock(repo) h.flash(_('Repository has been unlocked'), category='success') else: - Repository.lock(repo, c.authuser.user_id) + Repository.lock(repo, request.authuser.user_id) h.flash(_('Repository has been locked'), category='success') except Exception as e: log.error(traceback.format_exc()) h.flash(_('An error occurred during unlocking'), category='error') - return redirect(url('summary_home', repo_name=repo_name)) + raise HTTPFound(location=url('summary_home', repo_name=repo_name)) - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_caches(self, repo_name): - """GET /repo_name/settings: Form to edit an existing item""" - # url('edit_repo', repo_name=ID) - c.repo_info = self._load_repo(repo_name) + c.repo_info = self._load_repo() c.active = 'caches' if request.POST: try: - ScmModel().mark_for_invalidation(repo_name, delete=True) + ScmModel().mark_for_invalidation(repo_name) Session().commit() h.flash(_('Cache invalidation successful'), category='success') @@ -588,31 +532,27 @@ class ReposController(BaseRepoController h.flash(_('An error occurred during cache invalidation'), category='error') - return redirect(url('edit_repo_caches', repo_name=c.repo_name)) + raise HTTPFound(location=url('edit_repo_caches', repo_name=c.repo_name)) return render('admin/repos/repo_edit.html') - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_remote(self, repo_name): - """GET /repo_name/settings: Form to edit an existing item""" - # url('edit_repo', repo_name=ID) - c.repo_info = self._load_repo(repo_name) + c.repo_info = self._load_repo() c.active = 'remote' if request.POST: try: - ScmModel().pull_changes(repo_name, self.authuser.username) + ScmModel().pull_changes(repo_name, request.authuser.username) h.flash(_('Pulled from remote location'), category='success') except Exception as e: log.error(traceback.format_exc()) h.flash(_('An error occurred during pull from remote location'), category='error') - return redirect(url('edit_repo_remote', repo_name=c.repo_name)) + raise HTTPFound(location=url('edit_repo_remote', repo_name=c.repo_name)) return render('admin/repos/repo_edit.html') - @HasRepoPermissionAllDecorator('repository.admin') + @HasRepoPermissionLevelDecorator('admin') def edit_statistics(self, repo_name): - """GET /repo_name/settings: Form to edit an existing item""" - # url('edit_repo', repo_name=ID) - c.repo_info = self._load_repo(repo_name) + c.repo_info = self._load_repo() repo = c.repo_info.scm_instance if c.repo_info.stats: @@ -638,6 +578,6 @@ class ReposController(BaseRepoController log.error(traceback.format_exc()) h.flash(_('An error occurred during deletion of repository stats'), category='error') - return redirect(url('edit_repo_statistics', repo_name=c.repo_name)) + raise HTTPFound(location=url('edit_repo_statistics', repo_name=c.repo_name)) return render('admin/repos/repo_edit.html') diff --git a/kallithea/controllers/admin/settings.py b/kallithea/controllers/admin/settings.py --- a/kallithea/controllers/admin/settings.py +++ b/kallithea/controllers/admin/settings.py @@ -30,16 +30,18 @@ import traceback import formencode from formencode import htmlfill -from pylons import request, tmpl_context as c, url, config -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c, config +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound +from kallithea.config.routing import url from kallithea.lib import helpers as h -from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator +from kallithea.lib.auth import LoginRequired, HasPermissionAnyDecorator from kallithea.lib.base import BaseController, render -from kallithea.lib.celerylib import tasks, run_task +from kallithea.lib.celerylib import tasks from kallithea.lib.exceptions import HgsubversionImportError from kallithea.lib.utils import repo2db_mapper, set_app_settings +from kallithea.lib.vcs import VCSError from kallithea.model.db import Ui, Repository, Setting from kallithea.model.forms import ApplicationSettingsForm, \ ApplicationUiSettingsForm, ApplicationVisualisationForm @@ -57,38 +59,30 @@ class SettingsController(BaseController) # map.resource('setting', 'settings', controller='admin/settings', # path_prefix='/admin', name_prefix='admin_') - @LoginRequired() - def __before__(self): - super(SettingsController, self).__before__() + @LoginRequired(allow_default_user=True) + def _before(self, *args, **kwargs): + super(SettingsController, self)._before(*args, **kwargs) def _get_hg_ui_settings(self): ret = Ui.query().all() - if not ret: - raise Exception('Could not get application ui settings !') settings = {} for each in ret: - k = each.ui_key + k = each.ui_section + '_' + each.ui_key v = each.ui_value - if k == '/': - k = 'root_path' + if k == 'paths_/': + k = 'paths_root_path' - if k == 'push_ssl': - v = str2bool(v) - - if k.find('.') != -1: - k = k.replace('.', '_') + k = k.replace('.', '_') if each.ui_section in ['hooks', 'extensions']: v = each.ui_active - settings[each.ui_section + '_' + k] = v + settings[k] = v return settings - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin') def settings_vcs(self): - """GET /admin/settings: All items in the collection""" - # url('admin_settings') c.active = 'vcs' if request.POST: application_form = ApplicationUiSettingsForm()() @@ -104,66 +98,37 @@ class SettingsController(BaseController) force_defaults=False) try: - sett = Ui.get_by_key('push_ssl') - sett.ui_value = form_result['web_push_ssl'] - Session().add(sett) if c.visual.allow_repo_location_change: - sett = Ui.get_by_key('/') + sett = Ui.get_by_key('paths', '/') sett.ui_value = form_result['paths_root_path'] - Session().add(sett) - #HOOKS - sett = Ui.get_by_key(Ui.HOOK_UPDATE) + # HOOKS + sett = Ui.get_by_key('hooks', Ui.HOOK_UPDATE) sett.ui_active = form_result['hooks_changegroup_update'] - Session().add(sett) - sett = Ui.get_by_key(Ui.HOOK_REPO_SIZE) + sett = Ui.get_by_key('hooks', Ui.HOOK_REPO_SIZE) sett.ui_active = form_result['hooks_changegroup_repo_size'] - Session().add(sett) - sett = Ui.get_by_key(Ui.HOOK_PUSH) + sett = Ui.get_by_key('hooks', Ui.HOOK_PUSH_LOG) sett.ui_active = form_result['hooks_changegroup_push_logger'] - Session().add(sett) - sett = Ui.get_by_key(Ui.HOOK_PULL) + sett = Ui.get_by_key('hooks', Ui.HOOK_PULL_LOG) sett.ui_active = form_result['hooks_outgoing_pull_logger'] - Session().add(sett) - ## EXTENSIONS - sett = Ui.get_by_key('largefiles') - if not sett: - #make one if it's not there ! - sett = Ui() - sett.ui_key = 'largefiles' - sett.ui_section = 'extensions' + sett = Ui.get_or_create('extensions', 'largefiles') sett.ui_active = form_result['extensions_largefiles'] - Session().add(sett) - sett = Ui.get_by_key('hgsubversion') - if not sett: - #make one if it's not there ! - sett = Ui() - sett.ui_key = 'hgsubversion' - sett.ui_section = 'extensions' - + sett = Ui.get_or_create('extensions', 'hgsubversion') sett.ui_active = form_result['extensions_hgsubversion'] if sett.ui_active: try: import hgsubversion # pragma: no cover except ImportError: raise HgsubversionImportError - Session().add(sett) -# sett = Ui.get_by_key('hggit') -# if not sett: -# #make one if it's not there ! -# sett = Ui() -# sett.ui_key = 'hggit' -# sett.ui_section = 'extensions' -# +# sett = Ui.get_or_create('extensions', 'hggit') # sett.ui_active = form_result['extensions_hggit'] -# Session().add(sett) Session().commit() @@ -189,15 +154,13 @@ class SettingsController(BaseController) encoding="UTF-8", force_defaults=False) - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin') def settings_mapping(self): - """GET /admin/settings/mapping: All items in the collection""" - # url('admin_settings_mapping') c.active = 'mapping' if request.POST: rm_obsolete = request.POST.get('destroy', False) install_git_hooks = request.POST.get('hooks', False) - overwrite_git_hooks = request.POST.get('hooks_overwrite', False); + overwrite_git_hooks = request.POST.get('hooks_overwrite', False) invalidate_cache = request.POST.get('invalidate', False) log.debug('rescanning repo location with destroy obsolete=%s, ' 'install git hooks=%s and ' @@ -206,7 +169,7 @@ class SettingsController(BaseController) filesystem_repos = ScmModel().repo_scan() added, removed = repo2db_mapper(filesystem_repos, rm_obsolete, install_git_hooks=install_git_hooks, - user=c.authuser.username, + 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)) @@ -217,15 +180,15 @@ class SettingsController(BaseController) if invalidate_cache: log.debug('invalidating all repositories cache') i = 0 - for repo in Repository.get_all(): + for repo in Repository.query(): try: - ScmModel().mark_for_invalidation(repo.repo_name, delete=True) + ScmModel().mark_for_invalidation(repo.repo_name) i += 1 except VCSError as e: log.warning('VCS error invalidating %s: %s', repo.repo_name, e) h.flash(_('Invalidated %s repositories') % i, category='success') - return redirect(url('admin_settings_mapping')) + raise HTTPFound(location=url('admin_settings_mapping')) defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) @@ -236,10 +199,8 @@ class SettingsController(BaseController) encoding="UTF-8", force_defaults=False) - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin') def settings_global(self): - """GET /admin/settings/global: All items in the collection""" - # url('admin_settings_global') c.active = 'global' if request.POST: application_form = ApplicationSettingsForm()() @@ -255,25 +216,14 @@ class SettingsController(BaseController) force_defaults=False) try: - sett1 = Setting.create_or_update('title', - form_result['title']) - Session().add(sett1) - - sett2 = Setting.create_or_update('realm', - form_result['realm']) - Session().add(sett2) - - sett3 = Setting.create_or_update('ga_code', - form_result['ga_code']) - Session().add(sett3) - - sett4 = Setting.create_or_update('captcha_public_key', - form_result['captcha_public_key']) - Session().add(sett4) - - sett5 = Setting.create_or_update('captcha_private_key', - form_result['captcha_private_key']) - Session().add(sett5) + for setting in ( + 'title', + 'realm', + 'ga_code', + 'captcha_public_key', + 'captcha_private_key', + ): + Setting.create_or_update(setting, form_result[setting]) Session().commit() set_app_settings(config) @@ -285,7 +235,7 @@ class SettingsController(BaseController) 'application settings'), category='error') - return redirect(url('admin_settings_global')) + raise HTTPFound(location=url('admin_settings_global')) defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) @@ -296,10 +246,8 @@ class SettingsController(BaseController) encoding="UTF-8", force_defaults=False) - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin') def settings_visual(self): - """GET /admin/settings/visual: All items in the collection""" - # url('admin_settings_visual') c.active = 'visual' if request.POST: application_form = ApplicationVisualisationForm()() @@ -318,7 +266,7 @@ class SettingsController(BaseController) settings = [ ('show_public_icon', 'show_public_icon', 'bool'), ('show_private_icon', 'show_private_icon', 'bool'), - ('stylify_metatags', 'stylify_metatags', 'bool'), + ('stylify_metalabels', 'stylify_metalabels', 'bool'), ('repository_fields', 'repository_fields', 'bool'), ('dashboard_items', 'dashboard_items', 'int'), ('admin_grid_items', 'admin_grid_items', 'int'), @@ -328,9 +276,7 @@ class SettingsController(BaseController) ('clone_uri_tmpl', 'clone_uri_tmpl', 'unicode'), ] for setting, form_key, type_ in settings: - sett = Setting.create_or_update(setting, - form_result[form_key], type_) - Session().add(sett) + Setting.create_or_update(setting, form_result[form_key], type_) Session().commit() set_app_settings(config) @@ -343,7 +289,7 @@ class SettingsController(BaseController) 'visualisation settings'), category='error') - return redirect(url('admin_settings_visual')) + raise HTTPFound(location=url('admin_settings_visual')) defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) @@ -354,10 +300,8 @@ class SettingsController(BaseController) encoding="UTF-8", force_defaults=False) - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin') def settings_email(self): - """GET /admin/settings/email: All items in the collection""" - # url('admin_settings_email') c.active = 'email' if request.POST: test_email = request.POST.get('test_email') @@ -366,22 +310,22 @@ class SettingsController(BaseController) 'Kallithea version: %s' % c.kallithea_version) if not test_email: h.flash(_('Please enter email address'), category='error') - return redirect(url('admin_settings_email')) + raise HTTPFound(location=url('admin_settings_email')) - test_email_txt_body = EmailNotificationModel()\ + test_email_txt_body = EmailNotificationModel() \ .get_email_tmpl(EmailNotificationModel.TYPE_DEFAULT, 'txt', body=test_body) - test_email_html_body = EmailNotificationModel()\ + test_email_html_body = EmailNotificationModel() \ .get_email_tmpl(EmailNotificationModel.TYPE_DEFAULT, 'html', body=test_body) recipients = [test_email] if test_email else None - run_task(tasks.send_email, recipients, test_email_subj, - test_email_txt_body, test_email_html_body) + tasks.send_email(recipients, test_email_subj, + test_email_txt_body, test_email_html_body) h.flash(_('Send email task created'), category='success') - return redirect(url('admin_settings_email')) + raise HTTPFound(location=url('admin_settings_email')) defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) @@ -395,10 +339,8 @@ class SettingsController(BaseController) encoding="UTF-8", force_defaults=False) - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin') def settings_hooks(self): - """GET /admin/settings/hooks: All items in the collection""" - # url('admin_settings_hooks') c.active = 'hooks' if request.POST: if c.visual.allow_custom_hooks_settings: @@ -409,7 +351,11 @@ class SettingsController(BaseController) try: ui_key = ui_key and ui_key.strip() - if ui_value and ui_key: + if ui_key in (x.ui_key for x in Ui.get_custom_hooks()): + h.flash(_('Hook already exists'), category='error') + elif ui_key in (x.ui_key for x in Ui.get_builtin_hooks()): + h.flash(_('Builtin hooks are read-only. Please use another hook name.'), category='error') + elif ui_value and ui_key: Ui.create_or_update_hook(ui_key, ui_value) h.flash(_('Added new hook'), category='success') elif hook_id: @@ -419,10 +365,12 @@ class SettingsController(BaseController) # check for edits update = False _d = request.POST.dict_of_lists() - for k, v in zip(_d.get('hook_ui_key', []), - _d.get('hook_ui_value_new', [])): - Ui.create_or_update_hook(k, v) - update = True + for k, v, ov in zip(_d.get('hook_ui_key', []), + _d.get('hook_ui_value_new', []), + _d.get('hook_ui_value', [])): + if v != ov: + Ui.create_or_update_hook(k, v) + update = True if update: h.flash(_('Updated hooks'), category='success') @@ -432,7 +380,7 @@ class SettingsController(BaseController) h.flash(_('Error occurred during hook creation'), category='error') - return redirect(url('admin_settings_hooks')) + raise HTTPFound(location=url('admin_settings_hooks')) defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) @@ -446,17 +394,15 @@ class SettingsController(BaseController) encoding="UTF-8", force_defaults=False) - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin') def settings_search(self): - """GET /admin/settings/search: All items in the collection""" - # url('admin_settings_search') c.active = 'search' if request.POST: repo_location = self._get_hg_ui_settings()['paths_root_path'] full_index = request.POST.get('full_index', False) - run_task(tasks.whoosh_index, repo_location, full_index) + tasks.whoosh_index(repo_location, full_index) h.flash(_('Whoosh reindex task scheduled'), category='success') - return redirect(url('admin_settings_search')) + raise HTTPFound(location=url('admin_settings_search')) defaults = Setting.get_app_settings() defaults.update(self._get_hg_ui_settings()) @@ -467,10 +413,8 @@ class SettingsController(BaseController) encoding="UTF-8", force_defaults=False) - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin') def settings_system(self): - """GET /admin/settings/system: All items in the collection""" - # url('admin_settings_system') c.active = 'system' defaults = Setting.get_app_settings() @@ -489,10 +433,8 @@ class SettingsController(BaseController) encoding="UTF-8", force_defaults=False) - @HasPermissionAllDecorator('hg.admin') + @HasPermissionAnyDecorator('hg.admin') def settings_system_update(self): - """GET /admin/settings/system/updates: All items in the collection""" - # url('admin_settings_system_update') import json import urllib2 from kallithea.lib.verlib import NormalizedVersion @@ -503,7 +445,7 @@ class SettingsController(BaseController) _update_url = defaults.get('update_url', '') _update_url = "" # FIXME: disabled - _err = lambda s: '
%s
' % (s) + _err = lambda s: '
%s
' % (s) try: import kallithea ver = kallithea.__version__ diff --git a/kallithea/controllers/admin/user_groups.py b/kallithea/controllers/admin/user_groups.py --- a/kallithea/controllers/admin/user_groups.py +++ b/kallithea/controllers/admin/user_groups.py @@ -15,7 +15,7 @@ kallithea.controllers.admin.user_groups ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -User Groups crud controller for pylons +User Groups crud controller This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below: @@ -30,21 +30,22 @@ import traceback import formencode from formencode import htmlfill -from pylons import request, tmpl_context as c, url, config -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c, config, app_globals +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound from sqlalchemy.orm import joinedload from sqlalchemy.sql.expression import func from webob.exc import HTTPInternalServerError import kallithea +from kallithea.config.routing import url from kallithea.lib import helpers as h from kallithea.lib.exceptions import UserGroupsAssignedException, \ RepoGroupAssignmentError from kallithea.lib.utils2 import safe_unicode, safe_int from kallithea.lib.auth import LoginRequired, \ - HasUserGroupPermissionAnyDecorator, HasPermissionAnyDecorator + HasUserGroupPermissionLevelDecorator, HasPermissionAnyDecorator from kallithea.lib.base import BaseController, render from kallithea.model.scm import UserGroupList from kallithea.model.user_group import UserGroupModel @@ -55,7 +56,6 @@ from kallithea.model.forms import UserGr CustomDefaultPermissionsForm from kallithea.model.meta import Session from kallithea.lib.utils import action_logger -from kallithea.lib.compat import json log = logging.getLogger(__name__) @@ -63,9 +63,9 @@ log = logging.getLogger(__name__) class UserGroupsController(BaseController): """REST Controller styled on the Atom Publishing Protocol""" - @LoginRequired() - def __before__(self): - super(UserGroupsController, self).__before__() + @LoginRequired(allow_default_user=True) + def _before(self, *args, **kwargs): + super(UserGroupsController, self)._before(*args, **kwargs) c.available_permissions = config['available_permissions'] def __load_data(self, user_group_id): @@ -88,15 +88,13 @@ class UserGroupsController(BaseControlle return data def index(self, format='html'): - """GET /users_groups: All items in the collection""" - # url('users_groups') - _list = UserGroup.query()\ - .order_by(func.lower(UserGroup.users_group_name))\ + _list = UserGroup.query() \ + .order_by(func.lower(UserGroup.users_group_name)) \ .all() - group_iter = UserGroupList(_list, perm_set=['usergroup.admin']) + group_iter = UserGroupList(_list, perm_level='admin') user_groups_data = [] total_records = len(group_iter) - _tmpl_lookup = kallithea.CONFIG['pylons.app_globals'].mako_lookup + _tmpl_lookup = app_globals.mako_lookup template = _tmpl_lookup.get_template('data_table/_dt_elements.html') user_group_name = lambda user_group_id, user_group_name: ( @@ -116,37 +114,32 @@ class UserGroupsController(BaseControlle "desc": h.escape(user_gr.user_group_description), "members": len(user_gr.members), "active": h.boolicon(user_gr.users_group_active), - "owner": h.person(user_gr.user.username), + "owner": h.person(user_gr.owner.username), "action": user_group_actions(user_gr.users_group_id, user_gr.users_group_name) }) - c.data = json.dumps({ - "totalRecords": total_records, - "startIndex": 0, + c.data = { "sort": None, "dir": "asc", "records": user_groups_data - }) + } return render('admin/user_groups/user_groups.html') @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true') def create(self): - """POST /users_groups: Create a new item""" - # url('users_groups') - users_group_form = UserGroupForm()() try: form_result = users_group_form.to_python(dict(request.POST)) ug = UserGroupModel().create(name=form_result['users_group_name'], description=form_result['user_group_description'], - owner=self.authuser.user_id, + owner=request.authuser.user_id, active=form_result['users_group_active']) gr = form_result['users_group_name'] - action_logger(self.authuser, + action_logger(request.authuser, 'admin_created_users_group:%s' % gr, - None, self.ip_addr, self.sa) + 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))), category='success') Session().commit() @@ -160,27 +153,17 @@ class UserGroupsController(BaseControlle force_defaults=False) except Exception: log.error(traceback.format_exc()) - h.flash(_('Error occurred during creation of user group %s') \ + h.flash(_('Error occurred during creation of user group %s') % request.POST.get('users_group_name'), category='error') - return redirect(url('users_groups')) + raise HTTPFound(location=url('users_groups')) @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true') def new(self, format='html'): - """GET /user_groups/new: Form to create a new item""" - # url('new_users_group') return render('admin/user_groups/user_group_add.html') - @HasUserGroupPermissionAnyDecorator('usergroup.admin') + @HasUserGroupPermissionLevelDecorator('admin') def update(self, id): - """PUT /user_groups/id: Update an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('users_group', id=ID), - # method='put') - # url('users_group', id=ID) - c.user_group = UserGroup.get_or_404(id) c.active = 'settings' self.__load_data(id) @@ -195,9 +178,9 @@ class UserGroupsController(BaseControlle form_result = users_group_form.to_python(request.POST) UserGroupModel().update(c.user_group, form_result) gr = form_result['users_group_name'] - action_logger(self.authuser, + action_logger(request.authuser, 'admin_updated_users_group:%s' % gr, - None, self.ip_addr, self.sa) + None, request.ip_addr) h.flash(_('Updated user group %s') % gr, category='success') Session().commit() except formencode.Invalid as errors: @@ -209,7 +192,6 @@ class UserGroupsController(BaseControlle 'hg.create.repository'), 'fork_repo_perm': ug_model.has_perm(id, 'hg.fork.repository'), - '_method': 'put' }) return htmlfill.render( @@ -221,20 +203,13 @@ class UserGroupsController(BaseControlle force_defaults=False) except Exception: log.error(traceback.format_exc()) - h.flash(_('Error occurred during update of user group %s') \ + h.flash(_('Error occurred during update of user group %s') % request.POST.get('users_group_name'), category='error') - return redirect(url('edit_users_group', id=id)) + raise HTTPFound(location=url('edit_users_group', id=id)) - @HasUserGroupPermissionAnyDecorator('usergroup.admin') + @HasUserGroupPermissionLevelDecorator('admin') def delete(self, id): - """DELETE /user_groups/id: Delete an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('users_group', id=ID), - # method='delete') - # url('users_group', id=ID) usr_gr = UserGroup.get_or_404(id) try: UserGroupModel().delete(usr_gr) @@ -246,17 +221,10 @@ class UserGroupsController(BaseControlle log.error(traceback.format_exc()) h.flash(_('An error occurred during deletion of user group'), category='error') - return redirect(url('users_groups')) - - def show(self, id, format='html'): - """GET /user_groups/id: Show a specific item""" - # url('users_group', id=ID) + raise HTTPFound(location=url('users_groups')) - @HasUserGroupPermissionAnyDecorator('usergroup.admin') + @HasUserGroupPermissionLevelDecorator('admin') def edit(self, id, format='html'): - """GET /user_groups/id/edit: Form to edit an existing item""" - # url('edit_users_group', id=ID) - c.user_group = UserGroup.get_or_404(id) c.active = 'settings' self.__load_data(id) @@ -270,15 +238,11 @@ class UserGroupsController(BaseControlle force_defaults=False ) - @HasUserGroupPermissionAnyDecorator('usergroup.admin') + @HasUserGroupPermissionLevelDecorator('admin') def edit_perms(self, id): c.user_group = UserGroup.get_or_404(id) c.active = 'perms' - repo_model = RepoModel() - c.users_array = repo_model.get_users_js() - c.user_groups_array = repo_model.get_user_groups_js() - defaults = {} # fill user group users for p in c.user_group.user_user_group_to_perm: @@ -296,7 +260,7 @@ class UserGroupsController(BaseControlle force_defaults=False ) - @HasUserGroupPermissionAnyDecorator('usergroup.admin') + @HasUserGroupPermissionLevelDecorator('admin') def update_perms(self, id): """ grant permission for given usergroup @@ -312,21 +276,16 @@ class UserGroupsController(BaseControlle form['perms_updates']) except RepoGroupAssignmentError: h.flash(_('Target group cannot be the same'), category='error') - return redirect(url('edit_user_group_perms', id=id)) - #TODO: implement this - #action_logger(self.authuser, 'admin_changed_repo_permissions', - # repo_name, self.ip_addr, self.sa) + raise HTTPFound(location=url('edit_user_group_perms', id=id)) + # TODO: implement this + #action_logger(request.authuser, 'admin_changed_repo_permissions', + # repo_name, request.ip_addr) Session().commit() h.flash(_('User group permissions updated'), category='success') - return redirect(url('edit_user_group_perms', id=id)) + raise HTTPFound(location=url('edit_user_group_perms', id=id)) - @HasUserGroupPermissionAnyDecorator('usergroup.admin') + @HasUserGroupPermissionLevelDecorator('admin') def delete_perms(self, id): - """ - DELETE an existing repository group permission user - - :param group_name: - """ try: obj_type = request.POST.get('obj_type') obj_id = None @@ -335,8 +294,8 @@ class UserGroupsController(BaseControlle elif obj_type == 'user_group': obj_id = safe_int(request.POST.get('user_group_id')) - if not c.authuser.is_admin: - if obj_type == 'user' and c.authuser.user_id == obj_id: + if not request.authuser.is_admin: + if obj_type == 'user' and request.authuser.user_id == obj_id: msg = _('Cannot revoke permission for yourself as admin') h.flash(msg, category='warning') raise Exception('revoke admin permission on self') @@ -353,7 +312,7 @@ class UserGroupsController(BaseControlle category='error') raise HTTPInternalServerError() - @HasUserGroupPermissionAnyDecorator('usergroup.admin') + @HasUserGroupPermissionLevelDecorator('admin') def edit_default_perms(self, id): c.user_group = UserGroup.get_or_404(id) c.active = 'default_perms' @@ -362,20 +321,20 @@ class UserGroupsController(BaseControlle 'repositories': {}, 'repositories_groups': {} } - ugroup_repo_perms = UserGroupRepoToPerm.query()\ - .options(joinedload(UserGroupRepoToPerm.permission))\ - .options(joinedload(UserGroupRepoToPerm.repository))\ - .filter(UserGroupRepoToPerm.users_group_id == id)\ + ugroup_repo_perms = UserGroupRepoToPerm.query() \ + .options(joinedload(UserGroupRepoToPerm.permission)) \ + .options(joinedload(UserGroupRepoToPerm.repository)) \ + .filter(UserGroupRepoToPerm.users_group_id == id) \ .all() for gr in ugroup_repo_perms: permissions['repositories'][gr.repository.repo_name] \ = gr.permission.permission_name - ugroup_group_perms = UserGroupRepoGroupToPerm.query()\ - .options(joinedload(UserGroupRepoGroupToPerm.permission))\ - .options(joinedload(UserGroupRepoGroupToPerm.group))\ - .filter(UserGroupRepoGroupToPerm.users_group_id == id)\ + ugroup_group_perms = UserGroupRepoGroupToPerm.query() \ + .options(joinedload(UserGroupRepoGroupToPerm.permission)) \ + .options(joinedload(UserGroupRepoGroupToPerm.group)) \ + .filter(UserGroupRepoGroupToPerm.users_group_id == id) \ .all() for gr in ugroup_group_perms: @@ -402,11 +361,8 @@ class UserGroupsController(BaseControlle force_defaults=False ) - @HasUserGroupPermissionAnyDecorator('usergroup.admin') + @HasUserGroupPermissionLevelDecorator('admin') def update_default_perms(self, id): - """PUT /users_perm/id: Update an existing item""" - # url('users_group_perm', id=ID, method='put') - user_group = UserGroup.get_or_404(id) try: @@ -415,11 +371,10 @@ class UserGroupsController(BaseControlle inherit_perms = form_result['inherit_default_permissions'] user_group.inherit_default_permissions = inherit_perms - Session().add(user_group) usergroup_model = UserGroupModel() - defs = UserGroupToPerm.query()\ - .filter(UserGroupToPerm.users_group == user_group)\ + defs = UserGroupToPerm.query() \ + .filter(UserGroupToPerm.users_group == user_group) \ .all() for ug in defs: Session().delete(ug) @@ -444,9 +399,9 @@ class UserGroupsController(BaseControlle h.flash(_('An error occurred during permissions saving'), category='error') - return redirect(url('edit_user_group_default_perms', id=id)) + raise HTTPFound(location=url('edit_user_group_default_perms', id=id)) - @HasUserGroupPermissionAnyDecorator('usergroup.admin') + @HasUserGroupPermissionLevelDecorator('admin') def edit_advanced(self, id): c.user_group = UserGroup.get_or_404(id) c.active = 'advanced' @@ -454,8 +409,7 @@ class UserGroupsController(BaseControlle key=lambda u: u.username.lower()) return render('admin/user_groups/user_group_edit.html') - - @HasUserGroupPermissionAnyDecorator('usergroup.admin') + @HasUserGroupPermissionLevelDecorator('admin') def edit_members(self, id): c.user_group = UserGroup.get_or_404(id) c.active = 'members' diff --git a/kallithea/controllers/admin/users.py b/kallithea/controllers/admin/users.py --- a/kallithea/controllers/admin/users.py +++ b/kallithea/controllers/admin/users.py @@ -15,7 +15,7 @@ kallithea.controllers.admin.users ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Users crud controller for pylons +Users crud controller This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below: @@ -30,20 +30,19 @@ import traceback import formencode from formencode import htmlfill -from pylons import request, tmpl_context as c, url, config -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c, config, app_globals +from tg.i18n import ugettext as _ from sqlalchemy.sql.expression import func -from webob.exc import HTTPNotFound +from webob.exc import HTTPFound, HTTPNotFound import kallithea +from kallithea.config.routing import url from kallithea.lib.exceptions import DefaultUserException, \ UserOwnsReposException, UserCreationError from kallithea.lib import helpers as h -from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator, \ +from kallithea.lib.auth import LoginRequired, HasPermissionAnyDecorator, \ AuthUser from kallithea.lib import auth_modules -from kallithea.lib.auth_modules import auth_internal from kallithea.lib.base import BaseController, render from kallithea.model.api_key import ApiKeyModel @@ -52,7 +51,6 @@ from kallithea.model.forms import UserFo from kallithea.model.user import UserModel from kallithea.model.meta import Session from kallithea.lib.utils import action_logger -from kallithea.lib.compat import json from kallithea.lib.utils2 import datetime_to_time, safe_int, generate_api_key log = logging.getLogger(__name__) @@ -62,24 +60,20 @@ class UsersController(BaseController): """REST Controller styled on the Atom Publishing Protocol""" @LoginRequired() - @HasPermissionAllDecorator('hg.admin') - def __before__(self): - super(UsersController, self).__before__() + @HasPermissionAnyDecorator('hg.admin') + def _before(self, *args, **kwargs): + super(UsersController, self)._before(*args, **kwargs) c.available_permissions = config['available_permissions'] - c.EXTERN_TYPE_INTERNAL = kallithea.EXTERN_TYPE_INTERNAL def index(self, format='html'): - """GET /users: All items in the collection""" - # url('users') - - c.users_list = User.query().order_by(User.username)\ - .filter(User.username != User.DEFAULT_USER)\ - .order_by(func.lower(User.username))\ + c.users_list = User.query().order_by(User.username) \ + .filter_by(is_default_user=False) \ + .order_by(func.lower(User.username)) \ .all() users_data = [] total_records = len(c.users_list) - _tmpl_lookup = kallithea.CONFIG['pylons.app_globals'].mako_lookup + _tmpl_lookup = app_globals.mako_lookup template = _tmpl_lookup.get_template('data_table/_dt_elements.html') grav_tmpl = '
%s
' @@ -108,30 +102,25 @@ class UsersController(BaseController): "action": user_actions(user.user_id, user.username), }) - c.data = json.dumps({ - "totalRecords": total_records, - "startIndex": 0, + c.data = { "sort": None, "dir": "asc", "records": users_data - }) + } return render('admin/users/users.html') def create(self): - """POST /users: Create a new item""" - # url('users') - c.default_extern_type = auth_internal.KallitheaAuthPlugin.name - c.default_extern_name = auth_internal.KallitheaAuthPlugin.name + c.default_extern_type = User.DEFAULT_AUTH_TYPE + c.default_extern_name = '' user_model = UserModel() user_form = UserForm()() try: form_result = user_form.to_python(dict(request.POST)) user = user_model.create(form_result) - usr = form_result['username'] - action_logger(self.authuser, 'admin_created_user:%s' % usr, - None, self.ip_addr, self.sa) - h.flash(h.literal(_('Created user %s') % h.link_to(h.escape(usr), url('edit_user', id=user.user_id))), + action_logger(request.authuser, 'admin_created_user:%s' % user.username, + None, request.ip_addr) + h.flash(_('Created user %s') % user.username, category='success') Session().commit() except formencode.Invalid as errors: @@ -146,25 +135,16 @@ class UsersController(BaseController): h.flash(e, 'error') except Exception: log.error(traceback.format_exc()) - h.flash(_('Error occurred during creation of user %s') \ + h.flash(_('Error occurred during creation of user %s') % request.POST.get('username'), category='error') - return redirect(url('users')) + raise HTTPFound(location=url('edit_user', id=user.user_id)) def new(self, format='html'): - """GET /users/new: Form to create a new item""" - # url('new_user') - c.default_extern_type = auth_internal.KallitheaAuthPlugin.name - c.default_extern_name = auth_internal.KallitheaAuthPlugin.name + c.default_extern_type = User.DEFAULT_AUTH_TYPE + c.default_extern_name = '' return render('admin/users/user_add.html') def update(self, id): - """PUT /users/id: Update an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('update_user', id=ID), - # method='put') - # url('user', id=ID) user_model = UserModel() user = user_model.get(id) _form = UserForm(edit=True, old_data={'user_id': id, @@ -177,8 +157,8 @@ class UsersController(BaseController): user_model.update(id, form_result, skip_attrs=skip_attrs) usr = form_result['username'] - action_logger(self.authuser, 'admin_updated_user:%s' % usr, - None, self.ip_addr, self.sa) + action_logger(request.authuser, 'admin_updated_user:%s' % usr, + None, request.ip_addr) h.flash(_('User updated successfully'), category='success') Session().commit() except formencode.Invalid as errors: @@ -188,7 +168,6 @@ class UsersController(BaseController): 'create_repo_perm': user_model.has_perm(id, 'hg.create.repository'), 'fork_repo_perm': user_model.has_perm(id, 'hg.fork.repository'), - '_method': 'put' }) return htmlfill.render( self._render_edit_profile(user), @@ -199,18 +178,11 @@ class UsersController(BaseController): force_defaults=False) except Exception: log.error(traceback.format_exc()) - h.flash(_('Error occurred during update of user %s') \ + h.flash(_('Error occurred during update of user %s') % form_result.get('username'), category='error') - return redirect(url('edit_user', id=id)) + raise HTTPFound(location=url('edit_user', id=id)) def delete(self, id): - """DELETE /users/id: Delete an existing item""" - # Forms posted to this method should contain a hidden field: - # - # Or using helpers: - # h.form(url('delete_user', id=ID), - # method='delete') - # url('user', id=ID) usr = User.get_or_404(id) try: UserModel().delete(usr) @@ -222,12 +194,7 @@ class UsersController(BaseController): log.error(traceback.format_exc()) h.flash(_('An error occurred during deletion of user'), category='error') - return redirect(url('users')) - - def show(self, id, format='html'): - """GET /users/id: Show a specific item""" - # url('user', id=ID) - User.get_or_404(-1) + raise HTTPFound(location=url('users')) def _get_user_or_raise_if_default(self, id): try: @@ -240,14 +207,11 @@ class UsersController(BaseController): c.user = user c.active = 'profile' c.perm_user = AuthUser(dbuser=user) - c.ip_addr = self.ip_addr managed_fields = auth_modules.get_managed_fields(user) c.readonly = lambda n: 'readonly' if n in managed_fields else None return render('admin/users/user_edit.html') def edit(self, id, format='html'): - """GET /users/id/edit: Form to edit an existing item""" - # url('edit_user', id=ID) user = self._get_user_or_raise_if_default(id) defaults = user.get_dict() @@ -260,8 +224,7 @@ class UsersController(BaseController): def edit_advanced(self, id): c.user = self._get_user_or_raise_if_default(id) c.active = 'advanced' - c.perm_user = AuthUser(user_id=id) - c.ip_addr = self.ip_addr + c.perm_user = AuthUser(dbuser=c.user) umodel = UserModel() defaults = c.user.get_dict() @@ -306,25 +269,22 @@ class UsersController(BaseController): ApiKeyModel().create(c.user.user_id, description, lifetime) Session().commit() h.flash(_("API key successfully created"), category='success') - return redirect(url('edit_user_api_keys', id=c.user.user_id)) + raise HTTPFound(location=url('edit_user_api_keys', id=c.user.user_id)) def delete_api_key(self, id): c.user = self._get_user_or_raise_if_default(id) api_key = request.POST.get('del_api_key') if request.POST.get('del_api_key_builtin'): - user = User.get(c.user.user_id) - if user is not None: - user.api_key = generate_api_key() - Session().add(user) - Session().commit() - h.flash(_("API key successfully reset"), category='success') + c.user.api_key = generate_api_key() + Session().commit() + h.flash(_("API key successfully reset"), category='success') elif api_key: ApiKeyModel().delete(api_key, c.user.user_id) Session().commit() h.flash(_("API key successfully deleted"), category='success') - return redirect(url('edit_user_api_keys', id=c.user.user_id)) + raise HTTPFound(location=url('edit_user_api_keys', id=c.user.user_id)) def update_account(self, id): pass @@ -332,8 +292,7 @@ class UsersController(BaseController): def edit_perms(self, id): c.user = self._get_user_or_raise_if_default(id) c.active = 'perms' - c.perm_user = AuthUser(user_id=id) - c.ip_addr = self.ip_addr + c.perm_user = AuthUser(dbuser=c.user) umodel = UserModel() defaults = c.user.get_dict() @@ -350,8 +309,6 @@ class UsersController(BaseController): force_defaults=False) def update_perms(self, id): - """PUT /users_perm/id: Update an existing item""" - # url('user_perm', id=ID, method='put') user = self._get_user_or_raise_if_default(id) try: @@ -360,11 +317,10 @@ class UsersController(BaseController): inherit_perms = form_result['inherit_default_permissions'] user.inherit_default_permissions = inherit_perms - Session().add(user) user_model = UserModel() - defs = UserToPerm.query()\ - .filter(UserToPerm.user == user)\ + defs = UserToPerm.query() \ + .filter(UserToPerm.user == user) \ .all() for ug in defs: Session().delete(ug) @@ -387,12 +343,12 @@ class UsersController(BaseController): log.error(traceback.format_exc()) h.flash(_('An error occurred during permissions saving'), category='error') - return redirect(url('edit_user_perms', id=id)) + raise HTTPFound(location=url('edit_user_perms', id=id)) def edit_emails(self, id): c.user = self._get_user_or_raise_if_default(id) c.active = 'emails' - c.user_email_map = UserEmailMap.query()\ + c.user_email_map = UserEmailMap.query() \ .filter(UserEmailMap.user == c.user).all() defaults = c.user.get_dict() @@ -403,8 +359,6 @@ class UsersController(BaseController): force_defaults=False) def add_email(self, id): - """POST /user_emails:Add an existing item""" - # url('user_emails', id=ID, method='put') user = self._get_user_or_raise_if_default(id) email = request.POST.get('new_email') user_model = UserModel() @@ -420,27 +374,25 @@ class UsersController(BaseController): log.error(traceback.format_exc()) h.flash(_('An error occurred during email saving'), category='error') - return redirect(url('edit_user_emails', id=id)) + raise HTTPFound(location=url('edit_user_emails', id=id)) def delete_email(self, id): - """DELETE /user_emails_delete/id: Delete an existing item""" - # url('user_emails_delete', id=ID, method='delete') user = self._get_user_or_raise_if_default(id) email_id = request.POST.get('del_email_id') user_model = UserModel() user_model.delete_extra_email(id, email_id) Session().commit() h.flash(_("Removed email from user"), category='success') - return redirect(url('edit_user_emails', id=id)) + raise HTTPFound(location=url('edit_user_emails', id=id)) def edit_ips(self, id): c.user = self._get_user_or_raise_if_default(id) c.active = 'ips' - c.user_ip_map = UserIpMap.query()\ + c.user_ip_map = UserIpMap.query() \ .filter(UserIpMap.user == c.user).all() c.inherit_default_ips = c.user.inherit_default_permissions - c.default_user_ip_map = UserIpMap.query()\ + c.default_user_ip_map = UserIpMap.query() \ .filter(UserIpMap.user == User.get_default_user()).all() defaults = c.user.get_dict() @@ -451,9 +403,6 @@ class UsersController(BaseController): force_defaults=False) def add_ip(self, id): - """POST /user_ips:Add an existing item""" - # url('user_ips', id=ID, method='put') - ip = request.POST.get('new_ip') user_model = UserModel() @@ -470,12 +419,10 @@ class UsersController(BaseController): category='error') if 'default_user' in request.POST: - return redirect(url('admin_permissions_ips')) - return redirect(url('edit_user_ips', id=id)) + raise HTTPFound(location=url('admin_permissions_ips')) + raise HTTPFound(location=url('edit_user_ips', id=id)) def delete_ip(self, id): - """DELETE /user_ips_delete/id: Delete an existing item""" - # url('user_ips_delete', id=ID, method='delete') ip_id = request.POST.get('del_ip_id') user_model = UserModel() user_model.delete_extra_ip(id, ip_id) @@ -483,5 +430,5 @@ class UsersController(BaseController): h.flash(_("Removed IP address from user whitelist"), category='success') if 'default_user' in request.POST: - return redirect(url('admin_permissions_ips')) - return redirect(url('edit_user_ips', id=id)) + raise HTTPFound(location=url('admin_permissions_ips')) + raise HTTPFound(location=url('edit_user_ips', id=id)) diff --git a/kallithea/controllers/api/__init__.py b/kallithea/controllers/api/__init__.py --- a/kallithea/controllers/api/__init__.py +++ b/kallithea/controllers/api/__init__.py @@ -30,15 +30,15 @@ import logging import types import traceback import time +import itertools -from paste.response import replace_header -from pylons.controllers import WSGIController +from tg import Response, response, request, TGController -from webob.exc import HTTPError +from webob.exc import HTTPError, HTTPException, WSGIHTTPException from kallithea.model.db import User from kallithea.model import meta -from kallithea.lib.compat import izip_longest, json +from kallithea.lib.compat import json from kallithea.lib.auth import AuthUser from kallithea.lib.base import _get_ip_addr as _get_ip, _get_access_path from kallithea.lib.utils2 import safe_unicode, safe_str @@ -56,23 +56,20 @@ class JSONRPCError(BaseException): return safe_str(self.message) -def jsonrpc_error(message, retid=None, code=None): +class JSONRPCErrorResponse(Response, HTTPException): """ Generate a Response object with a JSON-RPC error body + """ - :param code: - :param retid: - :param message: - """ - from pylons.controllers.util import Response - return Response( - body=json.dumps(dict(id=retid, result=None, error=message)), - status=code, - content_type='application/json' - ) + def __init__(self, message=None, retid=None, code=None): + HTTPException.__init__(self, message, self) + Response.__init__(self, + json_body=dict(id=retid, result=None, error=message), + status=code, + content_type='application/json') -class JSONRPCController(WSGIController): +class JSONRPCController(TGController): """ A WSGI-speaking JSON-RPC controller class @@ -96,32 +93,30 @@ class JSONRPCController(WSGIController): """ return self._rpc_args - def __call__(self, environ, start_response): + def _dispatch(self, state, remainder=None): """ Parse the request body as JSON, look up the method on the controller and if it exists, dispatch to it. """ - try: - return self._handle_request(environ, start_response) - finally: - meta.Session.remove() + # Since we are here we should respond as JSON + response.content_type = 'application/json' - def _handle_request(self, environ, start_response): + environ = state.request.environ start = time.time() - ip_addr = self.ip_addr = self._get_ip_addr(environ) + ip_addr = request.ip_addr = self._get_ip_addr(environ) self._req_id = None if 'CONTENT_LENGTH' not in environ: log.debug("No Content-Length") - return jsonrpc_error(retid=self._req_id, - message="No Content-Length in request") + raise JSONRPCErrorResponse(retid=self._req_id, + message="No Content-Length in request") else: length = environ['CONTENT_LENGTH'] or 0 length = int(environ['CONTENT_LENGTH']) log.debug('Content-Length: %s', length) if length == 0: - return jsonrpc_error(retid=self._req_id, - message="Content-Length is 0") + raise JSONRPCErrorResponse(retid=self._req_id, + message="Content-Length is 0") raw_body = environ['wsgi.input'].read(length) @@ -129,9 +124,9 @@ class JSONRPCController(WSGIController): json_body = json.loads(raw_body) except ValueError as e: # catch JSON errors Here - return jsonrpc_error(retid=self._req_id, - message="JSON parse error ERR:%s RAW:%r" - % (e, raw_body)) + raise JSONRPCErrorResponse(retid=self._req_id, + message="JSON parse error ERR:%s RAW:%r" + % (e, raw_body)) # check AUTH based on API key try: @@ -142,38 +137,36 @@ class JSONRPCController(WSGIController): if not isinstance(self._request_params, dict): self._request_params = {} - log.debug( - 'method: %s, params: %s', self._req_method, - self._request_params - ) + log.debug('method: %s, params: %s', + self._req_method, self._request_params) except KeyError as e: - return jsonrpc_error(retid=self._req_id, - message='Incorrect JSON query missing %s' % e) + raise JSONRPCErrorResponse(retid=self._req_id, + message='Incorrect JSON query missing %s' % e) # check if we can find this session using api_key try: u = User.get_by_api_key(self._req_api_key) if u is None: - return jsonrpc_error(retid=self._req_id, - message='Invalid API key') + raise JSONRPCErrorResponse(retid=self._req_id, + message='Invalid API key') auth_u = AuthUser(dbuser=u) if not AuthUser.check_ip_allowed(auth_u, ip_addr): - return jsonrpc_error(retid=self._req_id, - message='request from IP:%s not allowed' % (ip_addr,)) + raise JSONRPCErrorResponse(retid=self._req_id, + message='request from IP:%s not allowed' % (ip_addr,)) else: log.info('Access for IP:%s allowed', ip_addr) except Exception as e: - return jsonrpc_error(retid=self._req_id, - message='Invalid API key') + raise JSONRPCErrorResponse(retid=self._req_id, + message='Invalid API key') self._error = None try: self._func = self._find_method() except AttributeError as e: - return jsonrpc_error(retid=self._req_id, - message=str(e)) + raise JSONRPCErrorResponse(retid=self._req_id, + message=str(e)) # now that we have a method, add self._req_params to # self.kargs and dispatch control to WGIController @@ -183,26 +176,18 @@ class JSONRPCController(WSGIController): default_empty = types.NotImplementedType # kw arguments required by this method - func_kwargs = dict(izip_longest(reversed(arglist), reversed(defaults), - fillvalue=default_empty)) + func_kwargs = dict(itertools.izip_longest(reversed(arglist), reversed(defaults), + fillvalue=default_empty)) # this is little trick to inject logged in user for # perms decorators to work they expect the controller class to have # authuser attribute set - self.authuser = auth_u + request.authuser = auth_u # This attribute will need to be first param of a method that uses # api_key, which is translated to instance of user at that name USER_SESSION_ATTR = 'apiuser' - if USER_SESSION_ATTR not in arglist: - return jsonrpc_error( - retid=self._req_id, - message='This method [%s] does not support ' - 'authentication (missing %s param)' % ( - self._func.__name__, USER_SESSION_ATTR) - ) - # get our arglist and check if we provided them as args for arg, default in func_kwargs.iteritems(): if arg == USER_SESSION_ATTR: @@ -213,47 +198,40 @@ class JSONRPCController(WSGIController): # skip the required param check if it's default value is # NotImplementedType (default_empty) if default == default_empty and arg not in self._request_params: - return jsonrpc_error( + raise JSONRPCErrorResponse( retid=self._req_id, - message=( - 'Missing non optional `%s` arg in JSON DATA' % arg - ) + message='Missing non optional `%s` arg in JSON DATA' % arg, ) - self._rpc_args = {USER_SESSION_ATTR: u} + extra = set(self._request_params).difference(func_kwargs) + if extra: + raise JSONRPCErrorResponse( + retid=self._req_id, + message='Unknown %s arg in JSON DATA' % + ', '.join('`%s`' % arg for arg in extra), + ) + self._rpc_args = {} self._rpc_args.update(self._request_params) - self._rpc_args['action'] = self._req_method self._rpc_args['environ'] = environ - self._rpc_args['start_response'] = start_response - status = [] - headers = [] - exc_info = [] - - def change_content(new_status, new_headers, new_exc_info=None): - status.append(new_status) - headers.extend(new_headers) - exc_info.append(new_exc_info) - - output = WSGIController.__call__(self, environ, change_content) - output = list(output) # expand iterator - just to ensure exact timing - replace_header(headers, 'Content-Type', 'application/json') - start_response(status[0], headers, exc_info[0]) log.info('IP: %s Request to %s time: %.3fs' % ( self._get_ip_addr(environ), safe_unicode(_get_access_path(environ)), time.time() - start) ) - return output - def _dispatch_call(self): + state.set_action(self._rpc_call, []) + state.set_params(self._rpc_args) + return state + + def _rpc_call(self, action, environ, **rpc_args): """ - Implement dispatch interface specified by WSGIController + Call the specified RPC Method """ raw_response = '' try: - raw_response = self._inspect_call(self._func) + raw_response = getattr(self, action)(**rpc_args) if isinstance(raw_response, HTTPError): self._error = str(raw_response) except JSONRPCError as e: diff --git a/kallithea/controllers/api/api.py b/kallithea/controllers/api/api.py --- a/kallithea/controllers/api/api.py +++ b/kallithea/controllers/api/api.py @@ -25,18 +25,20 @@ Original author and date, and relevant c :license: GPLv3, see LICENSE.md for more details. """ - import time import traceback import logging + +from datetime import datetime from sqlalchemy import or_ -from kallithea import EXTERN_TYPE_INTERNAL +from tg import request + from kallithea.controllers.api import JSONRPCController, JSONRPCError from kallithea.lib.auth import ( - PasswordGenerator, AuthUser, HasPermissionAllDecorator, - HasPermissionAnyDecorator, HasPermissionAnyApi, HasRepoPermissionAnyApi, - HasRepoGroupPermissionAnyApi, HasUserGroupPermissionAny) + PasswordGenerator, AuthUser, HasPermissionAnyDecorator, + HasPermissionAnyDecorator, HasPermissionAny, HasRepoPermissionLevel, + HasRepoGroupPermissionLevel, HasUserGroupPermissionLevel) from kallithea.lib.utils import map_groups, repo2db_mapper from kallithea.lib.utils2 import ( str2bool, time_to_datetime, safe_int, Optional, OAttr) @@ -47,12 +49,18 @@ from kallithea.model.repo import RepoMod from kallithea.model.user import UserModel from kallithea.model.user_group import UserGroupModel from kallithea.model.gist import GistModel +from kallithea.model.changeset_status import ChangesetStatusModel +from kallithea.model.comment import ChangesetCommentsModel +from kallithea.model.pull_request import PullRequestModel from kallithea.model.db import ( Repository, Setting, UserIpMap, Permission, User, Gist, - RepoGroup) + RepoGroup, UserGroup, PullRequest, ChangesetStatus) from kallithea.lib.compat import json from kallithea.lib.exceptions import ( DefaultUserException, UserGroupsAssignedException) +from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError +from kallithea.lib.vcs.backends.base import EmptyChangeset +from kallithea.lib.utils import action_logger log = logging.getLogger(__name__) @@ -96,7 +104,7 @@ def get_repo_group_or_error(repogroupid) :param repogroupid: """ - repo_group = RepoGroupModel()._get_repo_group(repogroupid) + repo_group = RepoGroup.guess_instance(repogroupid) if repo_group is None: raise JSONRPCError( 'repository group `%s` does not exist' % (repogroupid,)) @@ -147,34 +155,32 @@ class ApiController(JSONRPCController): """ API Controller - Each method takes USER as first argument. This is then, based on given - API_KEY propagated as instance of user object who's making the call. - - example function:: - - def func(apiuser,arg1, arg2,...): + The authenticated user can be found as request.authuser. + + Example function:: + + def func(arg1, arg2,...): pass Each function should also **raise** JSONRPCError for any errors that happens. - """ - @HasPermissionAllDecorator('hg.admin') - def test(self, apiuser, args): + @HasPermissionAnyDecorator('hg.admin') + def test(self, args): return args - @HasPermissionAllDecorator('hg.admin') - def pull(self, apiuser, repoid): + @HasPermissionAnyDecorator('hg.admin') + def pull(self, repoid, clone_uri=Optional(None)): """ Triggers a pull from remote location on given repo. Can be used to automatically keep remote repos up to date. This command can be executed only using api_key belonging to user with admin rights - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int + :param clone_uri: repository URI to pull from (optional) + :type clone_uri: str OUTPUT:: @@ -199,7 +205,8 @@ class ApiController(JSONRPCController): try: ScmModel().pull_changes(repo.repo_name, - self.authuser.username) + request.authuser.username, + clone_uri=Optional.extract(clone_uri)) return dict( msg='Pulled from `%s`' % repo.repo_name, repository=repo.repo_name @@ -210,16 +217,14 @@ class ApiController(JSONRPCController): 'Unable to pull changes from `%s`' % repo.repo_name ) - @HasPermissionAllDecorator('hg.admin') - def rescan_repos(self, apiuser, remove_obsolete=Optional(False)): + @HasPermissionAnyDecorator('hg.admin') + def rescan_repos(self, remove_obsolete=Optional(False)): """ Triggers rescan repositories action. If remove_obsolete is set than also delete repos that are in database but not in the filesystem. aka "clean zombies". This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param remove_obsolete: deletes repositories from database that are not found on the filesystem :type remove_obsolete: Optional(bool) @@ -254,14 +259,12 @@ class ApiController(JSONRPCController): 'Error occurred during rescan repositories action' ) - def invalidate_cache(self, apiuser, repoid): + def invalidate_cache(self, repoid): """ Invalidate cache for repository. This command can be executed only using api_key belonging to user with admin rights or regular user that have write or admin or write access to repository. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int @@ -284,11 +287,8 @@ class ApiController(JSONRPCController): """ repo = get_repo_or_error(repoid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo ! - if not HasRepoPermissionAnyApi('repository.admin', - 'repository.write')( - user=apiuser, repo_name=repo.repo_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoPermissionLevel('write')(repo.repo_name): raise JSONRPCError('repository `%s` does not exist' % (repoid,)) try: @@ -304,7 +304,7 @@ class ApiController(JSONRPCController): ) # permission check inside - def lock(self, apiuser, repoid, locked=Optional(None), + def lock(self, repoid, locked=Optional(None), userid=Optional(OAttr('apiuser'))): """ Set locking state on given repository by given user. If userid param @@ -314,8 +314,6 @@ class ApiController(JSONRPCController): to user with admin rights or regular user that have admin or write access to repository. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int :param locked: lock state to be set @@ -350,14 +348,12 @@ class ApiController(JSONRPCController): """ repo = get_repo_or_error(repoid) - if HasPermissionAnyApi('hg.admin')(user=apiuser): + if HasPermissionAny('hg.admin')(): pass - elif HasRepoPermissionAnyApi('repository.admin', - 'repository.write')(user=apiuser, - repo_name=repo.repo_name): + elif HasRepoPermissionLevel('write')(repo.repo_name): # make sure normal user does not pass someone else userid, # he is not allowed to do that - if not isinstance(userid, Optional) and userid != apiuser.user_id: + if not isinstance(userid, Optional) and userid != request.authuser.user_id: raise JSONRPCError( 'userid is not the same as your user' ) @@ -365,7 +361,7 @@ class ApiController(JSONRPCController): raise JSONRPCError('repository `%s` does not exist' % (repoid,)) if isinstance(userid, Optional): - userid = apiuser.user_id + userid = request.authuser.user_id user = get_user_or_error(userid) @@ -423,14 +419,12 @@ class ApiController(JSONRPCController): 'Error occurred locking repository `%s`' % repo.repo_name ) - def get_locks(self, apiuser, userid=Optional(OAttr('apiuser'))): + def get_locks(self, userid=Optional(OAttr('apiuser'))): """ Get all repositories with locks for given userid, if this command is run by non-admin account userid is set to user who is calling this method, thus returning locks for himself. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param userid: User to get locks for :type userid: Optional(str or int) @@ -443,10 +437,10 @@ class ApiController(JSONRPCController): error : null """ - if not HasPermissionAnyApi('hg.admin')(user=apiuser): + if not HasPermissionAny('hg.admin')(): # make sure normal user does not pass someone else userid, # he is not allowed to do that - if not isinstance(userid, Optional) and userid != apiuser.user_id: + if not isinstance(userid, Optional) and userid != request.authuser.user_id: raise JSONRPCError( 'userid is not the same as your user' ) @@ -458,7 +452,7 @@ class ApiController(JSONRPCController): user = get_user_or_error(userid) # show all locks - for r in Repository.getAll(): + for r in Repository.query(): userid, time_ = r.locked if time_: _api_data = r.get_api_data() @@ -471,8 +465,8 @@ class ApiController(JSONRPCController): return ret - @HasPermissionAllDecorator('hg.admin') - def get_ip(self, apiuser, userid=Optional(OAttr('apiuser'))): + @HasPermissionAnyDecorator('hg.admin') + def get_ip(self, userid=Optional(OAttr('apiuser'))): """ Shows IP address as seen from Kallithea server, together with all defined IP addresses for given user. If userid is not passed data is @@ -480,8 +474,6 @@ class ApiController(JSONRPCController): This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param userid: username to show ips for :type userid: Optional(str or int) @@ -501,24 +493,22 @@ class ApiController(JSONRPCController): """ if isinstance(userid, Optional): - userid = apiuser.user_id + userid = request.authuser.user_id user = get_user_or_error(userid) ips = UserIpMap.query().filter(UserIpMap.user == user).all() return dict( - server_ip_addr=self.ip_addr, + server_ip_addr=request.ip_addr, user_ips=ips ) # alias for old show_ip = get_ip - @HasPermissionAllDecorator('hg.admin') - def get_server_info(self, apiuser): + @HasPermissionAnyDecorator('hg.admin') + def get_server_info(self): """ return server info, including Kallithea version and installed packages - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser OUTPUT:: @@ -533,7 +523,7 @@ class ApiController(JSONRPCController): """ return Setting.get_server_info() - def get_user(self, apiuser, userid=Optional(OAttr('apiuser'))): + def get_user(self, userid=Optional(OAttr('apiuser'))): """ Gets a user by username or user_id, Returns empty result if user is not found. If userid param is skipped it is set to id of user who is @@ -541,8 +531,6 @@ class ApiController(JSONRPCController): belonging to user with admin rights, or regular users that cannot specify different userid than theirs - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param userid: user to get data for :type userid: Optional(str or int) @@ -577,30 +565,28 @@ class ApiController(JSONRPCController): error: null """ - if not HasPermissionAnyApi('hg.admin')(user=apiuser): + if not HasPermissionAny('hg.admin')(): # make sure normal user does not pass someone else userid, # he is not allowed to do that - if not isinstance(userid, Optional) and userid != apiuser.user_id: + if not isinstance(userid, Optional) and userid != request.authuser.user_id: raise JSONRPCError( 'userid is not the same as your user' ) if isinstance(userid, Optional): - userid = apiuser.user_id + userid = request.authuser.user_id user = get_user_or_error(userid) data = user.get_api_data() data['permissions'] = AuthUser(user_id=user.user_id).permissions return data - @HasPermissionAllDecorator('hg.admin') - def get_users(self, apiuser): + @HasPermissionAnyDecorator('hg.admin') + def get_users(self): """ Lists all existing users. This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser OUTPUT:: @@ -609,26 +595,23 @@ class ApiController(JSONRPCController): error: null """ - result = [] - users_list = User.query().order_by(User.username) \ - .filter(User.username != User.DEFAULT_USER) \ - .all() - for user in users_list: - result.append(user.get_api_data()) - return result - - @HasPermissionAllDecorator('hg.admin') - def create_user(self, apiuser, username, email, password=Optional(''), - firstname=Optional(''), lastname=Optional(''), + return [ + user.get_api_data() + for user in User.query() + .order_by(User.username) + .filter_by(is_default_user=False) + ] + + @HasPermissionAnyDecorator('hg.admin') + def create_user(self, username, email, password=Optional(''), + firstname=Optional(u''), lastname=Optional(u''), active=Optional(True), admin=Optional(False), - extern_name=Optional(EXTERN_TYPE_INTERNAL), - extern_type=Optional(EXTERN_TYPE_INTERNAL)): + extern_type=Optional(User.DEFAULT_AUTH_TYPE), + extern_name=Optional('')): """ Creates new user. Returns new user object. This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param username: new username :type username: str or int :param email: email @@ -675,13 +658,9 @@ class ApiController(JSONRPCController): if User.get_by_username(username): raise JSONRPCError("user `%s` already exist" % (username,)) - if User.get_by_email(email, case_insensitive=True): + if User.get_by_email(email): raise JSONRPCError("email `%s` already exist" % (email,)) - if Optional.extract(extern_name): - # generate temporary password if user is external - password = PasswordGenerator().gen_password(length=8) - try: user = UserModel().create_or_update( username=Optional.extract(username), @@ -703,18 +682,16 @@ class ApiController(JSONRPCController): log.error(traceback.format_exc()) raise JSONRPCError('failed to create user `%s`' % (username,)) - @HasPermissionAllDecorator('hg.admin') - def update_user(self, apiuser, userid, username=Optional(None), - email=Optional(None),password=Optional(None), + @HasPermissionAnyDecorator('hg.admin') + def update_user(self, userid, username=Optional(None), + email=Optional(None), password=Optional(None), firstname=Optional(None), lastname=Optional(None), active=Optional(None), admin=Optional(None), - extern_type=Optional(None), extern_name=Optional(None),): + extern_type=Optional(None), extern_name=Optional(None)): """ updates given user if such user exists. This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param userid: userid to update :type userid: str or int :param username: new username @@ -786,14 +763,12 @@ class ApiController(JSONRPCController): log.error(traceback.format_exc()) raise JSONRPCError('failed to update user `%s`' % (userid,)) - @HasPermissionAllDecorator('hg.admin') - def delete_user(self, apiuser, userid): + @HasPermissionAnyDecorator('hg.admin') + def delete_user(self, userid): """ deletes given user if such user exists. This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param userid: user to delete :type userid: str or int @@ -831,14 +806,12 @@ class ApiController(JSONRPCController): % (user.user_id, user.username)) # permission check inside - def get_user_group(self, apiuser, usergroupid): + def get_user_group(self, usergroupid): """ Gets an existing user group. This command can be executed only using api_key belonging to user with admin rights or user who has at least read access to user group. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param usergroupid: id of user_group to edit :type usergroupid: str or int @@ -856,25 +829,20 @@ class ApiController(JSONRPCController): """ user_group = get_user_group_or_error(usergroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have at least read permission for this user group ! - _perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin',) - if not HasUserGroupPermissionAny(*_perms)( - user=apiuser, user_group_name=user_group.users_group_name): + if not HasPermissionAny('hg.admin')(): + if not HasUserGroupPermissionLevel('read')(user_group.users_group_name): raise JSONRPCError('user group `%s` does not exist' % (usergroupid,)) data = user_group.get_api_data() return data # permission check inside - def get_user_groups(self, apiuser): + def get_user_groups(self): """ Lists all existing user groups. This command can be executed only using api_key belonging to user with admin rights or user who has at least read access to user group. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser OUTPUT:: @@ -883,24 +851,19 @@ class ApiController(JSONRPCController): error : null """ - result = [] - _perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin',) - extras = {'user': apiuser} - for user_group in UserGroupList(UserGroupModel().get_all(), - perm_set=_perms, extra_kwargs=extras): - result.append(user_group.get_api_data()) - return result + return [ + user_group.get_api_data() + for user_group in UserGroupList(UserGroup.query().all(), perm_level='read') + ] @HasPermissionAnyDecorator('hg.admin', 'hg.usergroup.create.true') - def create_user_group(self, apiuser, group_name, description=Optional(''), + def create_user_group(self, group_name, description=Optional(u''), owner=Optional(OAttr('apiuser')), active=Optional(True)): """ Creates new user group. This command can be executed only using api_key belonging to user with admin rights or an user who has create user group permission - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param group_name: name of new user group :type group_name: str :param description: group description @@ -936,7 +899,7 @@ class ApiController(JSONRPCController): try: if isinstance(owner, Optional): - owner = apiuser.user_id + owner = request.authuser.user_id owner = get_user_or_error(owner) active = Optional.extract(active) @@ -953,15 +916,13 @@ class ApiController(JSONRPCController): raise JSONRPCError('failed to create group `%s`' % (group_name,)) # permission check inside - def update_user_group(self, apiuser, usergroupid, group_name=Optional(''), + def update_user_group(self, usergroupid, group_name=Optional(''), description=Optional(''), owner=Optional(None), active=Optional(True)): """ Updates given usergroup. This command can be executed only using api_key belonging to user with admin rights or an admin of given user group - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param usergroupid: id of user group to update :type usergroupid: str or int :param group_name: name of new user group @@ -992,11 +953,8 @@ class ApiController(JSONRPCController): """ user_group = get_user_group_or_error(usergroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this user group ! - _perms = ('usergroup.admin',) - if not HasUserGroupPermissionAny(*_perms)( - user=apiuser, user_group_name=user_group.users_group_name): + if not HasPermissionAny('hg.admin')(): + if not HasUserGroupPermissionLevel('admin')(user_group.users_group_name): raise JSONRPCError('user group `%s` does not exist' % (usergroupid,)) if not isinstance(owner, Optional): @@ -1005,7 +963,7 @@ class ApiController(JSONRPCController): updates = {} store_update(updates, group_name, 'users_group_name') store_update(updates, description, 'user_group_description') - store_update(updates, owner, 'user') + store_update(updates, owner, 'owner') store_update(updates, active, 'users_group_active') try: UserGroupModel().update(user_group, updates) @@ -1020,14 +978,12 @@ class ApiController(JSONRPCController): raise JSONRPCError('failed to update user group `%s`' % (usergroupid,)) # permission check inside - def delete_user_group(self, apiuser, usergroupid): + def delete_user_group(self, usergroupid): """ Delete given user group by user group id or name. This command can be executed only using api_key belonging to user with admin rights or an admin of given user group - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param usergroupid: :type usergroupid: int @@ -1051,11 +1007,8 @@ class ApiController(JSONRPCController): """ user_group = get_user_group_or_error(usergroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this user group ! - _perms = ('usergroup.admin',) - if not HasUserGroupPermissionAny(*_perms)( - user=apiuser, user_group_name=user_group.users_group_name): + if not HasPermissionAny('hg.admin')(): + if not HasUserGroupPermissionLevel('admin')(user_group.users_group_name): raise JSONRPCError('user group `%s` does not exist' % (usergroupid,)) try: @@ -1074,17 +1027,15 @@ class ApiController(JSONRPCController): raise JSONRPCError('failed to delete user group ID:%s %s' % (user_group.users_group_id, user_group.users_group_name) - ) + ) # permission check inside - def add_user_to_user_group(self, apiuser, usergroupid, userid): + def add_user_to_user_group(self, usergroupid, userid): """ Adds a user to a user group. If user exists in that group success will be `false`. This command can be executed only using api_key belonging to user with admin rights or an admin of given user group - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param usergroupid: :type usergroupid: int :param userid: @@ -1112,11 +1063,8 @@ class ApiController(JSONRPCController): """ user = get_user_or_error(userid) user_group = get_user_group_or_error(usergroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this user group ! - _perms = ('usergroup.admin',) - if not HasUserGroupPermissionAny(*_perms)( - user=apiuser, user_group_name=user_group.users_group_name): + if not HasPermissionAny('hg.admin')(): + if not HasUserGroupPermissionLevel('admin')(user_group.users_group_name): raise JSONRPCError('user group `%s` does not exist' % (usergroupid,)) try: @@ -1141,14 +1089,12 @@ class ApiController(JSONRPCController): ) # permission check inside - def remove_user_from_user_group(self, apiuser, usergroupid, userid): + def remove_user_from_user_group(self, usergroupid, userid): """ Removes a user from a user group. If user is not in given group success will be `false`. This command can be executed only using api_key belonging to user with admin rights or an admin of given user group - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param usergroupid: :param userid: @@ -1166,11 +1112,8 @@ class ApiController(JSONRPCController): """ user = get_user_or_error(userid) user_group = get_user_group_or_error(usergroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this user group ! - _perms = ('usergroup.admin',) - if not HasUserGroupPermissionAny(*_perms)( - user=apiuser, user_group_name=user_group.users_group_name): + if not HasPermissionAny('hg.admin')(): + if not HasUserGroupPermissionLevel('admin')(user_group.users_group_name): raise JSONRPCError('user group `%s` does not exist' % (usergroupid,)) try: @@ -1190,15 +1133,15 @@ class ApiController(JSONRPCController): ) # permission check inside - def get_repo(self, apiuser, repoid): + def get_repo(self, repoid, + with_revision_names=Optional(False), + with_pullrequests=Optional(False)): """ Gets an existing repository by it's name or repository_id. Members will return either users_group or user associated to that repository. This command can be executed only using api_key belonging to user with admin rights or regular user that have at least read access to repository. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int @@ -1242,8 +1185,20 @@ class ApiController(JSONRPCController): }, … ] - "followers": [, ...] - ] + "followers": [, ...], + + "tags": { + "": "", + ... + }, + "branches": { + "": "", + ... + }, + "bookmarks": { + "": "", + ... + }, } } error : null @@ -1251,14 +1206,11 @@ class ApiController(JSONRPCController): """ repo = get_repo_or_error(repoid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo ! - perms = ('repository.admin', 'repository.write', 'repository.read') - if not HasRepoPermissionAnyApi(*perms)(user=apiuser, repo_name=repo.repo_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoPermissionLevel('read')(repo.repo_name): raise JSONRPCError('repository `%s` does not exist' % (repoid,)) members = [] - followers = [] for user in repo.repo_to_perm: perm = user.permission.permission_name user = user.user @@ -1279,23 +1231,24 @@ class ApiController(JSONRPCController): } members.append(user_group_data) - for user in repo.followers: - followers.append(user.user.get_api_data()) - - data = repo.get_api_data() + followers = [ + uf.user.get_api_data() + for uf in repo.followers + ] + + data = repo.get_api_data(with_revision_names=Optional.extract(with_revision_names), + with_pullrequests=Optional.extract(with_pullrequests)) data['members'] = members data['followers'] = followers return data # permission check inside - def get_repos(self, apiuser): + def get_repos(self): """ Lists all existing repositories. This command can be executed only using api_key belonging to user with admin rights or regular user that have admin, write or read access to repository. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser OUTPUT:: @@ -1320,18 +1273,18 @@ class ApiController(JSONRPCController): ] error: null """ - result = [] - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - repos = RepoModel().get_all_user_repos(user=apiuser) + if not HasPermissionAny('hg.admin')(): + repos = RepoModel().get_all_user_repos(user=request.authuser.user_id) else: - repos = RepoModel().get_all() - - for repo in repos: - result.append(repo.get_api_data()) - return result + repos = Repository.query() + + return [ + repo.get_api_data() + for repo in repos + ] # permission check inside - def get_repo_nodes(self, apiuser, repoid, revision, root_path, + def get_repo_nodes(self, repoid, revision, root_path, ret_type=Optional('all')): """ returns a list of nodes and it's children in a flat list for a given path @@ -1339,8 +1292,6 @@ class ApiController(JSONRPCController): `dirs`. This command can be executed only using api_key belonging to user with admin rights or regular user that have at least read access to repository. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int :param revision: revision for which listing should be done @@ -1365,10 +1316,8 @@ class ApiController(JSONRPCController): """ repo = get_repo_or_error(repoid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo ! - perms = ('repository.admin', 'repository.write', 'repository.read') - if not HasRepoPermissionAnyApi(*perms)(user=apiuser, repo_name=repo.repo_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoPermissionLevel('read')(repo.repo_name): raise JSONRPCError('repository `%s` does not exist' % (repoid,)) ret_type = Optional.extract(ret_type) @@ -1392,7 +1341,7 @@ class ApiController(JSONRPCController): ) @HasPermissionAnyDecorator('hg.admin', 'hg.create.repository') - def create_repo(self, apiuser, repo_name, owner=Optional(OAttr('apiuser')), + def create_repo(self, repo_name, owner=Optional(OAttr('apiuser')), repo_type=Optional('hg'), description=Optional(''), private=Optional(False), clone_uri=Optional(None), landing_rev=Optional('rev:tip'), @@ -1408,8 +1357,6 @@ class ApiController(JSONRPCController): belonging to user with admin rights or regular user that have create repository permission. Regular users cannot specify owner parameter - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repo_name: repository name :type repo_name: str :param owner: user_id or username @@ -1453,14 +1400,14 @@ class ApiController(JSONRPCController): } """ - if not HasPermissionAnyApi('hg.admin')(user=apiuser): + if not HasPermissionAny('hg.admin')(): if not isinstance(owner, Optional): - #forbid setting owner for non-admins + # forbid setting owner for non-admins raise JSONRPCError( 'Only Kallithea admin can specify `owner` param' ) if isinstance(owner, Optional): - owner = apiuser.user_id + owner = request.authuser.user_id owner = get_user_or_error(owner) @@ -1509,10 +1456,7 @@ class ApiController(JSONRPCController): ) task = RepoModel().create(form_data=data, cur_user=owner) - from celery.result import BaseAsyncResult - task_id = None - if isinstance(task, BaseAsyncResult): - task_id = task.task_id + task_id = task.task_id # no commit, it's done in RepoModel, or async via celery return dict( msg="Created new repository `%s`" % (repo_name,), @@ -1526,7 +1470,7 @@ class ApiController(JSONRPCController): 'failed to create repository `%s`' % (repo_name,)) # permission check inside - def update_repo(self, apiuser, repoid, name=Optional(None), + def update_repo(self, repoid, name=Optional(None), owner=Optional(OAttr('apiuser')), group=Optional(None), description=Optional(''), private=Optional(False), @@ -1538,8 +1482,6 @@ class ApiController(JSONRPCController): """ Updates repo - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int :param name: @@ -1554,19 +1496,17 @@ class ApiController(JSONRPCController): :param enable_downloads: """ repo = get_repo_or_error(repoid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo ! - if not HasRepoPermissionAnyApi('repository.admin')(user=apiuser, - repo_name=repo.repo_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoPermissionLevel('admin')(repo.repo_name): raise JSONRPCError('repository `%s` does not exist' % (repoid,)) if (name != repo.repo_name and - not HasPermissionAnyApi('hg.create.repository')(user=apiuser) + not HasPermissionAny('hg.create.repository')() ): raise JSONRPCError('no permission to create (or move) repositories') if not isinstance(owner, Optional): - #forbid setting owner for non-admins + # forbid setting owner for non-admins raise JSONRPCError( 'Only Kallithea admin can specify `owner` param' ) @@ -1579,7 +1519,7 @@ class ApiController(JSONRPCController): try: store_update(updates, name, 'repo_name') store_update(updates, repo_group, 'repo_group') - store_update(updates, owner, 'user') + store_update(updates, owner, 'owner') store_update(updates, description, 'repo_description') store_update(updates, private, 'repo_private') store_update(updates, clone_uri, 'clone_uri') @@ -1599,7 +1539,7 @@ class ApiController(JSONRPCController): raise JSONRPCError('failed to update repo `%s`' % repoid) @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository') - def fork_repo(self, apiuser, repoid, fork_name, + def fork_repo(self, repoid, fork_name, owner=Optional(OAttr('apiuser')), description=Optional(''), copy_permissions=Optional(False), private=Optional(False), landing_rev=Optional('rev:tip')): @@ -1610,8 +1550,6 @@ class ApiController(JSONRPCController): user with admin rights or regular user that have fork permission, and at least read access to forking repository. Regular users cannot specify owner parameter. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int :param fork_name: @@ -1654,25 +1592,22 @@ class ApiController(JSONRPCController): type_ = 'fork' if _repo.fork else 'repo' raise JSONRPCError("%s `%s` already exist" % (type_, fork_name)) - if HasPermissionAnyApi('hg.admin')(user=apiuser): + if HasPermissionAny('hg.admin')(): pass - elif HasRepoPermissionAnyApi('repository.admin', - 'repository.write', - 'repository.read')(user=apiuser, - repo_name=repo.repo_name): + elif HasRepoPermissionLevel('read')(repo.repo_name): if not isinstance(owner, Optional): - #forbid setting owner for non-admins + # forbid setting owner for non-admins raise JSONRPCError( 'Only Kallithea admin can specify `owner` param' ) - if not HasPermissionAnyApi('hg.create.repository')(user=apiuser): + if not HasPermissionAny('hg.create.repository')(): raise JSONRPCError('no permission to create repositories') else: raise JSONRPCError('repository `%s` does not exist' % (repoid,)) if isinstance(owner, Optional): - owner = apiuser.user_id + owner = request.authuser.user_id owner = get_user_or_error(owner) @@ -1699,10 +1634,7 @@ class ApiController(JSONRPCController): ) task = RepoModel().create_fork(form_data, cur_user=owner) # no commit, it's done in RepoModel, or async via celery - from celery.result import BaseAsyncResult - task_id = None - if isinstance(task, BaseAsyncResult): - task_id = task.task_id + task_id = task.task_id return dict( msg='Created fork of `%s` as `%s`' % (repo.repo_name, fork_name), @@ -1718,15 +1650,13 @@ class ApiController(JSONRPCController): ) # permission check inside - def delete_repo(self, apiuser, repoid, forks=Optional('')): + def delete_repo(self, repoid, forks=Optional('')): """ Deletes a repository. This command can be executed only using api_key belonging to user with admin rights or regular user that have admin access to repository. When `forks` param is set it's possible to detach or delete forks of deleting repository - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int :param forks: `detach` or `delete`, what do do with attached forks for repo @@ -1744,10 +1674,8 @@ class ApiController(JSONRPCController): """ repo = get_repo_or_error(repoid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo ! - if not HasRepoPermissionAnyApi('repository.admin')(user=apiuser, - repo_name=repo.repo_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoPermissionLevel('admin')(repo.repo_name): raise JSONRPCError('repository `%s` does not exist' % (repoid,)) try: @@ -1776,15 +1704,13 @@ class ApiController(JSONRPCController): 'failed to delete repository `%s`' % (repo.repo_name,) ) - @HasPermissionAllDecorator('hg.admin') - def grant_user_permission(self, apiuser, repoid, userid, perm): + @HasPermissionAnyDecorator('hg.admin') + def grant_user_permission(self, repoid, userid, perm): """ Grant permission for user on given repository, or update existing one if found. This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int :param userid: @@ -1823,14 +1749,12 @@ class ApiController(JSONRPCController): ) ) - @HasPermissionAllDecorator('hg.admin') - def revoke_user_permission(self, apiuser, repoid, userid): + @HasPermissionAnyDecorator('hg.admin') + def revoke_user_permission(self, repoid, userid): """ Revoke permission for user on given repository. This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int :param userid: @@ -1866,14 +1790,12 @@ class ApiController(JSONRPCController): ) # permission check inside - def grant_user_group_permission(self, apiuser, repoid, usergroupid, perm): + def grant_user_group_permission(self, repoid, usergroupid, perm): """ Grant permission for user group on given repository, or update existing one if found. This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int :param usergroupid: id of usergroup @@ -1903,17 +1825,11 @@ class ApiController(JSONRPCController): repo = get_repo_or_error(repoid) perm = get_perm_or_error(perm) user_group = get_user_group_or_error(usergroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo ! - _perms = ('repository.admin',) - if not HasRepoPermissionAnyApi(*_perms)( - user=apiuser, repo_name=repo.repo_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoPermissionLevel('admin')(repo.repo_name): raise JSONRPCError('repository `%s` does not exist' % (repoid,)) - # check if we have at least read permission for this user group ! - _perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin',) - if not HasUserGroupPermissionAny(*_perms)( - user=apiuser, user_group_name=user_group.users_group_name): + if not HasUserGroupPermissionLevel('read')(user_group.users_group_name): raise JSONRPCError('user group `%s` does not exist' % (usergroupid,)) try: @@ -1939,13 +1855,11 @@ class ApiController(JSONRPCController): ) # permission check inside - def revoke_user_group_permission(self, apiuser, repoid, usergroupid): + def revoke_user_group_permission(self, repoid, usergroupid): """ Revoke permission for user group on given repository. This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repoid: repository name or repository id :type repoid: str or int :param usergroupid: @@ -1961,17 +1875,11 @@ class ApiController(JSONRPCController): """ repo = get_repo_or_error(repoid) user_group = get_user_group_or_error(usergroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo ! - _perms = ('repository.admin',) - if not HasRepoPermissionAnyApi(*_perms)( - user=apiuser, repo_name=repo.repo_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoPermissionLevel('admin')(repo.repo_name): raise JSONRPCError('repository `%s` does not exist' % (repoid,)) - # check if we have at least read permission for this user group ! - _perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin',) - if not HasUserGroupPermissionAny(*_perms)( - user=apiuser, user_group_name=user_group.users_group_name): + if not HasUserGroupPermissionLevel('read')(user_group.users_group_name): raise JSONRPCError('user group `%s` does not exist' % (usergroupid,)) try: @@ -1994,14 +1902,12 @@ class ApiController(JSONRPCController): ) ) - @HasPermissionAllDecorator('hg.admin') - def get_repo_group(self, apiuser, repogroupid): + @HasPermissionAnyDecorator('hg.admin') + def get_repo_group(self, repogroupid): """ Returns given repo group together with permissions, and repositories inside the group - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repogroupid: id/name of repository group :type repogroupid: str or int """ @@ -2032,21 +1938,19 @@ class ApiController(JSONRPCController): data["members"] = members return data - @HasPermissionAllDecorator('hg.admin') - def get_repo_groups(self, apiuser): + @HasPermissionAnyDecorator('hg.admin') + def get_repo_groups(self): """ Returns all repository groups - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser """ - result = [] - for repo_group in RepoGroupModel().get_all(): - result.append(repo_group.get_api_data()) - return result - - @HasPermissionAllDecorator('hg.admin') - def create_repo_group(self, apiuser, group_name, description=Optional(''), + return [ + repo_group.get_api_data() + for repo_group in RepoGroup.query() + ] + + @HasPermissionAnyDecorator('hg.admin') + def create_repo_group(self, group_name, description=Optional(''), owner=Optional(OAttr('apiuser')), parent=Optional(None), copy_permissions=Optional(False)): @@ -2054,8 +1958,6 @@ class ApiController(JSONRPCController): Creates a repository group. This command can be executed only using api_key belonging to user with admin rights. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param group_name: :type group_name: :param description: @@ -2089,7 +1991,7 @@ class ApiController(JSONRPCController): raise JSONRPCError("repo group `%s` already exist" % (group_name,)) if isinstance(owner, Optional): - owner = apiuser.user_id + owner = request.authuser.user_id group_description = Optional.extract(description) parent_group = Optional.extract(parent) if not isinstance(parent, Optional): @@ -2114,8 +2016,8 @@ class ApiController(JSONRPCController): log.error(traceback.format_exc()) raise JSONRPCError('failed to create repo group `%s`' % (group_name,)) - @HasPermissionAllDecorator('hg.admin') - def update_repo_group(self, apiuser, repogroupid, group_name=Optional(''), + @HasPermissionAnyDecorator('hg.admin') + def update_repo_group(self, repogroupid, group_name=Optional(''), description=Optional(''), owner=Optional(OAttr('apiuser')), parent=Optional(None), enable_locking=Optional(False)): @@ -2140,12 +2042,10 @@ class ApiController(JSONRPCController): raise JSONRPCError('failed to update repository group `%s`' % (repogroupid,)) - @HasPermissionAllDecorator('hg.admin') - def delete_repo_group(self, apiuser, repogroupid): + @HasPermissionAnyDecorator('hg.admin') + def delete_repo_group(self, repogroupid): """ - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repogroupid: name or id of repository group :type repogroupid: str or int @@ -2181,10 +2081,10 @@ class ApiController(JSONRPCController): log.error(traceback.format_exc()) raise JSONRPCError('failed to delete repo group ID:%s %s' % (repo_group.group_id, repo_group.group_name) - ) + ) # permission check inside - def grant_user_permission_to_repo_group(self, apiuser, repogroupid, userid, + def grant_user_permission_to_repo_group(self, repogroupid, userid, perm, apply_to_children=Optional('none')): """ Grant permission for user on given repository group, or update existing @@ -2192,8 +2092,6 @@ class ApiController(JSONRPCController): to user with admin rights, or user who has admin right to given repository group. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repogroupid: name or id of repository group :type repogroupid: str or int :param userid: @@ -2223,10 +2121,8 @@ class ApiController(JSONRPCController): repo_group = get_repo_group_or_error(repogroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo group ! - if not HasRepoGroupPermissionAnyApi('group.admin')(user=apiuser, - group_name=repo_group.group_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoGroupPermissionLevel('admin')(repo_group.group_name): raise JSONRPCError('repository group `%s` does not exist' % (repogroupid,)) user = get_user_or_error(userid) @@ -2253,15 +2149,13 @@ class ApiController(JSONRPCController): userid, repo_group.name)) # permission check inside - def revoke_user_permission_from_repo_group(self, apiuser, repogroupid, userid, + def revoke_user_permission_from_repo_group(self, repogroupid, userid, apply_to_children=Optional('none')): """ Revoke permission for user on given repository group. This command can be executed only using api_key belonging to user with admin rights, or user who has admin right to given repository group. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repogroupid: name or id of repository group :type repogroupid: str or int :param userid: @@ -2290,10 +2184,8 @@ class ApiController(JSONRPCController): repo_group = get_repo_group_or_error(repogroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo group ! - if not HasRepoGroupPermissionAnyApi('group.admin')(user=apiuser, - group_name=repo_group.group_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoGroupPermissionLevel('admin')(repo_group.group_name): raise JSONRPCError('repository group `%s` does not exist' % (repogroupid,)) user = get_user_or_error(userid) @@ -2320,16 +2212,14 @@ class ApiController(JSONRPCController): # permission check inside def grant_user_group_permission_to_repo_group( - self, apiuser, repogroupid, usergroupid, perm, - apply_to_children=Optional('none'),): + self, repogroupid, usergroupid, perm, + apply_to_children=Optional('none')): """ Grant permission for user group on given repository group, or update existing one if found. This command can be executed only using api_key belonging to user with admin rights, or user who has admin right to given repository group. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repogroupid: name or id of repository group :type repogroupid: str or int :param usergroupid: id of usergroup @@ -2361,18 +2251,12 @@ class ApiController(JSONRPCController): repo_group = get_repo_group_or_error(repogroupid) perm = get_perm_or_error(perm, prefix='group.') user_group = get_user_group_or_error(usergroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo group ! - _perms = ('group.admin',) - if not HasRepoGroupPermissionAnyApi(*_perms)( - user=apiuser, group_name=repo_group.group_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoGroupPermissionLevel('admin')(repo_group.group_name): raise JSONRPCError( 'repository group `%s` does not exist' % (repogroupid,)) - # check if we have at least read permission for this user group ! - _perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin',) - if not HasUserGroupPermissionAny(*_perms)( - user=apiuser, user_group_name=user_group.users_group_name): + if not HasUserGroupPermissionLevel('read')(user_group.users_group_name): raise JSONRPCError( 'user group `%s` does not exist' % (usergroupid,)) @@ -2387,9 +2271,9 @@ class ApiController(JSONRPCController): Session().commit() return dict( msg='Granted perm: `%s` (recursive:%s) for user group: `%s` in repo group: `%s`' % ( - perm.permission_name, apply_to_children, - user_group.users_group_name, repo_group.name - ), + perm.permission_name, apply_to_children, + user_group.users_group_name, repo_group.name + ), success=True ) except Exception: @@ -2403,15 +2287,13 @@ class ApiController(JSONRPCController): # permission check inside def revoke_user_group_permission_from_repo_group( - self, apiuser, repogroupid, usergroupid, + self, repogroupid, usergroupid, apply_to_children=Optional('none')): """ Revoke permission for user group on given repository. This command can be executed only using api_key belonging to user with admin rights, or user who has admin right to given repository group. - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param repogroupid: name or id of repository group :type repogroupid: str or int :param usergroupid: @@ -2439,18 +2321,12 @@ class ApiController(JSONRPCController): """ repo_group = get_repo_group_or_error(repogroupid) user_group = get_user_group_or_error(usergroupid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - # check if we have admin permission for this repo group ! - _perms = ('group.admin',) - if not HasRepoGroupPermissionAnyApi(*_perms)( - user=apiuser, group_name=repo_group.group_name): + if not HasPermissionAny('hg.admin')(): + if not HasRepoGroupPermissionLevel('admin')(repo_group.group_name): raise JSONRPCError( 'repository group `%s` does not exist' % (repogroupid,)) - # check if we have at least read permission for this user group ! - _perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin',) - if not HasUserGroupPermissionAny(*_perms)( - user=apiuser, user_group_name=user_group.users_group_name): + if not HasUserGroupPermissionLevel('read')(user_group.users_group_name): raise JSONRPCError( 'user group `%s` does not exist' % (usergroupid,)) @@ -2476,62 +2352,55 @@ class ApiController(JSONRPCController): ) ) - def get_gist(self, apiuser, gistid): + def get_gist(self, gistid): """ Get given gist by id - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param gistid: id of private or public gist :type gistid: str """ gist = get_gist_or_error(gistid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - if gist.gist_owner != apiuser.user_id: + if not HasPermissionAny('hg.admin')(): + if gist.owner_id != request.authuser.user_id: raise JSONRPCError('gist `%s` does not exist' % (gistid,)) return gist.get_api_data() - def get_gists(self, apiuser, userid=Optional(OAttr('apiuser'))): + def get_gists(self, userid=Optional(OAttr('apiuser'))): """ Get all gists for given user. If userid is empty returned gists are for user who called the api - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param userid: user to get gists for :type userid: Optional(str or int) """ - if not HasPermissionAnyApi('hg.admin')(user=apiuser): + if not HasPermissionAny('hg.admin')(): # make sure normal user does not pass someone else userid, # he is not allowed to do that - if not isinstance(userid, Optional) and userid != apiuser.user_id: + if not isinstance(userid, Optional) and userid != request.authuser.user_id: raise JSONRPCError( 'userid is not the same as your user' ) if isinstance(userid, Optional): - user_id = apiuser.user_id + user_id = request.authuser.user_id else: user_id = get_user_or_error(userid).user_id - gists = [] - _gists = Gist().query()\ - .filter(or_(Gist.gist_expires == -1, Gist.gist_expires >= time.time()))\ - .filter(Gist.gist_owner == user_id)\ - .order_by(Gist.created_on.desc()) - for gist in _gists: - gists.append(gist.get_api_data()) - return gists - - def create_gist(self, apiuser, files, owner=Optional(OAttr('apiuser')), + return [ + gist.get_api_data() + for gist in Gist().query() + .filter_by(is_expired=False) + .filter(Gist.owner_id == user_id) + .order_by(Gist.created_on.desc()) + ] + + def create_gist(self, files, owner=Optional(OAttr('apiuser')), gist_type=Optional(Gist.GIST_PUBLIC), lifetime=Optional(-1), description=Optional('')): """ Creates new Gist - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param files: files to be added to gist {'filename': {'content':'...', 'lexer': null}, 'filename2': {'content':'...', 'lexer': null}} @@ -2565,7 +2434,7 @@ class ApiController(JSONRPCController): """ try: if isinstance(owner, Optional): - owner = apiuser.user_id + owner = request.authuser.user_id owner = get_user_or_error(owner) description = Optional.extract(description) @@ -2586,19 +2455,17 @@ class ApiController(JSONRPCController): log.error(traceback.format_exc()) raise JSONRPCError('failed to create gist') - # def update_gist(self, apiuser, gistid, files, owner=Optional(OAttr('apiuser')), + # def update_gist(self, gistid, files, owner=Optional(OAttr('apiuser')), # gist_type=Optional(Gist.GIST_PUBLIC), # gist_lifetime=Optional(-1), gist_description=Optional('')): # gist = get_gist_or_error(gistid) # updates = {} # permission check inside - def delete_gist(self, apiuser, gistid): + def delete_gist(self, gistid): """ Deletes existing gist - :param apiuser: filled automatically from apikey - :type apiuser: AuthUser :param gistid: id of gist to delete :type gistid: str @@ -2621,8 +2488,8 @@ class ApiController(JSONRPCController): """ gist = get_gist_or_error(gistid) - if not HasPermissionAnyApi('hg.admin')(user=apiuser): - if gist.gist_owner != apiuser.user_id: + if not HasPermissionAny('hg.admin')(): + if gist.owner_id != request.authuser.user_id: raise JSONRPCError('gist `%s` does not exist' % (gistid,)) try: @@ -2636,3 +2503,103 @@ class ApiController(JSONRPCController): log.error(traceback.format_exc()) raise JSONRPCError('failed to delete gist ID:%s' % (gist.gist_access_id,)) + + # permission check inside + def get_changesets(self, repoid, start=None, end=None, start_date=None, + end_date=None, branch_name=None, reverse=False, with_file_list=False, max_revisions=None): + repo = get_repo_or_error(repoid) + if not HasRepoPermissionLevel('read')(repo.repo_name): + raise JSONRPCError('Access denied to repo %s' % repo.repo_name) + + format = "%Y-%m-%dT%H:%M:%S" + try: + return [e.__json__(with_file_list) for e in + repo.scm_instance.get_changesets(start, + end, + datetime.strptime(start_date, format) if start_date else None, + datetime.strptime(end_date, format) if end_date else None, + branch_name, + reverse, max_revisions)] + except EmptyRepositoryError as e: + raise JSONRPCError(e.message) + + # permission check inside + def get_changeset(self, repoid, raw_id, with_reviews=Optional(False)): + repo = get_repo_or_error(repoid) + if not HasRepoPermissionLevel('read')(repo.repo_name): + raise JSONRPCError('Access denied to repo %s' % repo.repo_name) + changeset = repo.get_changeset(raw_id) + if isinstance(changeset, EmptyChangeset): + raise JSONRPCError('Changeset %s does not exist' % raw_id) + + info = dict(changeset.as_dict()) + + with_reviews = Optional.extract(with_reviews) + if with_reviews: + reviews = ChangesetStatusModel().get_statuses( + repo.repo_name, raw_id) + info["reviews"] = reviews + + return info + + # permission check inside + def get_pullrequest(self, pullrequest_id): + """ + Get given pull request by id + """ + pull_request = PullRequest.get(pullrequest_id) + if pull_request is None: + raise JSONRPCError('pull request `%s` does not exist' % (pullrequest_id,)) + if not HasRepoPermissionLevel('read')(pull_request.org_repo.repo_name): + raise JSONRPCError('not allowed') + return pull_request.get_api_data() + + # permission check inside + def comment_pullrequest(self, pull_request_id, comment_msg=u'', status=None, close_pr=False): + """ + Add comment, close and change status of pull request. + """ + apiuser = get_user_or_error(request.authuser.user_id) + pull_request = PullRequest.get(pull_request_id) + if pull_request is None: + raise JSONRPCError('pull request `%s` does not exist' % (pull_request_id,)) + if (not HasRepoPermissionLevel('read')(pull_request.org_repo.repo_name)): + raise JSONRPCError('No permission to add comment. User needs at least reading permissions' + ' to the source repository.') + owner = apiuser.user_id == pull_request.owner_id + reviewer = apiuser.user_id in [reviewer.user_id for reviewer in pull_request.reviewers] + if close_pr and not (apiuser.admin or owner): + raise JSONRPCError('No permission to close pull request. User needs to be admin or owner.') + if status and not (apiuser.admin or owner or reviewer): + raise JSONRPCError('No permission to change pull request status. User needs to be admin, owner or reviewer.') + if pull_request.is_closed(): + raise JSONRPCError('pull request is already closed') + + comment = ChangesetCommentsModel().create( + text=comment_msg, + repo=pull_request.org_repo.repo_id, + author=apiuser.user_id, + pull_request=pull_request.pull_request_id, + f_path=None, + line_no=None, + status_change=(ChangesetStatus.get_status_lbl(status)), + closing_pr=close_pr + ) + action_logger(apiuser, + 'user_commented_pull_request:%s' % pull_request_id, + pull_request.org_repo, request.ip_addr) + if status: + ChangesetStatusModel().set_status( + pull_request.org_repo_id, + status, + apiuser.user_id, + comment, + pull_request=pull_request_id + ) + if close_pr: + PullRequestModel().close_pull_request(pull_request_id) + action_logger(apiuser, + 'user_closed_pull_request:%s' % pull_request_id, + pull_request.org_repo, request.ip_addr) + Session().commit() + return True diff --git a/kallithea/controllers/bookmarks.py b/kallithea/controllers/bookmarks.py deleted file mode 100644 --- a/kallithea/controllers/bookmarks.py +++ /dev/null @@ -1,60 +0,0 @@ -# -*- coding: utf-8 -*- -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -""" -kallithea.controllers.bookmarks -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Bookmarks controller for Kallithea - -This file was forked by the Kallithea project in July 2014. -Original author and date, and relevant copyright and licensing information is below: -:created_on: Dec 1, 2011 -:author: marcink -:copyright: (c) 2013 RhodeCode GmbH, and others. -:license: GPLv3, see LICENSE.md for more details. -""" - -import logging - -from pylons import tmpl_context as c - -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator -from kallithea.lib.base import BaseRepoController, render -from kallithea.lib.compat import OrderedDict -from webob.exc import HTTPNotFound - -log = logging.getLogger(__name__) - - -class BookmarksController(BaseRepoController): - - def __before__(self): - super(BookmarksController, self).__before__() - - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') - def index(self): - if c.db_repo_scm_instance.alias != 'hg': - raise HTTPNotFound() - - c.repo_bookmarks = OrderedDict() - - bookmarks = [(name, c.db_repo_scm_instance.get_changeset(hash_)) for \ - name, hash_ in c.db_repo_scm_instance._repo._bookmarks.items()] - ordered_tags = sorted(bookmarks, key=lambda x: x[1].date, reverse=True) - for name, cs_book in ordered_tags: - c.repo_bookmarks[name] = cs_book - - return render('bookmarks/bookmarks.html') diff --git a/kallithea/controllers/branches.py b/kallithea/controllers/branches.py deleted file mode 100644 --- a/kallithea/controllers/branches.py +++ /dev/null @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -""" -kallithea.controllers.branches -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -branches controller for Kallithea - -This file was forked by the Kallithea project in July 2014. -Original author and date, and relevant copyright and licensing information is below: -:created_on: Apr 21, 2010 -:author: marcink -:copyright: (c) 2013 RhodeCode GmbH, and others. -:license: GPLv3, see LICENSE.md for more details. -""" - -import logging -import binascii - -from pylons import tmpl_context as c - -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator -from kallithea.lib.base import BaseRepoController, render -from kallithea.lib.compat import OrderedDict -from kallithea.lib.utils2 import safe_unicode - -log = logging.getLogger(__name__) - - -class BranchesController(BaseRepoController): - - def __before__(self): - super(BranchesController, self).__before__() - - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') - def index(self): - - def _branchtags(localrepo): - bt_closed = {} - for bn, heads in localrepo.branchmap().iteritems(): - tip = heads[-1] - if 'close' in localrepo.changelog.read(tip)[5]: - bt_closed[bn] = tip - return bt_closed - - cs_g = c.db_repo_scm_instance.get_changeset - - c.repo_closed_branches = {} - if c.db_repo.repo_type == 'hg': - bt_closed = _branchtags(c.db_repo_scm_instance._repo) - _closed_branches = [(safe_unicode(n), cs_g(binascii.hexlify(h)),) - for n, h in bt_closed.items()] - - c.repo_closed_branches = OrderedDict(sorted(_closed_branches, - key=lambda ctx: ctx[0], - reverse=False)) - - _branches = [(safe_unicode(n), cs_g(h)) - for n, h in c.db_repo_scm_instance.branches.items()] - c.repo_branches = OrderedDict(sorted(_branches, - key=lambda ctx: ctx[0], - reverse=False)) - - return render('branches/branches.html') diff --git a/kallithea/controllers/changelog.py b/kallithea/controllers/changelog.py --- a/kallithea/controllers/changelog.py +++ b/kallithea/controllers/changelog.py @@ -28,18 +28,17 @@ Original author and date, and relevant c import logging import traceback -from pylons import request, url, session, tmpl_context as c -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ -from webob.exc import HTTPNotFound, HTTPBadRequest +from tg import request, session, tmpl_context as c +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound, HTTPNotFound, HTTPBadRequest import kallithea.lib.helpers as h -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator +from kallithea.config.routing import url +from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator from kallithea.lib.base import BaseRepoController, render -from kallithea.lib.helpers import RepoPage -from kallithea.lib.compat import json from kallithea.lib.graphmod import graph_data -from kallithea.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError,\ +from kallithea.lib.page import RepoPage +from kallithea.lib.vcs.exceptions import RepositoryError, ChangesetDoesNotExistError, \ ChangesetError, NodeDoesNotExistError, EmptyRepositoryError from kallithea.lib.utils2 import safe_int, safe_str @@ -47,28 +46,10 @@ from kallithea.lib.utils2 import safe_in log = logging.getLogger(__name__) -def _load_changelog_summary(): - p = safe_int(request.GET.get('page'), 1) - size = safe_int(request.GET.get('size'), 10) - - def url_generator(**kw): - return url('changelog_summary_home', - repo_name=c.db_repo.repo_name, size=size, **kw) - - collection = c.db_repo_scm_instance - - c.repo_changesets = RepoPage(collection, page=p, - items_per_page=size, - url=url_generator) - page_revisions = [x.raw_id for x in list(c.repo_changesets)] - c.comments = c.db_repo.get_comments(page_revisions) - c.statuses = c.db_repo.statuses(page_revisions) - - class ChangelogController(BaseRepoController): - def __before__(self): - super(ChangelogController, self).__before__() + def _before(self, *args, **kwargs): + super(ChangelogController, self)._before(*args, **kwargs) c.affected_files_cut_off = 60 @staticmethod @@ -89,18 +70,9 @@ class ChangelogController(BaseRepoContro h.flash(safe_str(e), category='error') raise HTTPBadRequest() - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def index(self, repo_name, revision=None, f_path=None): - # Fix URL after page size form submission via GET - # TODO: Somehow just don't send this extra junk in the GET URL - if request.GET.get('set'): - request.GET.pop('set', None) - if revision is None: - return redirect(url('changelog_home', repo_name=repo_name, **request.GET)) - return redirect(url('changelog_file_home', repo_name=repo_name, revision=revision, f_path=f_path, **request.GET)) - limit = 2000 default = 100 if request.GET.get('size'): @@ -111,13 +83,13 @@ class ChangelogController(BaseRepoContro c.size = int(session.get('changelog_size', default)) # min size must be 1 c.size = max(c.size, 1) - p = safe_int(request.GET.get('page', 1), 1) + p = safe_int(request.GET.get('page'), 1) branch_name = request.GET.get('branch', None) if (branch_name and branch_name not in c.db_repo_scm_instance.branches and branch_name not in c.db_repo_scm_instance.closed_branches and not revision): - return redirect(url('changelog_file_home', repo_name=c.repo_name, + raise HTTPFound(location=url('changelog_file_home', repo_name=c.repo_name, revision=branch_name, f_path=f_path or '')) if revision == 'tip': @@ -133,32 +105,32 @@ class ChangelogController(BaseRepoContro try: collection = tip_cs.get_file_history(f_path) except (NodeDoesNotExistError, ChangesetError): - #this node is not present at tip ! + # this node is not present at tip ! try: cs = self.__get_cs(revision, repo_name) collection = cs.get_file_history(f_path) except RepositoryError as e: h.flash(safe_str(e), category='warning') - redirect(h.url('changelog_home', repo_name=repo_name)) + raise HTTPFound(location=h.url('changelog_home', repo_name=repo_name)) collection = list(reversed(collection)) else: collection = c.db_repo_scm_instance.get_changesets(start=0, end=revision, branch_name=branch_name) c.total_cs = len(collection) - c.pagination = RepoPage(collection, page=p, item_count=c.total_cs, + c.cs_pagination = RepoPage(collection, page=p, item_count=c.total_cs, items_per_page=c.size, branch=branch_name,) - page_revisions = [x.raw_id for x in c.pagination] - c.comments = c.db_repo.get_comments(page_revisions) - c.statuses = c.db_repo.statuses(page_revisions) + page_revisions = [x.raw_id for x in c.cs_pagination] + c.cs_comments = c.db_repo.get_comments(page_revisions) + c.cs_statuses = c.db_repo.statuses(page_revisions) except EmptyRepositoryError as e: h.flash(safe_str(e), category='warning') - return redirect(url('summary_home', repo_name=c.repo_name)) + raise HTTPFound(location=url('summary_home', repo_name=c.repo_name)) except (RepositoryError, ChangesetDoesNotExistError, Exception) as e: log.error(traceback.format_exc()) h.flash(safe_str(e), category='error') - return redirect(url('changelog_home', repo_name=c.repo_name)) + raise HTTPFound(location=url('changelog_home', repo_name=c.repo_name)) c.branch_name = branch_name c.branch_filters = [('', _('None'))] + \ @@ -169,28 +141,17 @@ class ChangelogController(BaseRepoContro [(k, prefix + k) for k in c.db_repo_scm_instance.closed_branches.keys()] revs = [] if not f_path: - revs = [x.revision for x in c.pagination] - c.jsdata = json.dumps(graph_data(c.db_repo_scm_instance, revs)) + revs = [x.revision for x in c.cs_pagination] + c.jsdata = graph_data(c.db_repo_scm_instance, revs) c.revision = revision # requested revision ref - c.first_revision = c.pagination[0] # pagination is never empty here! + c.first_revision = c.cs_pagination[0] # pagination is never empty here! return render('changelog/changelog.html') - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def changelog_details(self, cs): if request.environ.get('HTTP_X_PARTIAL_XHR'): c.cs = c.db_repo_scm_instance.get_changeset(cs) return render('changelog/changelog_details.html') raise HTTPNotFound() - - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') - def changelog_summary(self, repo_name): - if request.environ.get('HTTP_X_PARTIAL_XHR'): - _load_changelog_summary() - - return render('changelog/changelog_summary_data.html') - raise HTTPNotFound() diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py --- a/kallithea/controllers/changeset.py +++ b/kallithea/controllers/changeset.py @@ -15,8 +15,7 @@ kallithea.controllers.changeset ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -changeset controller for pylons showing changes between -revisions +changeset controller showing changes between revisions This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below: @@ -29,21 +28,17 @@ Original author and date, and relevant c import logging import traceback from collections import defaultdict -from webob.exc import HTTPForbidden, HTTPBadRequest, HTTPNotFound -from pylons import tmpl_context as c, request, response -from pylons.i18n.translation import _ -from pylons.controllers.util import redirect -from kallithea.lib.utils import jsonify +from tg import tmpl_context as c, request, response +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound, HTTPForbidden, HTTPBadRequest, HTTPNotFound from kallithea.lib.vcs.exceptions import RepositoryError, \ - ChangesetDoesNotExistError + ChangesetDoesNotExistError, EmptyRepositoryError -from kallithea.lib.compat import json import kallithea.lib.helpers as h -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\ - NotAnonymous -from kallithea.lib.base import BaseRepoController, render +from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator +from kallithea.lib.base import BaseRepoController, render, jsonify from kallithea.lib.utils import action_logger from kallithea.lib.compat import OrderedDict from kallithea.lib import diffs @@ -51,9 +46,8 @@ from kallithea.model.db import Changeset from kallithea.model.comment import ChangesetCommentsModel from kallithea.model.changeset_status import ChangesetStatusModel from kallithea.model.meta import Session +from kallithea.model.pull_request import PullRequestModel from kallithea.model.repo import RepoModel -from kallithea.lib.diffs import LimitedDiffContainer -from kallithea.lib.exceptions import StatusChangeOnClosedPullRequestError from kallithea.lib.vcs.backends.base import EmptyChangeset from kallithea.lib.utils2 import safe_unicode from kallithea.lib.graphmod import graph_data @@ -110,7 +104,7 @@ def _ignorews_url(GET, fileid=None): params['anchor'] = fileid icon = h.literal('') - return h.link_to(icon, h.url.current(**params), title=lbl, class_='tooltip') + return h.link_to(icon, h.url.current(**params), title=lbl, **{'data-toggle': 'tooltip'}) def get_line_ctx(fid, GET): @@ -119,7 +113,7 @@ def get_line_ctx(fid, GET): ln_ctx = filter(lambda k: k.startswith('C'), GET.getall(fid)) else: _ln_ctx = filter(lambda k: k.startswith('C'), GET) - ln_ctx = GET.get(_ln_ctx[0]) if _ln_ctx else ln_ctx_global + ln_ctx = GET.get(_ln_ctx[0]) if _ln_ctx else ln_ctx_global if ln_ctx: ln_ctx = [ln_ctx] @@ -170,26 +164,141 @@ def _context_url(GET, fileid=None): params['anchor'] = fileid icon = h.literal('') - return h.link_to(icon, h.url.current(**params), title=lbl, class_='tooltip') + return h.link_to(icon, h.url.current(**params), title=lbl, **{'data-toggle': 'tooltip'}) + + +def create_cs_pr_comment(repo_name, revision=None, pull_request=None, allowed_to_change_status=True): + """ + Add a comment to the specified changeset or pull request, using POST values + from the request. + + Comments can be inline (when a file path and line number is specified in + POST) or general comments. + A comment can be accompanied by a review status change (accepted, rejected, + etc.). Pull requests can be closed or deleted. + + Parameter 'allowed_to_change_status' is used for both status changes and + closing of pull requests. For deleting of pull requests, more specific + checks are done. + """ + + assert request.environ.get('HTTP_X_PARTIAL_XHR') + if pull_request: + pull_request_id = pull_request.pull_request_id + else: + pull_request_id = None + + status = request.POST.get('changeset_status') + close_pr = request.POST.get('save_close') + delete = request.POST.get('save_delete') + f_path = request.POST.get('f_path') + line_no = request.POST.get('line') + + if (status or close_pr or delete) and (f_path or line_no): + # status votes and closing is only possible in general comments + raise HTTPBadRequest() + + if not allowed_to_change_status: + if status or close_pr: + h.flash(_('No permission to change status'), 'error') + raise HTTPForbidden() + + if pull_request and delete == "delete": + if (pull_request.owner_id == request.authuser.user_id or + h.HasPermissionAny('hg.admin')() or + h.HasRepoPermissionLevel('admin')(pull_request.org_repo.repo_name) or + h.HasRepoPermissionLevel('admin')(pull_request.other_repo.repo_name) + ) and not pull_request.is_closed(): + PullRequestModel().delete(pull_request) + Session().commit() + h.flash(_('Successfully deleted pull request %s') % pull_request_id, + category='success') + return { + 'location': h.url('my_pullrequests'), # or repo pr list? + } + raise HTTPFound(location=h.url('my_pullrequests')) # or repo pr list? + raise HTTPForbidden() + + text = request.POST.get('text', '').strip() + comment = ChangesetCommentsModel().create( + text=text, + repo=c.db_repo.repo_id, + author=request.authuser.user_id, + revision=revision, + pull_request=pull_request_id, + f_path=f_path or None, + line_no=line_no or None, + status_change=ChangesetStatus.get_status_lbl(status) if status else None, + closing_pr=close_pr, + ) + + if status: + ChangesetStatusModel().set_status( + c.db_repo.repo_id, + status, + request.authuser.user_id, + comment, + revision=revision, + pull_request=pull_request_id, + ) + + if pull_request: + action = 'user_commented_pull_request:%s' % pull_request_id + else: + action = 'user_commented_revision:%s' % revision + action_logger(request.authuser, action, c.db_repo, request.ip_addr) + + if pull_request and close_pr: + PullRequestModel().close_pull_request(pull_request_id) + action_logger(request.authuser, + 'user_closed_pull_request:%s' % pull_request_id, + c.db_repo, request.ip_addr) + + Session().commit() + + data = { + 'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))), + } + if comment is not None: + c.comment = comment + data.update(comment.get_dict()) + data.update({'rendered_text': + render('changeset/changeset_comment_block.html')}) + + return data + +def delete_cs_pr_comment(repo_name, comment_id): + """Delete a comment from a changeset or pull request""" + co = ChangesetComment.get_or_404(comment_id) + if co.repo.repo_name != repo_name: + raise HTTPNotFound() + if co.pull_request and co.pull_request.is_closed(): + # don't allow deleting comments on closed pull request + raise HTTPForbidden() + + owner = co.author_id == request.authuser.user_id + repo_admin = h.HasRepoPermissionLevel('admin')(repo_name) + if h.HasPermissionAny('hg.admin')() or repo_admin or owner: + ChangesetCommentsModel().delete(comment=co) + Session().commit() + return True + else: + raise HTTPForbidden() class ChangesetController(BaseRepoController): - def __before__(self): - super(ChangesetController, self).__before__() + def _before(self, *args, **kwargs): + super(ChangesetController, self)._before(*args, **kwargs) c.affected_files_cut_off = 60 - def __load_data(self): - repo_model = RepoModel() - c.users_array = repo_model.get_users_js() - c.user_groups_array = repo_model.get_user_groups_js() - def _index(self, revision, method): + c.pull_request = None c.anchor_url = anchor_url c.ignorews_url = _ignorews_url c.context_url = _context_url - c.fulldiff = fulldiff = request.GET.get('fulldiff') - #get ranges of revisions if preset + c.fulldiff = request.GET.get('fulldiff') # for reporting number of changed files + # get ranges of revisions if preset rev_range = revision.split('...')[:2] enable_comments = True c.cs_repo = c.db_repo @@ -207,7 +316,7 @@ class ChangesetController(BaseRepoContro if not c.cs_ranges: raise RepositoryError('Changeset range returned empty result') - except(ChangesetDoesNotExistError,), e: + except (ChangesetDoesNotExistError, EmptyRepositoryError): log.debug(traceback.format_exc()) msg = _('Such revision does not exist for this repository') h.flash(msg, category='error') @@ -226,7 +335,6 @@ class ChangesetController(BaseRepoContro # Iterate over ranges (default changeset view is always one changeset) for changeset in c.cs_ranges: - inlines = [] if method == 'show': c.statuses.extend([ChangesetStatusModel().get_status( c.db_repo.repo_id, changeset.raw_id)]) @@ -238,53 +346,46 @@ class ChangesetController(BaseRepoContro revision=changeset.raw_id)) # Status change comments - mostly from pull requests - comments.update((st.changeset_comment_id, st.comment) + comments.update((st.comment_id, st.comment) for st in ChangesetStatusModel() .get_statuses(c.db_repo.repo_id, changeset.raw_id, with_revisions=True) - if st.changeset_comment_id is not None) + if st.comment_id is not None) - inlines = ChangesetCommentsModel()\ + inlines = ChangesetCommentsModel() \ .get_inline_comments(c.db_repo.repo_id, revision=changeset.raw_id) c.inline_comments.extend(inlines) - c.changes[changeset.raw_id] = [] - cs2 = changeset.raw_id cs1 = changeset.parents[0].raw_id if changeset.parents else EmptyChangeset().raw_id context_lcl = get_line_ctx('', request.GET) - ign_whitespace_lcl = ign_whitespace_lcl = get_ignore_ws('', request.GET) + ign_whitespace_lcl = get_ignore_ws('', request.GET) - _diff = c.db_repo_scm_instance.get_diff(cs1, cs2, + raw_diff = diffs.get_diff(c.db_repo_scm_instance, cs1, cs2, ignore_whitespace=ign_whitespace_lcl, context=context_lcl) - diff_limit = self.cut_off_limit if not fulldiff else None - diff_processor = diffs.DiffProcessor(_diff, - vcs=c.db_repo_scm_instance.alias, - format='gitdiff', - diff_limit=diff_limit) - cs_changes = OrderedDict() + diff_limit = None if c.fulldiff else self.cut_off_limit + file_diff_data = [] if method == 'show': - _parsed = diff_processor.prepare() - c.limited_diff = False - if isinstance(_parsed, LimitedDiffContainer): - c.limited_diff = True - for f in _parsed: + diff_processor = diffs.DiffProcessor(raw_diff, + vcs=c.db_repo_scm_instance.alias, + diff_limit=diff_limit) + c.limited_diff = diff_processor.limited_diff + for f in diff_processor.parsed: st = f['stats'] c.lines_added += st['added'] c.lines_deleted += st['deleted'] - fid = h.FID(changeset.raw_id, f['filename']) - diff = diff_processor.as_html(enable_comments=enable_comments, - parsed_lines=[f]) - cs_changes[fid] = [cs1, cs2, f['operation'], f['filename'], - diff, st] + filename = f['filename'] + fid = h.FID(changeset.raw_id, filename) + url_fid = h.FID('', filename) + html_diff = diffs.as_html(enable_comments=enable_comments, parsed_lines=[f]) + file_diff_data.append((fid, url_fid, f['operation'], f['old_filename'], filename, html_diff, st)) else: # downloads/raw we only need RAW diff nothing else - diff = diff_processor.as_raw() - cs_changes[''] = [None, None, None, None, diff, None] - c.changes[changeset.raw_id] = cs_changes + file_diff_data.append(('', None, None, None, raw_diff, None)) + c.changes[changeset.raw_id] = (cs1, cs2, file_diff_data) - #sort comments in creation order + # sort comments in creation order c.comments = [com for com_id, com in sorted(comments.items())] # count inline comments @@ -300,144 +401,58 @@ class ChangesetController(BaseRepoContro response.content_type = 'text/plain' response.content_disposition = 'attachment; filename=%s.diff' \ % revision[:12] - return diff + return raw_diff elif method == 'patch': response.content_type = 'text/plain' - c.diff = safe_unicode(diff) + c.diff = safe_unicode(raw_diff) return render('changeset/patch_changeset.html') elif method == 'raw': response.content_type = 'text/plain' - return diff + return raw_diff elif method == 'show': - self.__load_data() if len(c.cs_ranges) == 1: return render('changeset/changeset.html') else: c.cs_ranges_org = None c.cs_comments = {} revs = [ctx.revision for ctx in reversed(c.cs_ranges)] - c.jsdata = json.dumps(graph_data(c.db_repo_scm_instance, revs)) + c.jsdata = graph_data(c.db_repo_scm_instance, revs) return render('changeset/changeset_range.html') - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def index(self, revision, method='show'): return self._index(revision, method=method) - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def changeset_raw(self, revision): return self._index(revision, method='raw') - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def changeset_patch(self, revision): return self._index(revision, method='patch') - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def changeset_download(self, revision): return self._index(revision, method='download') @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') @jsonify def comment(self, repo_name, revision): - status = request.POST.get('changeset_status') - text = request.POST.get('text', '').strip() - - c.comment = comment = ChangesetCommentsModel().create( - text=text, - repo=c.db_repo.repo_id, - user=c.authuser.user_id, - revision=revision, - f_path=request.POST.get('f_path'), - line_no=request.POST.get('line'), - status_change=(ChangesetStatus.get_status_lbl(status) - if status else None) - ) - - # get status if set ! - if status: - # if latest status was from pull request and it's closed - # disallow changing status ! - # dont_allow_on_closed_pull_request = True ! - - try: - ChangesetStatusModel().set_status( - c.db_repo.repo_id, - status, - c.authuser.user_id, - comment, - revision=revision, - dont_allow_on_closed_pull_request=True - ) - except StatusChangeOnClosedPullRequestError: - log.debug(traceback.format_exc()) - msg = _('Changing status on a changeset associated with ' - 'a closed pull request is not allowed') - h.flash(msg, category='warning') - return redirect(h.url('changeset_home', repo_name=repo_name, - revision=revision)) - action_logger(self.authuser, - 'user_commented_revision:%s' % revision, - c.db_repo, self.ip_addr, self.sa) - - Session().commit() - - if not request.environ.get('HTTP_X_PARTIAL_XHR'): - return redirect(h.url('changeset_home', repo_name=repo_name, - revision=revision)) - #only ajax below - data = { - 'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))), - } - if comment is not None: - data.update(comment.get_dict()) - data.update({'rendered_text': - render('changeset/changeset_comment_block.html')}) - - return data + return create_cs_pr_comment(repo_name, revision=revision) @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') - def preview_comment(self): - if not request.environ.get('HTTP_X_PARTIAL_XHR'): - raise HTTPBadRequest() - text = request.POST.get('text') - if text: - return h.rst_w_mentions(text) - return '' - - @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') @jsonify def delete_comment(self, repo_name, comment_id): - co = ChangesetComment.get_or_404(comment_id) - if co.repo.repo_name != repo_name: - raise HTTPNotFound() - owner = co.author.user_id == c.authuser.user_id - repo_admin = h.HasRepoPermissionAny('repository.admin')(repo_name) - if h.HasPermissionAny('hg.admin')() or repo_admin or owner: - ChangesetCommentsModel().delete(comment=co) - Session().commit() - return True - else: - raise HTTPForbidden() + return delete_cs_pr_comment(repo_name, comment_id) - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') @jsonify def changeset_info(self, repo_name, revision): if request.is_xhr: @@ -448,9 +463,8 @@ class ChangesetController(BaseRepoContro else: raise HTTPBadRequest() - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') @jsonify def changeset_children(self, repo_name, revision): if request.is_xhr: @@ -462,9 +476,8 @@ class ChangesetController(BaseRepoContro else: raise HTTPBadRequest() - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') @jsonify def changeset_parents(self, repo_name, revision): if request.is_xhr: diff --git a/kallithea/controllers/compare.py b/kallithea/controllers/compare.py --- a/kallithea/controllers/compare.py +++ b/kallithea/controllers/compare.py @@ -15,7 +15,7 @@ kallithea.controllers.compare ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -compare controller for pylons showing differences between two +compare controller showing differences between two repos, branches, bookmarks or tips This file was forked by the Kallithea project in July 2014. @@ -30,29 +30,48 @@ Original author and date, and relevant c import logging import re -from webob.exc import HTTPBadRequest -from pylons import request, tmpl_context as c, url -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound, HTTPBadRequest, HTTPNotFound +from kallithea.config.routing import url +from kallithea.lib.utils2 import safe_str, safe_int from kallithea.lib.vcs.utils.hgcompat import unionrepo from kallithea.lib import helpers as h from kallithea.lib.base import BaseRepoController, render -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator +from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator from kallithea.lib import diffs from kallithea.model.db import Repository -from kallithea.lib.diffs import LimitedDiffContainer from kallithea.controllers.changeset import _ignorews_url, _context_url from kallithea.lib.graphmod import graph_data -from kallithea.lib.compat import json log = logging.getLogger(__name__) class CompareController(BaseRepoController): - def __before__(self): - super(CompareController, self).__before__() + def _before(self, *args, **kwargs): + super(CompareController, self)._before(*args, **kwargs) + + # The base repository has already been retrieved. + c.a_repo = c.db_repo + + # Retrieve the "changeset" repository (default: same as base). + other_repo = request.GET.get('other_repo', None) + if other_repo is None: + c.cs_repo = c.a_repo + else: + c.cs_repo = Repository.get_by_repo_name(other_repo) + if c.cs_repo is None: + msg = _('Could not find other repository %s') % other_repo + h.flash(msg, category='error') + raise HTTPFound(location=url('compare_home', repo_name=c.a_repo.repo_name)) + + # Verify that it's even possible to compare these two repositories. + if c.a_repo.scm_instance.alias != c.cs_repo.scm_instance.alias: + msg = _('Cannot compare repositories of different types') + h.flash(msg, category='error') + raise HTTPFound(location=url('compare_home', repo_name=c.a_repo.repo_name)) @staticmethod def _get_changesets(alias, org_repo, org_rev, other_repo, other_rev): @@ -60,7 +79,7 @@ class CompareController(BaseRepoControll Returns lists of changesets that can be merged from org_repo@org_rev to other_repo@other_rev ... and the other way - ... and the ancestor that would be used for merge + ... and the ancestors that would be used for merge :param org_repo: repo object, that is most likely the original repo we forked from :param org_rev: the revision we want our compare to be made @@ -68,44 +87,43 @@ class CompareController(BaseRepoControll all changesets that we need to obtain :param other_rev: revision we want out compare to be made on other_repo """ - ancestor = None + ancestors = None if org_rev == other_rev: org_changesets = [] other_changesets = [] - ancestor = org_rev elif alias == 'hg': - #case two independent repos + # case two independent repos if org_repo != other_repo: - hgrepo = unionrepo.unionrepository(other_repo.baseui, - other_repo.path, - org_repo.path) + try: + hgrepo = unionrepo.makeunionrepository(other_repo.baseui, + other_repo.path, + org_repo.path) + except AttributeError: # makeunionrepository was introduced in Mercurial 4.8 23f2299e9e53 + hgrepo = unionrepo.unionrepository(other_repo.baseui, + other_repo.path, + org_repo.path) # all ancestors of other_rev will be in other_repo and # rev numbers from hgrepo can be used in other_repo - org_rev ancestors cannot - #no remote compare do it on the same repository + # no remote compare do it on the same repository else: hgrepo = other_repo._repo - if org_repo.EMPTY_CHANGESET in (org_rev, other_rev): - # work around unexpected behaviour in Mercurial < 3.4 - ancestor = org_repo.EMPTY_CHANGESET + ancestors = [hgrepo[ancestor].hex() for ancestor in + hgrepo.revs("id(%s) & ::id(%s)", other_rev, org_rev)] + if ancestors: + log.debug("shortcut found: %s is already an ancestor of %s", other_rev, org_rev) else: - ancestors = hgrepo.revs("ancestor(id(%s), id(%s))", org_rev, other_rev) - if ancestors: - # FIXME: picks arbitrary ancestor - but there is usually only one - try: - ancestor = hgrepo[ancestors.first()].hex() - except AttributeError: - # removed in hg 3.2 - ancestor = hgrepo[ancestors[0]].hex() + log.debug("no shortcut found: %s is not an ancestor of %s", other_rev, org_rev) + ancestors = [hgrepo[ancestor].hex() for ancestor in + hgrepo.revs("heads(::id(%s) & ::id(%s))", org_rev, other_rev)] # FIXME: expensive! other_revs = hgrepo.revs("ancestors(id(%s)) and not ancestors(id(%s)) and not id(%s)", other_rev, org_rev, org_rev) other_changesets = [other_repo.get_changeset(rev) for rev in other_revs] org_revs = hgrepo.revs("ancestors(id(%s)) and not ancestors(id(%s)) and not id(%s)", org_rev, other_rev, other_rev) - org_changesets = [org_repo.get_changeset(hgrepo[rev].hex()) for rev in org_revs] elif alias == 'git': @@ -114,22 +132,25 @@ class CompareController(BaseRepoControll from dulwich.client import SubprocessGitClient gitrepo = Repo(org_repo.path) - SubprocessGitClient(thin_packs=False).fetch(other_repo.path, gitrepo) + SubprocessGitClient(thin_packs=False).fetch(safe_str(other_repo.path), gitrepo) gitrepo_remote = Repo(other_repo.path) - SubprocessGitClient(thin_packs=False).fetch(org_repo.path, gitrepo_remote) + SubprocessGitClient(thin_packs=False).fetch(safe_str(org_repo.path), gitrepo_remote) - revs = [] - for x in gitrepo_remote.get_walker(include=[other_rev], - exclude=[org_rev]): - revs.append(x.commit.id) - + revs = [ + x.commit.id + for x in gitrepo_remote.get_walker(include=[other_rev], + exclude=[org_rev]) + ] other_changesets = [other_repo.get_changeset(rev) for rev in reversed(revs)] if other_changesets: - ancestor = other_changesets[0].parents[0].raw_id + ancestors = [other_changesets[0].parents[0].raw_id] else: # no changesets from other repo, ancestor is the other_rev - ancestor = other_rev + ancestors = [other_rev] + + gitrepo.close() + gitrepo_remote.close() else: so, se = org_repo.run_git_command( @@ -141,35 +162,27 @@ class CompareController(BaseRepoControll so, se = org_repo.run_git_command( ['merge-base', org_rev, other_rev] ) - ancestor = re.findall(r'[0-9a-fA-F]{40}', so)[0] + ancestors = [re.findall(r'[0-9a-fA-F]{40}', so)[0]] org_changesets = [] else: raise Exception('Bad alias only git and hg is allowed') - return other_changesets, org_changesets, ancestor + return other_changesets, org_changesets, ancestors - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def index(self, repo_name): c.compare_home = True - org_repo = c.db_repo.repo_name - other_repo = request.GET.get('other_repo', org_repo) - c.a_repo = Repository.get_by_repo_name(org_repo) - c.cs_repo = Repository.get_by_repo_name(other_repo) - c.a_ref_name = c.cs_ref_name = _('Select changeset') + c.a_ref_name = c.cs_ref_name = None return render('compare/compare_diff.html') - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def compare(self, repo_name, org_ref_type, org_ref_name, other_ref_type, other_ref_name): org_ref_name = org_ref_name.strip() other_ref_name = other_ref_name.strip() - org_repo = c.db_repo.repo_name - other_repo = request.GET.get('other_repo', org_repo) # If merge is True: # Show what org would get if merged with other: # List changesets that are ancestors of other but not of org. @@ -180,16 +193,16 @@ class CompareController(BaseRepoControll # Changesets in one and not in the other will be ignored merge = bool(request.GET.get('merge')) # fulldiff disables cut_off_limit - c.fulldiff = request.GET.get('fulldiff') + fulldiff = request.GET.get('fulldiff') # partial uses compare_cs.html template directly partial = request.environ.get('HTTP_X_PARTIAL_XHR') - # as_form puts hidden input field with changeset revisions - c.as_form = partial and request.GET.get('as_form') - # swap url for compare_diff page - never partial and never as_form + # is_ajax_preview puts hidden input field with changeset revisions + c.is_ajax_preview = partial and request.GET.get('is_ajax_preview') + # swap url for compare_diff page - never partial and never is_ajax_preview c.swap_url = h.url('compare_url', - repo_name=other_repo, + repo_name=c.cs_repo.repo_name, org_ref_type=other_ref_type, org_ref_name=other_ref_name, - other_repo=org_repo, + other_repo=c.a_repo.repo_name, other_ref_type=org_ref_type, other_ref_name=org_ref_name, merge=merge or '') @@ -197,64 +210,56 @@ class CompareController(BaseRepoControll c.ignorews_url = _ignorews_url c.context_url = _context_url ignore_whitespace = request.GET.get('ignorews') == '1' - line_context = request.GET.get('context', 3) - - org_repo = Repository.get_by_repo_name(org_repo) - other_repo = Repository.get_by_repo_name(other_repo) - - if org_repo is None: - msg = 'Could not find org repo %s' % org_repo - log.error(msg) - h.flash(msg, category='error') - return redirect(url('compare_home', repo_name=c.repo_name)) + line_context = safe_int(request.GET.get('context'), 3) - if other_repo is None: - msg = 'Could not find other repo %s' % other_repo - log.error(msg) - h.flash(msg, category='error') - return redirect(url('compare_home', repo_name=c.repo_name)) - - if org_repo.scm_instance.alias != other_repo.scm_instance.alias: - msg = 'compare of two different kind of remote repos not available' - log.error(msg) - h.flash(msg, category='error') - return redirect(url('compare_home', repo_name=c.repo_name)) - - c.a_rev = self._get_ref_rev(org_repo, org_ref_type, org_ref_name, + c.a_rev = self._get_ref_rev(c.a_repo, org_ref_type, org_ref_name, returnempty=True) - c.cs_rev = self._get_ref_rev(other_repo, other_ref_type, other_ref_name) + c.cs_rev = self._get_ref_rev(c.cs_repo, other_ref_type, other_ref_name) c.compare_home = False - c.a_repo = org_repo c.a_ref_name = org_ref_name c.a_ref_type = org_ref_type - c.cs_repo = other_repo c.cs_ref_name = other_ref_name c.cs_ref_type = other_ref_type - c.cs_ranges, c.cs_ranges_org, c.ancestor = self._get_changesets( - org_repo.scm_instance.alias, org_repo.scm_instance, c.a_rev, - other_repo.scm_instance, c.cs_rev) + c.cs_ranges, c.cs_ranges_org, c.ancestors = self._get_changesets( + c.a_repo.scm_instance.alias, c.a_repo.scm_instance, c.a_rev, + c.cs_repo.scm_instance, c.cs_rev) raw_ids = [x.raw_id for x in c.cs_ranges] - c.cs_comments = other_repo.get_comments(raw_ids) - c.statuses = other_repo.statuses(raw_ids) + c.cs_comments = c.cs_repo.get_comments(raw_ids) + c.cs_statuses = c.cs_repo.statuses(raw_ids) revs = [ctx.revision for ctx in reversed(c.cs_ranges)] - c.jsdata = json.dumps(graph_data(c.cs_repo.scm_instance, revs)) + c.jsdata = graph_data(c.cs_repo.scm_instance, revs) if partial: return render('compare/compare_cs.html') - if merge and c.ancestor: + + org_repo = c.a_repo + other_repo = c.cs_repo + + if merge: + rev1 = msg = None + if not c.cs_ranges: + msg = _('Cannot show empty diff') + elif not c.ancestors: + msg = _('No ancestor found for merge diff') + elif len(c.ancestors) == 1: + rev1 = c.ancestors[0] + else: + msg = _('Multiple merge ancestors found for merge compare') + if rev1 is None: + h.flash(msg, category='error') + log.error(msg) + raise HTTPNotFound + # case we want a simple diff without incoming changesets, # previewing what will be merged. # Make the diff on the other repo (which is known to have other_rev) log.debug('Using ancestor %s as rev1 instead of %s', - c.ancestor, c.a_rev) - rev1 = c.ancestor + rev1, c.a_rev) org_repo = other_repo else: # comparing tips, not necessarily linearly related - if merge: - log.error('Unable to find ancestor revision') if org_repo != other_repo: # TODO: we could do this by using hg unionrepo log.error('cannot compare across repos %s and %s', org_repo, other_repo) @@ -262,34 +267,26 @@ class CompareController(BaseRepoControll raise HTTPBadRequest rev1 = c.a_rev - diff_limit = self.cut_off_limit if not c.fulldiff else None + diff_limit = None if fulldiff else self.cut_off_limit log.debug('running diff between %s and %s in %s', rev1, c.cs_rev, org_repo.scm_instance.path) - txtdiff = org_repo.scm_instance.get_diff(rev1=rev1, rev2=c.cs_rev, + raw_diff = diffs.get_diff(org_repo.scm_instance, rev1=rev1, rev2=c.cs_rev, ignore_whitespace=ignore_whitespace, context=line_context) - diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff', - diff_limit=diff_limit) - _parsed = diff_processor.prepare() - - c.limited_diff = False - if isinstance(_parsed, LimitedDiffContainer): - c.limited_diff = True - - c.files = [] - c.changes = {} + diff_processor = diffs.DiffProcessor(raw_diff or '', diff_limit=diff_limit) + c.limited_diff = diff_processor.limited_diff + c.file_diff_data = [] c.lines_added = 0 c.lines_deleted = 0 - for f in _parsed: + for f in diff_processor.parsed: st = f['stats'] - if not st['binary']: - c.lines_added += st['added'] - c.lines_deleted += st['deleted'] - fid = h.FID('', f['filename']) - c.files.append([fid, f['operation'], f['filename'], f['stats']]) - htmldiff = diff_processor.as_html(enable_comments=False, parsed_lines=[f]) - c.changes[fid] = [f['operation'], f['filename'], htmldiff] + c.lines_added += st['added'] + c.lines_deleted += st['deleted'] + filename = f['filename'] + fid = h.FID('', filename) + html_diff = diffs.as_html(enable_comments=False, parsed_lines=[f]) + c.file_diff_data.append((fid, None, f['operation'], f['old_filename'], filename, html_diff, st)) return render('compare/compare_diff.html') diff --git a/kallithea/controllers/error.py b/kallithea/controllers/error.py --- a/kallithea/controllers/error.py +++ b/kallithea/controllers/error.py @@ -28,11 +28,9 @@ Original author and date, and relevant c import os import cgi import logging -import paste.fileapp -from pylons import tmpl_context as c, request, config -from pylons.i18n.translation import _ -from pylons.middleware import media_path +from tg import tmpl_context as c, request, config, expose +from tg.i18n import ugettext as _ from kallithea.lib.base import BaseController, render @@ -49,12 +47,13 @@ class ErrorController(BaseController): ErrorDocuments middleware in your config/middleware.py file. """ - def __before__(self): + def _before(self, *args, **kwargs): # disable all base actions since we don't need them here pass - def document(self): - resp = request.environ.get('pylons.original_response') + @expose('/errors/error_document.html') + def document(self, *args, **kwargs): + resp = request.environ.get('tg.original_response') c.site_name = config.get('title') log.debug('### %s ###', resp and resp.status or 'no response') @@ -71,22 +70,7 @@ class ErrorController(BaseController): c.error_message = _('No response') c.error_explanation = _('Unknown error') - return render('/errors/error_document.html') - - def img(self, id): - """Serve Pylons' stock images""" - return self._serve_file(os.path.join(media_path, 'img', id)) - - def style(self, id): - """Serve Pylons' stock stylesheets""" - return self._serve_file(os.path.join(media_path, 'style', id)) - - def _serve_file(self, path): - """Call Paste's FileApp (a WSGI application) to serve the file - at the specified path - """ - fapp = paste.fileapp.FileApp(path) - return fapp(request.environ, self.start_response) + return dict() def get_error_explanation(self, code): """ get the error explanations of int codes diff --git a/kallithea/controllers/feed.py b/kallithea/controllers/feed.py --- a/kallithea/controllers/feed.py +++ b/kallithea/controllers/feed.py @@ -28,77 +28,65 @@ Original author and date, and relevant c import logging -from pylons import response, tmpl_context as c -from pylons.i18n.translation import _ +from tg import response, tmpl_context as c +from tg.i18n import ugettext as _ from beaker.cache import cache_region, region_invalidate from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed +from kallithea import CONFIG from kallithea.lib import helpers as h -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator +from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator from kallithea.lib.base import BaseRepoController -from kallithea.lib.diffs import DiffProcessor, LimitedDiffContainer +from kallithea.lib.diffs import DiffProcessor from kallithea.model.db import CacheInvalidation from kallithea.lib.utils2 import safe_int, str2bool, safe_unicode log = logging.getLogger(__name__) +language = 'en-us' +ttl = "5" + + class FeedController(BaseRepoController): - @LoginRequired(api_access=True) - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') - def __before__(self): - super(FeedController, self).__before__() - #common values for feeds - self.description = _('Changes on %s repository') - self.title = self.title = _('%s %s feed') % (c.site_name, '%s') - self.language = 'en-us' - self.ttl = "5" - import kallithea - CONF = kallithea.CONFIG - self.include_diff = str2bool(CONF.get('rss_include_diff', False)) - self.feed_nr = safe_int(CONF.get('rss_items_per_page', 20)) - # we need to protect from parsing huge diffs here other way - # we can kill the server - self.feed_diff_limit = safe_int(CONF.get('rss_cut_off_limit', 32 * 1024)) + @LoginRequired(api_access=True, allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') + def _before(self, *args, **kwargs): + super(FeedController, self)._before(*args, **kwargs) def _get_title(self, cs): return h.shorter(cs.message, 160) - def __changes(self, cs): + def __get_desc(self, cs): + desc_msg = [(_('%s committed on %s') + % (h.person(cs.author), h.fmt_date(cs.date))) + '
'] + # branches, tags, bookmarks + for branch in cs.branches: + desc_msg.append('branch: %s
' % branch) + for book in cs.bookmarks: + desc_msg.append('bookmark: %s
' % book) + for tag in cs.tags: + desc_msg.append('tag: %s
' % tag) + changes = [] - diff_processor = DiffProcessor(cs.diff(), - diff_limit=self.feed_diff_limit) - _parsed = diff_processor.prepare(inline_diff=False) - limited_diff = False - if isinstance(_parsed, LimitedDiffContainer): - limited_diff = True + diff_limit = safe_int(CONFIG.get('rss_cut_off_limit', 32 * 1024)) + raw_diff = cs.diff() + diff_processor = DiffProcessor(raw_diff, + diff_limit=diff_limit, + inline_diff=False) - for st in _parsed: + for st in diff_processor.parsed: st.update({'added': st['stats']['added'], 'removed': st['stats']['deleted']}) changes.append('\n %(operation)s %(filename)s ' '(%(added)s lines added, %(removed)s lines removed)' % st) - if limited_diff: + if diff_processor.limited_diff: changes = changes + ['\n ' + _('Changeset was too big and was cut off...')] - return diff_processor, changes - def __get_desc(self, cs): - desc_msg = [(_('%s committed on %s') - % (h.person(cs.author), h.fmt_date(cs.date))) + '
'] - #branches, tags, bookmarks - if cs.branch: - desc_msg.append('branch: %s
' % cs.branch) - if h.is_hg(c.db_repo_scm_instance): - for book in cs.bookmarks: - desc_msg.append('bookmark: %s
' % book) - for tag in cs.tags: - desc_msg.append('tag: %s
' % tag) - diff_processor, changes = self.__changes(cs) # rev link _url = h.canonical_url('changeset_home', repo_name=c.db_repo.repo_name, revision=cs.raw_id) @@ -108,26 +96,27 @@ class FeedController(BaseRepoController) desc_msg.append(h.urlify_text(cs.message)) desc_msg.append('\n') desc_msg.extend(changes) - if self.include_diff: + if str2bool(CONFIG.get('rss_include_diff', False)): desc_msg.append('\n\n') - desc_msg.append(diff_processor.as_raw()) + desc_msg.append(raw_diff) desc_msg.append('') return map(safe_unicode, desc_msg) def atom(self, repo_name): """Produce an atom-1.0 feed via feedgenerator module""" - @cache_region('long_term') + @cache_region('long_term', '_get_feed_from_cache') def _get_feed_from_cache(key, kind): feed = Atom1Feed( - title=self.title % repo_name, - link=h.canonical_url('summary_home', repo_name=repo_name), - description=self.description % repo_name, - language=self.language, - ttl=self.ttl + title=_('%s %s feed') % (c.site_name, repo_name), + link=h.canonical_url('summary_home', repo_name=repo_name), + description=_('Changes on %s repository') % repo_name, + language=language, + ttl=ttl ) - for cs in reversed(list(c.db_repo_scm_instance[-self.feed_nr:])): + rss_items_per_page = safe_int(CONFIG.get('rss_items_per_page', 20)) + for cs in reversed(list(c.db_repo_scm_instance[-rss_items_per_page:])): feed.add_item(title=self._get_title(cs), link=h.canonical_url('changeset_home', repo_name=repo_name, revision=cs.raw_id), @@ -142,23 +131,24 @@ class FeedController(BaseRepoController) kind = 'ATOM' valid = CacheInvalidation.test_and_set_valid(repo_name, kind) if not valid: - region_invalidate(_get_feed_from_cache, None, repo_name, kind) + region_invalidate(_get_feed_from_cache, None, '_get_feed_from_cache', repo_name, kind) return _get_feed_from_cache(repo_name, kind) def rss(self, repo_name): """Produce an rss2 feed via feedgenerator module""" - @cache_region('long_term') + @cache_region('long_term', '_get_feed_from_cache') def _get_feed_from_cache(key, kind): feed = Rss201rev2Feed( - title=self.title % repo_name, + title=_('%s %s feed') % (c.site_name, repo_name), link=h.canonical_url('summary_home', repo_name=repo_name), - description=self.description % repo_name, - language=self.language, - ttl=self.ttl + description=_('Changes on %s repository') % repo_name, + language=language, + ttl=ttl ) - for cs in reversed(list(c.db_repo_scm_instance[-self.feed_nr:])): + rss_items_per_page = safe_int(CONFIG.get('rss_items_per_page', 20)) + for cs in reversed(list(c.db_repo_scm_instance[-rss_items_per_page:])): feed.add_item(title=self._get_title(cs), link=h.canonical_url('changeset_home', repo_name=repo_name, revision=cs.raw_id), @@ -173,5 +163,5 @@ class FeedController(BaseRepoController) kind = 'RSS' valid = CacheInvalidation.test_and_set_valid(repo_name, kind) if not valid: - region_invalidate(_get_feed_from_cache, None, repo_name, kind) + region_invalidate(_get_feed_from_cache, None, '_get_feed_from_cache', repo_name, kind) return _get_feed_from_cache(repo_name, kind) diff --git a/kallithea/controllers/files.py b/kallithea/controllers/files.py --- a/kallithea/controllers/files.py +++ b/kallithea/controllers/files.py @@ -26,29 +26,31 @@ Original author and date, and relevant c """ import os +import posixpath import logging import traceback import tempfile import shutil -from pylons import request, response, tmpl_context as c, url -from pylons.i18n.translation import _ -from pylons.controllers.util import redirect -from kallithea.lib.utils import jsonify, action_logger +from tg import request, response, tmpl_context as c +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound +from kallithea.config.routing import url +from kallithea.lib.utils import action_logger from kallithea.lib import diffs from kallithea.lib import helpers as h from kallithea.lib.compat import OrderedDict -from kallithea.lib.utils2 import convert_line_endings, detect_mode, safe_str,\ - str2bool -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator -from kallithea.lib.base import BaseRepoController, render +from kallithea.lib.utils2 import convert_line_endings, detect_mode, safe_str, \ + str2bool, safe_int +from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator +from kallithea.lib.base import BaseRepoController, render, jsonify from kallithea.lib.vcs.backends.base import EmptyChangeset from kallithea.lib.vcs.conf import settings from kallithea.lib.vcs.exceptions import RepositoryError, \ ChangesetDoesNotExistError, EmptyRepositoryError, \ - ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError,\ + ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError, \ NodeDoesNotExistError, ChangesetError, NodeError from kallithea.lib.vcs.nodes import FileNode @@ -56,7 +58,7 @@ from kallithea.model.repo import RepoMod from kallithea.model.scm import ScmModel from kallithea.model.db import Repository -from kallithea.controllers.changeset import anchor_url, _ignorews_url,\ +from kallithea.controllers.changeset import anchor_url, _ignorews_url, \ _context_url, get_line_ctx, get_ignore_ws from webob.exc import HTTPNotFound from kallithea.lib.exceptions import NonRelativePathError @@ -67,9 +69,8 @@ log = logging.getLogger(__name__) class FilesController(BaseRepoController): - def __before__(self): - super(FilesController, self).__before__() - c.cut_off_limit = self.cut_off_limit + def _before(self, *args, **kwargs): + super(FilesController, self)._before(*args, **kwargs) def __get_cs(self, rev, silent_empty=False): """ @@ -92,7 +93,7 @@ class FilesController(BaseRepoController h.flash(h.literal(_('There are no files yet. %s') % add_new), category='warning') raise HTTPNotFound() - except(ChangesetDoesNotExistError, LookupError), e: + except (ChangesetDoesNotExistError, LookupError): msg = _('Such revision does not exist for this repository') h.flash(msg, category='error') raise HTTPNotFound() @@ -112,7 +113,7 @@ class FilesController(BaseRepoController file_node = cs.get_node(path) if file_node.is_dir(): raise RepositoryError('given path is a directory') - except(ChangesetDoesNotExistError,), e: + except ChangesetDoesNotExistError: msg = _('Such revision does not exist for this repository') h.flash(msg, category='error') raise HTTPNotFound() @@ -122,9 +123,8 @@ class FilesController(BaseRepoController return file_node - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def index(self, repo_name, revision, f_path, annotate=False): # redirect to given revision from form if given post_revision = request.POST.get('at_rev', None) @@ -137,6 +137,9 @@ class FilesController(BaseRepoController c.f_path = f_path c.annotate = annotate cur_rev = c.changeset.revision + # used in files_source.html: + c.cut_off_limit = self.cut_off_limit + c.fulldiff = request.GET.get('fulldiff') # prev link try: @@ -162,13 +165,11 @@ class FilesController(BaseRepoController try: c.file = c.changeset.get_node(f_path) - if c.file.is_file(): + if c.file.is_submodule(): + raise HTTPFound(location=c.file.url) + elif c.file.is_file(): c.load_full_history = False - file_last_cs = c.file.last_changeset - c.file_changeset = (c.changeset - if c.changeset.revision < file_last_cs.revision - else file_last_cs) - #determine if we're on branch head + # determine if we're on branch head _branches = c.db_repo_scm_instance.branches c.on_branch_head = revision in _branches.keys() + _branches.values() _hist = [] @@ -190,7 +191,7 @@ class FilesController(BaseRepoController # TODO: tags and bookmarks? c.revision_options = [(c.changeset.raw_id, - _('%s at %s') % (c.changeset.branch, h.short_id(c.changeset.raw_id)))] + \ + _('%s at %s') % (b, h.short_id(c.changeset.raw_id))) for b in c.changeset.branches] + \ [(n, b) for b, n in c.db_repo_scm_instance.branches.items()] if c.db_repo_scm_instance.closed_branches: prefix = _('(closed)') + ' ' @@ -199,13 +200,11 @@ class FilesController(BaseRepoController return render('files/files.html') - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') @jsonify def history(self, repo_name, revision, f_path): changeset = self.__get_cs(revision) - f_path = f_path _file = changeset.get_node(f_path) if _file.is_file(): file_history, _hist = self._get_node_history(changeset, f_path) @@ -223,12 +222,10 @@ class FilesController(BaseRepoController } return data - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def authors(self, repo_name, revision, f_path): changeset = self.__get_cs(revision) - f_path = f_path _file = changeset.get_node(f_path) if _file.is_file(): file_history, _hist = self._get_node_history(changeset, f_path) @@ -237,9 +234,8 @@ class FilesController(BaseRepoController c.authors.append((h.email(a), h.person(a))) return render('files/files_history_box.html') - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def rawfile(self, repo_name, revision, f_path): cs = self.__get_cs(revision) file_node = self.__get_filenode(cs, f_path) @@ -250,9 +246,8 @@ class FilesController(BaseRepoController response.content_type = file_node.mimetype return file_node.content - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def raw(self, repo_name, revision, f_path): cs = self.__get_cs(revision) file_node = self.__get_filenode(cs, f_path) @@ -298,7 +293,7 @@ class FilesController(BaseRepoController return file_node.content @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin') + @HasRepoPermissionLevelDecorator('write') def delete(self, repo_name, revision, f_path): repo = c.db_repo if repo.enable_locking and repo.locked[0]: @@ -306,7 +301,7 @@ class FilesController(BaseRepoController % (h.person_by_id(repo.locked[0]), h.fmt_date(h.time_to_datetime(repo.locked[1]))), 'warning') - return redirect(h.url('files_home', + raise HTTPFound(location=h.url('files_home', repo_name=repo_name, revision='tip')) # check if revision is a branch identifier- basically we cannot @@ -316,7 +311,7 @@ class FilesController(BaseRepoController if revision not in _branches.keys() + _branches.values(): h.flash(_('You can only delete files with revision ' 'being a valid branch'), category='warning') - return redirect(h.url('files_home', + raise HTTPFound(location=h.url('files_home', repo_name=repo_name, revision='tip', f_path=f_path)) @@ -328,7 +323,7 @@ class FilesController(BaseRepoController c.default_message = _('Deleted file %s via Kallithea') % (f_path) c.f_path = f_path node_path = f_path - author = self.authuser.full_contact + author = request.authuser.full_contact if r_post: message = r_post.get('message') or c.default_message @@ -340,7 +335,7 @@ class FilesController(BaseRepoController } } self.scm_model.delete_nodes( - user=c.authuser.user_id, repo=c.db_repo, + user=request.authuser.user_id, repo=c.db_repo, message=message, nodes=nodes, parent_cs=c.cs, @@ -352,13 +347,13 @@ class FilesController(BaseRepoController except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during commit'), category='error') - return redirect(url('changeset_home', + raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name, revision='tip')) return render('files/files_delete.html') @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin') + @HasRepoPermissionLevelDecorator('write') def edit(self, repo_name, revision, f_path): repo = c.db_repo if repo.enable_locking and repo.locked[0]: @@ -366,7 +361,7 @@ class FilesController(BaseRepoController % (h.person_by_id(repo.locked[0]), h.fmt_date(h.time_to_datetime(repo.locked[1]))), 'warning') - return redirect(h.url('files_home', + raise HTTPFound(location=h.url('files_home', repo_name=repo_name, revision='tip')) # check if revision is a branch identifier- basically we cannot @@ -376,7 +371,7 @@ class FilesController(BaseRepoController if revision not in _branches.keys() + _branches.values(): h.flash(_('You can only edit files with revision ' 'being a valid branch'), category='warning') - return redirect(h.url('files_home', + raise HTTPFound(location=h.url('files_home', repo_name=repo_name, revision='tip', f_path=f_path)) @@ -386,7 +381,7 @@ class FilesController(BaseRepoController c.file = self.__get_filenode(c.cs, f_path) if c.file.is_binary: - return redirect(url('files_home', repo_name=c.repo_name, + raise HTTPFound(location=url('files_home', repo_name=c.repo_name, revision=c.cs.raw_id, f_path=f_path)) c.default_message = _('Edited file %s via Kallithea') % (f_path) c.f_path = f_path @@ -401,16 +396,16 @@ class FilesController(BaseRepoController content = convert_line_endings(r_post.get('content', ''), mode) message = r_post.get('message') or c.default_message - author = self.authuser.full_contact + author = request.authuser.full_contact if content == old_content: h.flash(_('No changes'), category='warning') - return redirect(url('changeset_home', repo_name=c.repo_name, + raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name, revision='tip')) try: self.scm_model.commit_change(repo=c.db_repo_scm_instance, repo_name=repo_name, cs=c.cs, - user=self.authuser.user_id, + user=request.authuser.user_id, author=author, message=message, content=content, f_path=f_path) h.flash(_('Successfully committed to %s') % f_path, @@ -418,22 +413,22 @@ class FilesController(BaseRepoController except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during commit'), category='error') - return redirect(url('changeset_home', + raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name, revision='tip')) return render('files/files_edit.html') @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin') + @HasRepoPermissionLevelDecorator('write') def add(self, repo_name, revision, f_path): - repo = Repository.get_by_repo_name(repo_name) + repo = c.db_repo if repo.enable_locking and repo.locked[0]: h.flash(_('This repository has been locked by %s on %s') % (h.person_by_id(repo.locked[0]), h.fmt_date(h.time_to_datetime(repo.locked[1]))), 'warning') - return redirect(h.url('files_home', + raise HTTPFound(location=h.url('files_home', repo_name=repo_name, revision='tip')) r_post = request.POST @@ -462,16 +457,16 @@ class FilesController(BaseRepoController if not content: h.flash(_('No content'), category='warning') - return redirect(url('changeset_home', repo_name=c.repo_name, + raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name, revision='tip')) if not filename: h.flash(_('No filename'), category='warning') - return redirect(url('changeset_home', repo_name=c.repo_name, + raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name, revision='tip')) - #strip all crap out of file, just leave the basename + # strip all crap out of file, just leave the basename filename = os.path.basename(filename) - node_path = os.path.join(location, filename) - author = self.authuser.full_contact + node_path = posixpath.join(location, filename) + author = request.authuser.full_contact try: nodes = { @@ -480,7 +475,7 @@ class FilesController(BaseRepoController } } self.scm_model.create_nodes( - user=c.authuser.user_id, repo=c.db_repo, + user=request.authuser.user_id, repo=c.db_repo, message=message, nodes=nodes, parent_cs=c.cs, @@ -492,21 +487,20 @@ class FilesController(BaseRepoController except NonRelativePathError as e: h.flash(_('Location must be relative path and must not ' 'contain .. in path'), category='warning') - return redirect(url('changeset_home', repo_name=c.repo_name, + raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name, revision='tip')) except (NodeError, NodeAlreadyExistsError) as e: h.flash(_(e), category='error') except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during commit'), category='error') - return redirect(url('changeset_home', + raise HTTPFound(location=url('changeset_home', repo_name=c.repo_name, revision='tip')) return render('files/files_add.html') - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def archivefile(self, repo_name, fname): fileformat = None revision = None @@ -548,7 +542,7 @@ class FilesController(BaseRepoController archive_path = None cached_archive_path = None archive_cache_dir = CONFIG.get('archive_cache_dir') - if archive_cache_dir and not subrepos: # TOOD: subrepo caching? + if archive_cache_dir and not subrepos: # TODO: subrepo caching? if not os.path.isdir(archive_cache_dir): os.makedirs(archive_cache_dir) cached_archive_path = os.path.join(archive_cache_dir, archive_name) @@ -583,34 +577,34 @@ class FilesController(BaseRepoController log.debug('Destroying temp archive %s', archive_path) os.remove(archive_path) - action_logger(user=c.authuser, + action_logger(user=request.authuser, action='user_downloaded_archive:%s' % (archive_name), - repo=repo_name, ipaddr=self.ip_addr, commit=True) + repo=repo_name, ipaddr=request.ip_addr, commit=True) response.content_disposition = str('attachment; filename=%s' % (archive_name)) response.content_type = str(content_type) return get_chunked_archive(archive_path) - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def diff(self, repo_name, f_path): ignore_whitespace = request.GET.get('ignorews') == '1' - line_context = request.GET.get('context', 3) + line_context = safe_int(request.GET.get('context'), 3) diff2 = request.GET.get('diff2', '') diff1 = request.GET.get('diff1', '') or diff2 c.action = request.GET.get('diff') c.no_changes = diff1 == diff2 c.f_path = f_path c.big_diff = False + fulldiff = request.GET.get('fulldiff') c.anchor_url = anchor_url c.ignorews_url = _ignorews_url c.context_url = _context_url c.changes = OrderedDict() c.changes[diff2] = [] - #special case if we want a show rev only, it's impl here - #to reduce JS and callbacks + # special case if we want a show rev only, it's impl here + # to reduce JS and callbacks if request.GET.get('show_rev'): if str2bool(request.GET.get('annotate', 'False')): @@ -620,7 +614,7 @@ class FilesController(BaseRepoController _url = url('files_home', repo_name=c.repo_name, revision=diff1, f_path=c.f_path) - return redirect(_url) + raise HTTPFound(location=_url) try: if diff1 not in ['', None, 'None', '0' * 12, '0' * 40]: c.changeset_1 = c.db_repo_scm_instance.get_changeset(diff1) @@ -655,54 +649,45 @@ class FilesController(BaseRepoController node2 = FileNode(f_path, '', changeset=c.changeset_2) except (RepositoryError, NodeError): log.error(traceback.format_exc()) - return redirect(url('files_home', repo_name=c.repo_name, + raise HTTPFound(location=url('files_home', repo_name=c.repo_name, f_path=f_path)) if c.action == 'download': - _diff = diffs.get_gitdiff(node1, node2, + raw_diff = diffs.get_gitdiff(node1, node2, ignore_whitespace=ignore_whitespace, context=line_context) - diff = diffs.DiffProcessor(_diff, format='gitdiff') - diff_name = '%s_vs_%s.diff' % (diff1, diff2) response.content_type = 'text/plain' response.content_disposition = ( 'attachment; filename=%s' % diff_name ) - return diff.as_raw() + return raw_diff elif c.action == 'raw': - _diff = diffs.get_gitdiff(node1, node2, + raw_diff = diffs.get_gitdiff(node1, node2, ignore_whitespace=ignore_whitespace, context=line_context) - diff = diffs.DiffProcessor(_diff, format='gitdiff') response.content_type = 'text/plain' - return diff.as_raw() + return raw_diff else: fid = h.FID(diff2, node2.path) line_context_lcl = get_line_ctx(fid, request.GET) ign_whitespace_lcl = get_ignore_ws(fid, request.GET) - lim = request.GET.get('fulldiff') or self.cut_off_limit - _, cs1, cs2, diff, st = diffs.wrapped_diff(filenode_old=node1, + diff_limit = None if fulldiff else self.cut_off_limit + c.a_rev, c.cs_rev, a_path, diff, st, op = diffs.wrapped_diff(filenode_old=node1, filenode_new=node2, - cut_off_limit=lim, + diff_limit=diff_limit, ignore_whitespace=ign_whitespace_lcl, line_context=line_context_lcl, enable_comments=False) - op = '' - filename = node1.path - cs_changes = { - 'fid': [cs1, cs2, op, filename, diff, st] - } - c.changes = cs_changes + c.file_diff_data = [(fid, fid, op, a_path, node2.path, diff, st)] - return render('files/file_diff.html') + return render('files/file_diff.html') - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def diff_2way(self, repo_name, f_path): diff1 = request.GET.get('diff1', '') diff2 = request.GET.get('diff2', '') @@ -764,7 +749,7 @@ class FilesController(BaseRepoController try: changesets = tip_cs.get_file_history(f_path) except (NodeDoesNotExistError, ChangesetError): - #this node is not present at tip ! + # this node is not present at tip ! changesets = cs.get_file_history(f_path) hist_l = [] @@ -772,7 +757,7 @@ class FilesController(BaseRepoController branches_group = ([], _("Branches")) tags_group = ([], _("Tags")) for chs in changesets: - #_branch = '(%s)' % chs.branch if (cs.repository.alias == 'hg') else '' + # TODO: loop over chs.branches ... but that will not give all the bogus None branches for Git ... _branch = chs.branch n_desc = '%s (%s)' % (h.show_id(chs), _branch) changesets_group[0].append((chs.raw_id, n_desc,)) @@ -788,9 +773,8 @@ class FilesController(BaseRepoController return hist_l, changesets - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') @jsonify def nodelist(self, repo_name, revision, f_path): if request.environ.get('HTTP_X_PARTIAL_XHR'): diff --git a/kallithea/controllers/followers.py b/kallithea/controllers/followers.py --- a/kallithea/controllers/followers.py +++ b/kallithea/controllers/followers.py @@ -27,29 +27,25 @@ Original author and date, and relevant c import logging -from pylons import tmpl_context as c, request +from tg import tmpl_context as c, request -from kallithea.lib.helpers import Page -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator +from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator from kallithea.lib.base import BaseRepoController, render +from kallithea.lib.page import Page +from kallithea.lib.utils2 import safe_int from kallithea.model.db import UserFollowing -from kallithea.lib.utils2 import safe_int log = logging.getLogger(__name__) class FollowersController(BaseRepoController): - def __before__(self): - super(FollowersController, self).__before__() - - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def followers(self, repo_name): - p = safe_int(request.GET.get('page', 1), 1) + p = safe_int(request.GET.get('page'), 1) repo_id = c.db_repo.repo_id - d = UserFollowing.get_repo_followers(repo_id)\ + d = UserFollowing.get_repo_followers(repo_id) \ .order_by(UserFollowing.follows_from) c.followers_pager = Page(d, page=p, items_per_page=20) diff --git a/kallithea/controllers/forks.py b/kallithea/controllers/forks.py --- a/kallithea/controllers/forks.py +++ b/kallithea/controllers/forks.py @@ -30,58 +30,55 @@ import formencode import traceback from formencode import htmlfill -from pylons import tmpl_context as c, request, url -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import tmpl_context as c, request +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound import kallithea.lib.helpers as h -from kallithea.lib.helpers import Page -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \ - NotAnonymous, HasRepoPermissionAny, HasPermissionAnyDecorator, HasPermissionAny +from kallithea.config.routing import url +from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator, \ + HasRepoPermissionLevel, HasPermissionAnyDecorator, HasPermissionAny from kallithea.lib.base import BaseRepoController, render +from kallithea.lib.page import Page +from kallithea.lib.utils2 import safe_int from kallithea.model.db import Repository, UserFollowing, User, Ui from kallithea.model.repo import RepoModel from kallithea.model.forms import RepoForkForm from kallithea.model.scm import ScmModel, AvailableRepoGroupChoices -from kallithea.lib.utils2 import safe_int log = logging.getLogger(__name__) class ForksController(BaseRepoController): - def __before__(self): - super(ForksController, self).__before__() - def __load_defaults(self): - repo_group_perms = ['group.admin'] if HasPermissionAny('hg.create.write_on_repogroup.true')(): - repo_group_perms.append('group.write') - c.repo_groups = AvailableRepoGroupChoices(['hg.create.repository'], repo_group_perms) + repo_group_perm_level = 'write' + else: + repo_group_perm_level = 'admin' + c.repo_groups = AvailableRepoGroupChoices(['hg.create.repository'], repo_group_perm_level) c.landing_revs_choices, c.landing_revs = ScmModel().get_repo_landing_revs() - c.can_update = Ui.get_by_key(Ui.HOOK_UPDATE).ui_active + c.can_update = Ui.get_by_key('hooks', Ui.HOOK_UPDATE).ui_active - def __load_data(self, repo_name=None): + def __load_data(self): """ Load defaults settings for edit, and update - - :param repo_name: """ self.__load_defaults() - c.repo_info = db_repo = Repository.get_by_repo_name(repo_name) - repo = db_repo.scm_instance + c.repo_info = c.db_repo + repo = c.db_repo.scm_instance if c.repo_info is None: - h.not_mapped_error(repo_name) - return redirect(url('repos')) + h.not_mapped_error(c.repo_name) + raise HTTPFound(location=url('repos')) c.default_user_id = User.get_default_user().user_id - c.in_public_journal = UserFollowing.query()\ - .filter(UserFollowing.user_id == c.default_user_id)\ + c.in_public_journal = UserFollowing.query() \ + .filter(UserFollowing.user_id == c.default_user_id) \ .filter(UserFollowing.follows_repository == c.repo_info).scalar() if c.repo_info.stats: @@ -98,7 +95,7 @@ class ForksController(BaseRepoController c.stats_percentage = '%.2f' % ((float((last_rev)) / c.repo_last_rev) * 100) - defaults = RepoModel()._get_defaults(repo_name) + defaults = RepoModel()._get_defaults(c.repo_name) # alter the description to indicate a fork defaults['description'] = ('fork of repository: %s \n%s' % (defaults['repo_name'], @@ -108,17 +105,14 @@ class ForksController(BaseRepoController return defaults - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def forks(self, repo_name): - p = safe_int(request.GET.get('page', 1), 1) + p = safe_int(request.GET.get('page'), 1) repo_id = c.db_repo.repo_id d = [] for r in Repository.get_repo_forks(repo_id): - if not HasRepoPermissionAny( - 'repository.read', 'repository.write', 'repository.admin' - )(r.repo_name, 'get forks check'): + if not HasRepoPermissionLevel('read')(r.repo_name, 'get forks check'): continue d.append(r) c.forks_pager = Page(d, page=p, items_per_page=20) @@ -129,17 +123,15 @@ class ForksController(BaseRepoController return render('/forks/forks.html') @LoginRequired() - @NotAnonymous() @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository') - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') def fork(self, repo_name): c.repo_info = Repository.get_by_repo_name(repo_name) if not c.repo_info: h.not_mapped_error(repo_name) - return redirect(url('home')) + raise HTTPFound(location=url('home')) - defaults = self.__load_data(repo_name) + defaults = self.__load_data() return htmlfill.render( render('forks/fork.html'), @@ -148,10 +140,8 @@ class ForksController(BaseRepoController force_defaults=False) @LoginRequired() - @NotAnonymous() @HasPermissionAnyDecorator('hg.admin', 'hg.fork.repository') - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') def fork_create(self, repo_name): self.__load_defaults() c.repo_info = Repository.get_by_repo_name(repo_name) @@ -164,15 +154,13 @@ class ForksController(BaseRepoController form_result = _form.to_python(dict(request.POST)) # an approximation that is better than nothing - if not Ui.get_by_key(Ui.HOOK_UPDATE).ui_active: + if not Ui.get_by_key('hooks', Ui.HOOK_UPDATE).ui_active: form_result['update_after_clone'] = False # create fork is done sometimes async on celery, db transaction # management is handled there. - task = RepoModel().create_fork(form_result, self.authuser.user_id) - from celery.result import BaseAsyncResult - if isinstance(task, BaseAsyncResult): - task_id = task.task_id + task = RepoModel().create_fork(form_result, request.authuser.user_id) + task_id = task.task_id except formencode.Invalid as errors: return htmlfill.render( render('forks/fork.html'), @@ -186,6 +174,6 @@ class ForksController(BaseRepoController h.flash(_('An error occurred during repository forking %s') % repo_name, category='error') - return redirect(h.url('repo_creating_home', + raise HTTPFound(location=h.url('repo_creating_home', repo_name=form_result['repo_name_full'], task_id=task_id)) diff --git a/kallithea/controllers/home.py b/kallithea/controllers/home.py --- a/kallithea/controllers/home.py +++ b/kallithea/controllers/home.py @@ -28,73 +28,76 @@ Original author and date, and relevant c import logging -from pylons import tmpl_context as c, request -from pylons.i18n.translation import _ +from tg import tmpl_context as c, request +from tg.i18n import ugettext as _ from webob.exc import HTTPBadRequest from sqlalchemy.sql.expression import func +from sqlalchemy import or_, and_ -from kallithea.lib.utils import jsonify, conditional_cache -from kallithea.lib.compat import json -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator -from kallithea.lib.base import BaseController, render -from kallithea.model.db import Repository, RepoGroup +from kallithea.lib.utils import conditional_cache +from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator +from kallithea.lib.base import BaseController, render, jsonify +from kallithea.lib import helpers as h +from kallithea.model.db import Repository, RepoGroup, User, UserGroup from kallithea.model.repo import RepoModel - +from kallithea.model.scm import UserGroupList log = logging.getLogger(__name__) class HomeController(BaseController): - def __before__(self): - super(HomeController, self).__before__() - def about(self): return render('/about.html') - @LoginRequired() + @LoginRequired(allow_default_user=True) def index(self): - c.groups = self.scm_model.get_repo_groups() c.group = None - c.repos_list = Repository.query()\ - .filter(Repository.group_id == None)\ - .order_by(func.lower(Repository.repo_name))\ - .all() + repo_groups_list = self.scm_model.get_repo_groups() + repos_list = Repository.query(sorted=True).filter_by(group=None).all() - repos_data = RepoModel().get_repos_as_dict(repos_list=c.repos_list, - admin=False) - #json used to render the grid - c.data = json.dumps(repos_data) + c.data = RepoModel().get_repos_as_dict(repos_list, + repo_groups_list=repo_groups_list, + short_name=True) return render('/index.html') - @LoginRequired() + @LoginRequired(allow_default_user=True) @jsonify def repo_switcher_data(self): - #wrapper for conditional cache + # wrapper for conditional cache def _c(): log.debug('generating switcher repo/groups list') - all_repos = Repository.query().order_by(Repository.repo_name).all() - repo_iter = self.scm_model.get_repos(all_repos, simple=True) - all_groups = RepoGroup.query().order_by(RepoGroup.group_name).all() + all_repos = Repository.query(sorted=True).all() + repo_iter = self.scm_model.get_repos(all_repos) + all_groups = RepoGroup.query(sorted=True).all() repo_groups_iter = self.scm_model.get_repo_groups(all_groups) res = [{ 'text': _('Groups'), 'children': [ - {'id': obj.group_name, 'text': obj.group_name, - 'type': 'group', 'obj': {}} for obj in repo_groups_iter] - }, { + {'id': obj.group_name, + 'text': obj.group_name, + 'type': 'group', + 'obj': {}} + for obj in repo_groups_iter + ], + }, + { 'text': _('Repositories'), 'children': [ - {'id': obj['name'], 'text': obj['name'], - 'type': 'repo', 'obj': obj['dbrepo']} for obj in repo_iter] + {'id': obj.repo_name, + 'text': obj.repo_name, + 'type': 'repo', + 'obj': obj.get_dict()} + for obj in repo_iter + ], }] data = { 'more': False, - 'results': res + 'results': res, } return data @@ -106,20 +109,8 @@ class HomeController(BaseController): else: raise HTTPBadRequest() - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') - def branch_tag_switcher(self, repo_name): - if request.is_xhr: - c.db_repo = Repository.get_by_repo_name(repo_name) - if c.db_repo: - c.db_repo_scm_instance = c.db_repo.scm_instance - return render('/switch_to_list.html') - raise HTTPBadRequest() - - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') @jsonify def repo_refs_data(self, repo_name): repo = Repository.get_by_repo_name(repo_name).scm_instance @@ -130,6 +121,12 @@ class HomeController(BaseController): 'text': _('Branch'), 'children': [{'id': rev, 'text': name, 'type': 'branch'} for name, rev in _branches] }) + _closed_branches = repo.closed_branches.items() + if _closed_branches: + res.append({ + 'text': _('Closed Branches'), + 'children': [{'id': rev, 'text': name, 'type': 'closed-branch'} for name, rev in _closed_branches] + }) _tags = repo.tags.items() if _tags: res.append({ @@ -147,3 +144,69 @@ class HomeController(BaseController): 'results': res } return data + + @LoginRequired() + @jsonify + def users_and_groups_data(self): + """ + Returns 'results' with a list of users and user groups. + + You can either use the 'key' GET parameter to get a user by providing + the exact user key or you can use the 'query' parameter to + search for users by user key, first name and last name. + 'types' defaults to just 'users' but can be set to 'users,groups' to + get both users and groups. + No more than 500 results (of each kind) will be returned. + """ + types = request.GET.get('types', 'users').split(',') + key = request.GET.get('key', '') + query = request.GET.get('query', '') + results = [] + if 'users' in types: + user_list = [] + if key: + u = User.get_by_username(key) + if u: + user_list = [u] + elif query: + user_list = User.query() \ + .filter(User.is_default_user == False) \ + .filter(User.active == True) \ + .filter(or_( + User.username.ilike("%%"+query+"%%"), + User.name.ilike("%%"+query+"%%"), + User.lastname.ilike("%%"+query+"%%"), + )) \ + .order_by(User.username) \ + .limit(500) \ + .all() + for u in user_list: + results.append({ + 'type': 'user', + 'id': u.user_id, + 'nname': u.username, + 'fname': u.name, + 'lname': u.lastname, + 'gravatar_lnk': h.gravatar_url(u.email, size=28, default='default'), + 'gravatar_size': 14, + }) + if 'groups' in types: + grp_list = [] + if key: + grp = UserGroup.get_by_group_name(key) + if grp: + grp_list = [grp] + elif query: + grp_list = UserGroup.query() \ + .filter(UserGroup.users_group_name.ilike("%%"+query+"%%")) \ + .filter(UserGroup.users_group_active == True) \ + .order_by(UserGroup.users_group_name) \ + .limit(500) \ + .all() + for g in UserGroupList(grp_list, perm_level='read'): + results.append({ + 'type': 'group', + 'id': g.users_group_id, + 'grname': g.users_group_name, + }) + return dict(results=results) diff --git a/kallithea/controllers/journal.py b/kallithea/controllers/journal.py --- a/kallithea/controllers/journal.py +++ b/kallithea/controllers/journal.py @@ -15,7 +15,7 @@ kallithea.controllers.journal ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Journal controller for pylons +Journal controller This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below: @@ -37,37 +37,39 @@ from sqlalchemy.sql.expression import fu from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed from webob.exc import HTTPBadRequest -from pylons import request, tmpl_context as c, response, url -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c, response +from tg.i18n import ugettext as _ +from kallithea.config.routing import url from kallithea.controllers.admin.admin import _journal_filter from kallithea.model.db import UserLog, UserFollowing, Repository, User from kallithea.model.meta import Session from kallithea.model.repo import RepoModel import kallithea.lib.helpers as h -from kallithea.lib.helpers import Page -from kallithea.lib.auth import LoginRequired, NotAnonymous +from kallithea.lib.auth import LoginRequired from kallithea.lib.base import BaseController, render +from kallithea.lib.page import Page from kallithea.lib.utils2 import safe_int, AttributeDict -from kallithea.lib.compat import json log = logging.getLogger(__name__) +language = 'en-us' +ttl = "5" +feed_nr = 20 + + class JournalController(BaseController): - def __before__(self): - super(JournalController, self).__before__() - self.language = 'en-us' - self.ttl = "5" - self.feed_nr = 20 + def _before(self, *args, **kwargs): + super(JournalController, self)._before(*args, **kwargs) c.search_term = request.GET.get('filter') def _get_daily_aggregate(self, journal): groups = [] for k, g in groupby(journal, lambda x: x.action_as_day): user_group = [] - #groupby username if it's a present value, else fallback to journal username + # groupby username if it's a present value, else fallback to journal username for _unused, g2 in groupby(list(g), lambda x: x.user.username if x.user else x.username): l = list(g2) user_group.append((l[0].user, l)) @@ -77,10 +79,10 @@ class JournalController(BaseController): return groups def _get_journal_data(self, following_repos): - repo_ids = [x.follows_repository.repo_id for x in following_repos - if x.follows_repository is not None] - user_ids = [x.follows_user.user_id for x in following_repos - if x.follows_user is not None] + repo_ids = [x.follows_repository_id for x in following_repos + if x.follows_repository_id is not None] + user_ids = [x.follows_user_id for x in following_repos + if x.follows_user_id is not None] filtering_criterion = None @@ -92,12 +94,12 @@ class JournalController(BaseController): if not repo_ids and user_ids: filtering_criterion = UserLog.user_id.in_(user_ids) if filtering_criterion is not None: - journal = self.sa.query(UserLog)\ - .options(joinedload(UserLog.user))\ + journal = UserLog.query() \ + .options(joinedload(UserLog.user)) \ .options(joinedload(UserLog.repository)) - #filter + # filter journal = _journal_filter(journal, c.search_term) - journal = journal.filter(filtering_criterion)\ + journal = journal.filter(filtering_criterion) \ .order_by(UserLog.action_date.desc()) else: journal = [] @@ -117,13 +119,13 @@ class JournalController(BaseController): feed = Atom1Feed(title=_desc, link=_link, description=_desc, - language=self.language, - ttl=self.ttl) + language=language, + ttl=ttl) - for entry in journal[:self.feed_nr]: + for entry in journal[:feed_nr]: user = entry.user if user is None: - #fix deleted users + # fix deleted users user = AttributeDict({'short_contact': entry.username, 'email': '', 'full_contact': ''}) @@ -159,13 +161,13 @@ class JournalController(BaseController): feed = Rss201rev2Feed(title=_desc, link=_link, description=_desc, - language=self.language, - ttl=self.ttl) + language=language, + ttl=ttl) - for entry in journal[:self.feed_nr]: + for entry in journal[:feed_nr]: user = entry.user if user is None: - #fix deleted users + # fix deleted users user = AttributeDict({'short_contact': entry.username, 'email': '', 'full_contact': ''}) @@ -189,14 +191,13 @@ class JournalController(BaseController): return feed.writeString('utf-8') @LoginRequired() - @NotAnonymous() def index(self): # Return a rendered template - p = safe_int(request.GET.get('page', 1), 1) - c.user = User.get(self.authuser.user_id) - c.following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + p = safe_int(request.GET.get('page'), 1) + c.user = User.get(request.authuser.user_id) + c.following = UserFollowing.query() \ + .filter(UserFollowing.user_id == request.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() journal = self._get_journal_data(c.following) @@ -205,119 +206,61 @@ class JournalController(BaseController): return url.current(filter=c.search_term, **kw) c.journal_pager = Page(journal, page=p, items_per_page=20, url=url_generator) - c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager) + c.journal_day_aggregate = self._get_daily_aggregate(c.journal_pager) if request.environ.get('HTTP_X_PARTIAL_XHR'): return render('journal/journal_data.html') - repos_list = Session().query(Repository)\ - .filter(Repository.user_id == - self.authuser.user_id)\ - .order_by(func.lower(Repository.repo_name)).all() - - repos_data = RepoModel().get_repos_as_dict(repos_list=repos_list, - admin=True) - #json used to render the grid - c.data = json.dumps(repos_data) - - watched_repos_data = [] - - ## watched repos - _render = RepoModel._render_datatable - - def quick_menu(repo_name): - return _render('quick_menu', repo_name) - - def repo_lnk(name, rtype, rstate, private, fork_of): - return _render('repo_name', name, rtype, rstate, private, fork_of, - short_name=False, admin=False) - - def last_rev(repo_name, cs_cache): - return _render('revision', repo_name, cs_cache.get('revision'), - cs_cache.get('raw_id'), cs_cache.get('author'), - cs_cache.get('message')) - - def desc(desc): - from pylons import tmpl_context as c - return h.urlify_text(desc, truncate=60, stylize=c.visual.stylify_metatags) + repos_list = Repository.query(sorted=True) \ + .filter_by(owner_id=request.authuser.user_id).all() - def repo_actions(repo_name): - return _render('repo_actions', repo_name) - - def owner_actions(user_id, username): - return _render('user_name', user_id, username) - - def toogle_follow(repo_id): - return _render('toggle_follow', repo_id) + repos_data = RepoModel().get_repos_as_dict(repos_list, admin=True) + # data used to render the grid + c.data = repos_data - for entry in c.following: - repo = entry.follows_repository - cs_cache = repo.changeset_cache - row = { - "menu": quick_menu(repo.repo_name), - "raw_name": repo.repo_name.lower(), - "name": repo_lnk(repo.repo_name, repo.repo_type, - repo.repo_state, repo.private, repo.fork), - "last_changeset": last_rev(repo.repo_name, cs_cache), - "last_rev_raw": cs_cache.get('revision'), - "action": toogle_follow(repo.repo_id) - } - - watched_repos_data.append(row) - - c.watched_data = json.dumps({ - "totalRecords": len(c.following), - "startIndex": 0, - "sort": "name", - "dir": "asc", - "records": watched_repos_data - }) return render('journal/journal.html') @LoginRequired(api_access=True) - @NotAnonymous() def journal_atom(self): """ Produce an atom-1.0 feed via feedgenerator module """ - following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + following = UserFollowing.query() \ + .filter(UserFollowing.user_id == request.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() return self._atom_feed(following, public=False) @LoginRequired(api_access=True) - @NotAnonymous() def journal_rss(self): """ Produce an rss feed via feedgenerator module """ - following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + following = UserFollowing.query() \ + .filter(UserFollowing.user_id == request.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() return self._rss_feed(following, public=False) @LoginRequired() - @NotAnonymous() def toggle_following(self): user_id = request.POST.get('follows_user_id') if user_id: try: self.scm_model.toggle_following_user(user_id, - self.authuser.user_id) - Session.commit() + request.authuser.user_id) + Session().commit() return 'ok' except Exception: log.error(traceback.format_exc()) raise HTTPBadRequest() - repo_id = request.POST.get('follows_repo_id') + repo_id = request.POST.get('follows_repository_id') if repo_id: try: self.scm_model.toggle_following_repo(repo_id, - self.authuser.user_id) - Session.commit() + request.authuser.user_id) + Session().commit() return 'ok' except Exception: log.error(traceback.format_exc()) @@ -325,47 +268,47 @@ class JournalController(BaseController): raise HTTPBadRequest() - @LoginRequired() + @LoginRequired(allow_default_user=True) def public_journal(self): # Return a rendered template - p = safe_int(request.GET.get('page', 1), 1) + p = safe_int(request.GET.get('page'), 1) - c.following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + c.following = UserFollowing.query() \ + .filter(UserFollowing.user_id == request.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() journal = self._get_journal_data(c.following) c.journal_pager = Page(journal, page=p, items_per_page=20) - c.journal_day_aggreagate = self._get_daily_aggregate(c.journal_pager) + c.journal_day_aggregate = self._get_daily_aggregate(c.journal_pager) if request.environ.get('HTTP_X_PARTIAL_XHR'): return render('journal/journal_data.html') return render('journal/public_journal.html') - @LoginRequired(api_access=True) + @LoginRequired(api_access=True, allow_default_user=True) def public_journal_atom(self): """ Produce an atom-1.0 feed via feedgenerator module """ - c.following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + c.following = UserFollowing.query() \ + .filter(UserFollowing.user_id == request.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() return self._atom_feed(c.following) - @LoginRequired(api_access=True) + @LoginRequired(api_access=True, allow_default_user=True) def public_journal_rss(self): """ Produce an rss2 feed via feedgenerator module """ - c.following = self.sa.query(UserFollowing)\ - .filter(UserFollowing.user_id == self.authuser.user_id)\ - .options(joinedload(UserFollowing.follows_repository))\ + c.following = UserFollowing.query() \ + .filter(UserFollowing.user_id == request.authuser.user_id) \ + .options(joinedload(UserFollowing.follows_repository)) \ .all() return self._rss_feed(c.following) diff --git a/kallithea/controllers/login.py b/kallithea/controllers/login.py --- a/kallithea/controllers/login.py +++ b/kallithea/controllers/login.py @@ -31,12 +31,12 @@ import re import formencode from formencode import htmlfill +from tg.i18n import ugettext as _ +from tg import request, session, tmpl_context as c from webob.exc import HTTPFound, HTTPBadRequest -from pylons.i18n.translation import _ -from pylons.controllers.util import redirect -from pylons import request, session, tmpl_context as c, url import kallithea.lib.helpers as h +from kallithea.config.routing import url from kallithea.lib.auth import AuthUser, HasPermissionAnyDecorator from kallithea.lib.base import BaseController, log_in_user, render from kallithea.lib.exceptions import UserCreationError @@ -53,9 +53,6 @@ log = logging.getLogger(__name__) class LoginController(BaseController): - def __before__(self): - super(LoginController, self).__before__() - def _validate_came_from(self, came_from, _re=re.compile(r"/(?!/)[-!#$%&'()*+,./:;=?@_~0-9A-Za-z]*$")): """Return True if came_from is valid and can and should be used. @@ -79,25 +76,18 @@ class LoginController(BaseController): else: c.came_from = url('home') - not_default = self.authuser.username != User.DEFAULT_USER - ip_allowed = AuthUser.check_ip_allowed(self.authuser, self.ip_addr) - - # redirect if already logged in - if self.authuser.is_authenticated and not_default and ip_allowed: - raise HTTPFound(location=c.came_from) - if request.POST: # import Login Form validator class - login_form = LoginForm() + login_form = LoginForm()() try: c.form_result = login_form.to_python(dict(request.POST)) # form checks for username/password, now we're authenticated username = c.form_result['username'] - user = User.get_by_username(username, case_insensitive=True) + user = User.get_by_username_or_email(username, case_insensitive=True) except formencode.Invalid as errors: defaults = errors.value # remove password from filling in form again - del defaults['password'] + defaults.pop('password', None) return htmlfill.render( render('/login.html'), defaults=errors.value, @@ -115,14 +105,18 @@ class LoginController(BaseController): log_in_user(user, c.form_result['remember'], is_external_auth=False) raise HTTPFound(location=c.came_from) + else: + # redirect if already logged in + if request.authuser.is_authenticated: + raise HTTPFound(location=c.came_from) return render('/login.html') @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate') def register(self): - c.auto_active = 'hg.register.auto_activate' in User.get_default_user()\ - .AuthUser.permissions['global'] + def_user_perms = AuthUser(dbuser=User.get_default_user()).permissions['global'] + c.auto_active = 'hg.register.auto_activate' in def_user_perms settings = Setting.get_app_settings() captcha_private_key = settings.get('captcha_private_key') @@ -137,11 +131,10 @@ class LoginController(BaseController): if c.captcha_active: from kallithea.lib.recaptcha import submit - response = submit(request.POST.get('recaptcha_challenge_field'), - request.POST.get('recaptcha_response_field'), + response = submit(request.POST.get('g-recaptcha-response'), private_key=captcha_private_key, - remoteip=self.ip_addr) - if c.captcha_active and not response.is_valid: + remoteip=request.ip_addr) + if not response.is_valid: _value = form_result _msg = _('Bad captcha') error_dict = {'recaptcha_field': _msg} @@ -149,10 +142,10 @@ class LoginController(BaseController): error_dict=error_dict) UserModel().create_registration(form_result) - h.flash(_('You have successfully registered into Kallithea'), + h.flash(_('You have successfully registered with %s') % (c.site_name or 'Kallithea'), category='success') Session().commit() - return redirect(url('login_home')) + raise HTTPFound(location=url('login_home')) except formencode.Invalid as errors: return htmlfill.render( @@ -183,11 +176,10 @@ class LoginController(BaseController): form_result = password_reset_form.to_python(dict(request.POST)) if c.captcha_active: from kallithea.lib.recaptcha import submit - response = submit(request.POST.get('recaptcha_challenge_field'), - request.POST.get('recaptcha_response_field'), + response = submit(request.POST.get('g-recaptcha-response'), private_key=captcha_private_key, - remoteip=self.ip_addr) - if c.captcha_active and not response.is_valid: + remoteip=request.ip_addr) + if not response.is_valid: _value = form_result _msg = _('Bad captcha') error_dict = {'recaptcha_field': _msg} @@ -196,7 +188,7 @@ class LoginController(BaseController): redirect_link = UserModel().send_reset_password_email(form_result) h.flash(_('A password reset confirmation code has been sent'), category='success') - return redirect(redirect_link) + raise HTTPFound(location=redirect_link) except formencode.Invalid as errors: return htmlfill.render( @@ -249,12 +241,12 @@ class LoginController(BaseController): UserModel().reset_password(form_result['email'], form_result['password']) h.flash(_('Successfully updated password'), category='success') - return redirect(url('login_home')) + raise HTTPFound(location=url('login_home')) def logout(self): session.delete() log.info('Logging out and deleting session for user') - redirect(url('home')) + raise HTTPFound(location=url('home')) def authentication_token(self): """Return the CSRF protection token for the session - just like it diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -28,43 +28,52 @@ Original author and date, and relevant c import logging import traceback import formencode -import re - -from webob.exc import HTTPNotFound, HTTPForbidden, HTTPBadRequest -from pylons import request, tmpl_context as c, url -from pylons.controllers.util import redirect -from pylons.i18n.translation import _ +from tg import request, tmpl_context as c +from tg.i18n import ugettext as _ +from webob.exc import HTTPFound, HTTPNotFound, HTTPForbidden, HTTPBadRequest -from kallithea.lib.vcs.utils.hgcompat import unionrepo -from kallithea.lib.compat import json -from kallithea.lib.base import BaseRepoController, render -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\ - NotAnonymous -from kallithea.lib.helpers import Page +from kallithea.config.routing import url from kallithea.lib import helpers as h from kallithea.lib import diffs -from kallithea.lib.exceptions import UserInvalidException -from kallithea.lib.utils import action_logger, jsonify +from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator +from kallithea.lib.base import BaseRepoController, render, jsonify +from kallithea.lib.page import Page +from kallithea.lib.utils import action_logger +from kallithea.lib.vcs.exceptions import EmptyRepositoryError, ChangesetDoesNotExistError from kallithea.lib.vcs.utils import safe_str -from kallithea.lib.vcs.exceptions import EmptyRepositoryError -from kallithea.lib.diffs import LimitedDiffContainer -from kallithea.model.db import PullRequest, ChangesetStatus, ChangesetComment,\ - PullRequestReviewers, User -from kallithea.model.pull_request import PullRequestModel +from kallithea.lib.vcs.utils.hgcompat import unionrepo +from kallithea.model.db import PullRequest, ChangesetStatus, \ + PullRequestReviewer, Repository, User +from kallithea.model.pull_request import CreatePullRequestAction, CreatePullRequestIterationAction, PullRequestModel from kallithea.model.meta import Session from kallithea.model.repo import RepoModel from kallithea.model.comment import ChangesetCommentsModel from kallithea.model.changeset_status import ChangesetStatusModel from kallithea.model.forms import PullRequestForm, PullRequestPostForm from kallithea.lib.utils2 import safe_int -from kallithea.controllers.changeset import _ignorews_url, _context_url +from kallithea.controllers.changeset import _ignorews_url, _context_url, \ + create_cs_pr_comment, delete_cs_pr_comment from kallithea.controllers.compare import CompareController from kallithea.lib.graphmod import graph_data log = logging.getLogger(__name__) +def _get_reviewer(user_id): + """Look up user by ID and validate it as a potential reviewer.""" + try: + user = User.get(int(user_id)) + except ValueError: + user = None + + if user is None or user.is_default_user: + h.flash(_('Invalid reviewer "%s" specified') % user_id, category='error') + raise HTTPBadRequest() + + return user + + class PullrequestsController(BaseRepoController): def _get_repo_refs(self, repo, rev=None, branch=None, branch_rev=None): @@ -93,11 +102,11 @@ class PullrequestsController(BaseRepoCon for i in repo._repo.revs( "sort(parents(branch(id(%s)) and merge()) - branch(id(%s)), -rev)", branch_rev, branch_rev): - abranch = repo.get_changeset(i).branch - if abranch not in peerbranches: - n = 'branch:%s:%s' % (abranch, repo.get_changeset(abranch).raw_id) - peers.append((n, abranch)) - peerbranches.add(abranch) + for abranch in repo.get_changeset(i).branches: + if abranch not in peerbranches: + n = 'branch:%s:%s' % (abranch, repo.get_changeset(abranch).raw_id) + peers.append((n, abranch)) + peerbranches.add(abranch) selected = None tiprev = repo.tags.get('tip') @@ -140,8 +149,7 @@ class PullrequestsController(BaseRepoCon continue n = 'tag:%s:%s' % (tag, tagrev) tags.append((n, tag)) - if rev == tagrev: - selected = n + # note: even if rev == tagrev, don't select the static tag - it must be chosen explicitly # prio 1: rev was selected as existing entry above @@ -178,65 +186,72 @@ class PullrequestsController(BaseRepoCon ] return [g for g in groups if g[0]], selected - def _get_is_allowed_change_status(self, pull_request): + def _is_allowed_to_change_status(self, pull_request): if pull_request.is_closed(): return False - owner = self.authuser.user_id == pull_request.user_id - reviewer = self.authuser.user_id in [x.user_id for x in - pull_request.reviewers] - return self.authuser.admin or owner or reviewer + owner = request.authuser.user_id == pull_request.owner_id + reviewer = PullRequestReviewer.query() \ + .filter(PullRequestReviewer.pull_request == pull_request) \ + .filter(PullRequestReviewer.user_id == request.authuser.user_id) \ + .count() != 0 - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + return request.authuser.admin or owner or reviewer + + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def show_all(self, repo_name): c.from_ = request.GET.get('from_') or '' c.closed = request.GET.get('closed') or '' - c.pull_requests = PullRequestModel().get_all(repo_name, from_=c.from_, closed=c.closed) - c.repo_name = repo_name - p = safe_int(request.GET.get('page', 1), 1) + p = safe_int(request.GET.get('page'), 1) + + q = PullRequest.query(include_closed=c.closed, sorted=True) + if c.from_: + q = q.filter_by(org_repo=c.db_repo) + else: + q = q.filter_by(other_repo=c.db_repo) + c.pull_requests = q.all() c.pullrequests_pager = Page(c.pull_requests, page=p, items_per_page=100) return render('/pullrequests/pullrequest_show_all.html') @LoginRequired() - @NotAnonymous() def show_my(self): c.closed = request.GET.get('closed') or '' - def _filter(pr): - s = sorted(pr, key=lambda o: o.created_on, reverse=True) - if not c.closed: - s = filter(lambda p: p.status != PullRequest.STATUS_CLOSED, s) - return s + c.my_pull_requests = PullRequest.query( + include_closed=c.closed, + sorted=True, + ).filter_by(owner_id=request.authuser.user_id).all() - c.my_pull_requests = _filter(PullRequest.query()\ - .filter(PullRequest.user_id == - self.authuser.user_id)\ - .all()) - - c.participate_in_pull_requests = _filter(PullRequest.query()\ - .join(PullRequestReviewers)\ - .filter(PullRequestReviewers.user_id == - self.authuser.user_id)\ - ) + c.participate_in_pull_requests = [] + c.participate_in_pull_requests_todo = [] + done_status = set([ChangesetStatus.STATUS_APPROVED, ChangesetStatus.STATUS_REJECTED]) + for pr in PullRequest.query( + include_closed=c.closed, + reviewer_id=request.authuser.user_id, + sorted=True, + ): + status = pr.user_review_status(request.authuser.user_id) # very inefficient!!! + if status in done_status: + c.participate_in_pull_requests.append(pr) + else: + c.participate_in_pull_requests_todo.append(pr) return render('/pullrequests/pullrequest_show_my.html') @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') def index(self): org_repo = c.db_repo org_scm_instance = org_repo.scm_instance try: org_scm_instance.get_changeset() except EmptyRepositoryError as e: - h.flash(_('There are no changesets yet'), category='warning') - redirect(url('summary_home', repo_name=org_repo.repo_name)) + h.flash(_('There are no changesets yet'), + category='warning') + raise HTTPFound(location=url('summary_home', repo_name=org_repo.repo_name)) org_rev = request.GET.get('rev_end') # rev_start is not directly useful - its parent could however be used @@ -282,12 +297,10 @@ class PullrequestsController(BaseRepoCon return render('/pullrequests/pullrequest.html') @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') @jsonify def repo_info(self, repo_name): - repo = RepoModel()._get_repo(repo_name) + repo = c.db_repo refs, selected_ref = self._get_repo_refs(repo.scm_instance) return { 'description': repo.description.split('\n', 1)[0], @@ -296,11 +309,9 @@ class PullrequestsController(BaseRepoCon } @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') def create(self, repo_name): - repo = RepoModel()._get_repo(repo_name) + repo = c.db_repo try: _form = PullRequestForm(repo.repo_id)().to_python(request.POST) except formencode.Invalid as errors: @@ -311,234 +322,136 @@ class PullrequestsController(BaseRepoCon raise HTTPBadRequest # heads up: org and other might seem backward here ... - org_repo_name = _form['org_repo'] org_ref = _form['org_ref'] # will have merge_rev as rev but symbolic name - org_repo = RepoModel()._get_repo(org_repo_name) - (org_ref_type, - org_ref_name, - org_rev) = org_ref.split(':') - if org_ref_type == 'rev': - org_ref_type = 'branch' - cs = org_repo.scm_instance.get_changeset(org_rev) - org_ref = '%s:%s:%s' % (org_ref_type, cs.branch, cs.raw_id) + org_repo = Repository.guess_instance(_form['org_repo']) - other_repo_name = _form['other_repo'] other_ref = _form['other_ref'] # will have symbolic name and head revision - other_repo = RepoModel()._get_repo(other_repo_name) - (other_ref_type, - other_ref_name, - other_rev) = other_ref.split(':') + other_repo = Repository.guess_instance(_form['other_repo']) - cs_ranges, _cs_ranges_not, ancestor_rev = \ - CompareController._get_changesets(org_repo.scm_instance.alias, - other_repo.scm_instance, other_rev, # org and other "swapped" - org_repo.scm_instance, org_rev, - ) - if ancestor_rev is None: - ancestor_rev = org_repo.scm_instance.EMPTY_CHANGESET - revisions = [cs_.raw_id for cs_ in cs_ranges] - - # hack: ancestor_rev is not an other_rev but we want to show the - # requested destination and have the exact ancestor - other_ref = '%s:%s:%s' % (other_ref_type, other_ref_name, ancestor_rev) - - reviewers = _form['review_members'] + reviewers = [] title = _form['pullrequest_title'] - if not title: - if org_repo_name == other_repo_name: - title = '%s to %s' % (h.short_ref(org_ref_type, org_ref_name), - h.short_ref(other_ref_type, other_ref_name)) - else: - title = '%s#%s to %s#%s' % (org_repo_name, h.short_ref(org_ref_type, org_ref_name), - other_repo_name, h.short_ref(other_ref_type, other_ref_name)) - description = _form['pullrequest_desc'].strip() or _('No description') + description = _form['pullrequest_desc'].strip() + owner = User.get(request.authuser.user_id) + try: - pull_request = PullRequestModel().create( - self.authuser.user_id, org_repo_name, org_ref, other_repo_name, - other_ref, revisions, reviewers, title, description - ) + cmd = CreatePullRequestAction(org_repo, other_repo, org_ref, other_ref, title, description, owner, reviewers) + except CreatePullRequestAction.ValidationError as e: + h.flash(str(e), category='error', logf=log.error) + raise HTTPNotFound + + try: + pull_request = cmd.execute() Session().commit() - h.flash(_('Successfully opened new pull request'), - category='success') - except UserInvalidException as u: - h.flash(_('Invalid reviewer "%s" specified') % u, category='error') - raise HTTPBadRequest() except Exception: h.flash(_('Error occurred while creating pull request'), category='error') log.error(traceback.format_exc()) - return redirect(url('pullrequest_home', repo_name=repo_name)) - - return redirect(pull_request.url()) - - def create_update(self, old_pull_request, updaterev, title, description, reviewers_ids): - org_repo = RepoModel()._get_repo(old_pull_request.org_repo.repo_name) - org_ref_type, org_ref_name, org_rev = old_pull_request.org_ref.split(':') - new_org_rev = self._get_ref_rev(org_repo, 'rev', updaterev) - - other_repo = RepoModel()._get_repo(old_pull_request.other_repo.repo_name) - other_ref_type, other_ref_name, other_rev = old_pull_request.other_ref.split(':') # other_rev is ancestor - #assert other_ref_type == 'branch', other_ref_type # TODO: what if not? - new_other_rev = self._get_ref_rev(other_repo, other_ref_type, other_ref_name) + raise HTTPFound(location=url('pullrequest_home', repo_name=repo_name)) - cs_ranges, _cs_ranges_not, ancestor_rev = CompareController._get_changesets(org_repo.scm_instance.alias, - other_repo.scm_instance, new_other_rev, # org and other "swapped" - org_repo.scm_instance, new_org_rev) - - old_revisions = set(old_pull_request.revisions) - revisions = [cs.raw_id for cs in cs_ranges] - new_revisions = [r for r in revisions if r not in old_revisions] - lost = old_revisions.difference(revisions) - - infos = ['This is an update of %s "%s".' % - (h.canonical_url('pullrequest_show', repo_name=old_pull_request.other_repo.repo_name, - pull_request_id=old_pull_request.pull_request_id), - old_pull_request.title)] + h.flash(_('Successfully opened new pull request'), + category='success') + raise HTTPFound(location=pull_request.url()) - if lost: - infos.append(_('Missing changesets since the previous pull request:')) - for r in old_pull_request.revisions: - if r in lost: - rev_desc = org_repo.get_changeset(r).message.split('\n')[0] - infos.append(' %s "%s"' % (h.short_id(r), rev_desc)) - - if new_revisions: - infos.append(_('New changesets on %s %s since the previous pull request:') % (org_ref_type, org_ref_name)) - for r in reversed(revisions): - if r in new_revisions: - rev_desc = org_repo.get_changeset(r).message.split('\n')[0] - infos.append(' %s %s' % (h.short_id(r), h.shorter(rev_desc, 80))) - - if ancestor_rev == other_rev: - infos.append(_("Ancestor didn't change - show diff since previous version:")) - infos.append(h.canonical_url('compare_url', - repo_name=org_repo.repo_name, # other_repo is always same as repo_name - org_ref_type='rev', org_ref_name=h.short_id(org_rev), # use old org_rev as base - other_ref_type='rev', other_ref_name=h.short_id(new_org_rev), - )) # note: linear diff, merge or not doesn't matter - else: - infos.append(_('This pull request is based on another %s revision and there is no simple diff.') % other_ref_name) - else: - infos.append(_('No changes found on %s %s since previous version.') % (org_ref_type, org_ref_name)) - # TODO: fail? - - # hack: ancestor_rev is not an other_ref but we want to show the - # requested destination and have the exact ancestor - new_other_ref = '%s:%s:%s' % (other_ref_type, other_ref_name, ancestor_rev) - new_org_ref = '%s:%s:%s' % (org_ref_type, org_ref_name, new_org_rev) + def create_new_iteration(self, old_pull_request, new_rev, title, description, reviewers): + owner = User.get(request.authuser.user_id) + new_org_rev = self._get_ref_rev(old_pull_request.org_repo, 'rev', new_rev) + new_other_rev = self._get_ref_rev(old_pull_request.other_repo, old_pull_request.other_ref_parts[0], old_pull_request.other_ref_parts[1]) + try: + cmd = CreatePullRequestIterationAction(old_pull_request, new_org_rev, new_other_rev, title, description, owner, reviewers) + except CreatePullRequestAction.ValidationError as e: + h.flash(str(e), category='error', logf=log.error) + raise HTTPNotFound try: - title, old_v = re.match(r'(.*)\(v(\d+)\)\s*$', title).groups() - v = int(old_v) + 1 - except (AttributeError, ValueError): - v = 2 - title = '%s (v%s)' % (title.strip(), v) - - # using a mail-like separator, insert new update info at the top of the list - descriptions = description.replace('\r\n', '\n').split('\n-- \n', 1) - description = descriptions[0].strip() + '\n\n-- \n' + '\n'.join(infos) - if len(descriptions) > 1: - description += '\n\n' + descriptions[1].strip() - - try: - pull_request = PullRequestModel().create( - self.authuser.user_id, - old_pull_request.org_repo.repo_name, new_org_ref, - old_pull_request.other_repo.repo_name, new_other_ref, - revisions, reviewers_ids, title, description - ) - except UserInvalidException as u: - h.flash(_('Invalid reviewer "%s" specified') % u, category='error') - raise HTTPBadRequest() + pull_request = cmd.execute() + Session().commit() except Exception: h.flash(_('Error occurred while creating pull request'), category='error') log.error(traceback.format_exc()) - return redirect(old_pull_request.url()) + raise HTTPFound(location=old_pull_request.url()) - ChangesetCommentsModel().create( - text=_('Closed, replaced by %s .') % pull_request.url(canonical=True), - repo=old_pull_request.other_repo.repo_id, - user=c.authuser.user_id, - pull_request=old_pull_request.pull_request_id, - closing_pr=True) - PullRequestModel().close_pull_request(old_pull_request.pull_request_id) - - Session().commit() - h.flash(_('Pull request update created'), + h.flash(_('New pull request iteration created'), category='success') - - return redirect(pull_request.url()) + raise HTTPFound(location=pull_request.url()) # pullrequest_post for PR editing @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') def post(self, repo_name, pull_request_id): pull_request = PullRequest.get_or_404(pull_request_id) if pull_request.is_closed(): raise HTTPForbidden() assert pull_request.other_repo.repo_name == repo_name - #only owner or admin can update it - owner = pull_request.owner.user_id == c.authuser.user_id - repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name) + # only owner or admin can update it + owner = pull_request.owner_id == request.authuser.user_id + repo_admin = h.HasRepoPermissionLevel('admin')(c.repo_name) if not (h.HasPermissionAny('hg.admin')() or repo_admin or owner): raise HTTPForbidden() _form = PullRequestPostForm()().to_python(request.POST) - reviewers_ids = [int(s) for s in _form['review_members']] + + cur_reviewers = set(pull_request.get_reviewer_users()) + new_reviewers = set(_get_reviewer(s) for s in _form['review_members']) + old_reviewers = set(_get_reviewer(s) for s in _form['org_review_members']) + + other_added = cur_reviewers - old_reviewers + other_removed = old_reviewers - cur_reviewers + + if other_added: + h.flash(_('Meanwhile, the following reviewers have been added: %s') % + (', '.join(u.username for u in other_added)), + category='warning') + if other_removed: + h.flash(_('Meanwhile, the following reviewers have been removed: %s') % + (', '.join(u.username for u in other_removed)), + category='warning') if _form['updaterev']: - return self.create_update(pull_request, + return self.create_new_iteration(pull_request, _form['updaterev'], _form['pullrequest_title'], _form['pullrequest_desc'], - reviewers_ids) + new_reviewers) + + added_reviewers = new_reviewers - old_reviewers - cur_reviewers + removed_reviewers = (old_reviewers - new_reviewers) & cur_reviewers old_description = pull_request.description pull_request.title = _form['pullrequest_title'] pull_request.description = _form['pullrequest_desc'].strip() or _('No description') pull_request.owner = User.get_by_username(_form['owner']) - user = User.get(c.authuser.user_id) - try: - PullRequestModel().mention_from_description(user, pull_request, old_description) - PullRequestModel().update_reviewers(user, pull_request_id, reviewers_ids) - except UserInvalidException as u: - h.flash(_('Invalid reviewer "%s" specified') % u, category='error') - raise HTTPBadRequest() + user = User.get(request.authuser.user_id) + + PullRequestModel().mention_from_description(user, pull_request, old_description) + PullRequestModel().add_reviewers(user, pull_request, added_reviewers) + PullRequestModel().remove_reviewers(user, pull_request, removed_reviewers) Session().commit() h.flash(_('Pull request updated'), category='success') - return redirect(pull_request.url()) + raise HTTPFound(location=pull_request.url()) @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') @jsonify def delete(self, repo_name, pull_request_id): pull_request = PullRequest.get_or_404(pull_request_id) - #only owner can delete it ! - if pull_request.owner.user_id == c.authuser.user_id: + # only owner can delete it ! + if pull_request.owner_id == request.authuser.user_id: PullRequestModel().delete(pull_request) Session().commit() h.flash(_('Successfully deleted pull request'), category='success') - return redirect(url('my_pullrequests')) + raise HTTPFound(location=url('my_pullrequests')) raise HTTPForbidden() - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def show(self, repo_name, pull_request_id, extra=None): - repo_model = RepoModel() - c.users_array = repo_model.get_users_js() - c.user_groups_array = repo_model.get_user_groups_js() c.pull_request = PullRequest.get_or_404(pull_request_id) - c.allowed_to_change_status = self._get_is_allowed_change_status(c.pull_request) + c.allowed_to_change_status = self._is_allowed_to_change_status(c.pull_request) cc_model = ChangesetCommentsModel() cs_model = ChangesetStatusModel() @@ -556,125 +469,139 @@ class PullrequestsController(BaseRepoCon c.a_repo = c.pull_request.other_repo (c.a_ref_type, c.a_ref_name, - c.a_rev) = c.pull_request.other_ref.split(':') # other_rev is ancestor + c.a_rev) = c.pull_request.other_ref.split(':') # a_rev is ancestor org_scm_instance = c.cs_repo.scm_instance # property with expensive cache invalidation check!!! - c.cs_repo = c.cs_repo - c.cs_ranges = [org_scm_instance.get_changeset(x) for x in c.pull_request.revisions] + try: + c.cs_ranges = [] + for x in c.pull_request.revisions: + c.cs_ranges.append(org_scm_instance.get_changeset(x)) + except ChangesetDoesNotExistError: + c.cs_ranges = [] + h.flash(_('Revision %s not found in %s') % (x, c.cs_repo.repo_name), + 'error') c.cs_ranges_org = None # not stored and not important and moving target - could be calculated ... revs = [ctx.revision for ctx in reversed(c.cs_ranges)] - c.jsdata = json.dumps(graph_data(org_scm_instance, revs)) + c.jsdata = graph_data(org_scm_instance, revs) c.is_range = False - if c.a_ref_type == 'rev': # this looks like a free range where target is ancestor - cs_a = org_scm_instance.get_changeset(c.a_rev) - root_parents = c.cs_ranges[0].parents - c.is_range = cs_a in root_parents - #c.merge_root = len(root_parents) > 1 # a range starting with a merge might deserve a warning + try: + if c.a_ref_type == 'rev': # this looks like a free range where target is ancestor + cs_a = org_scm_instance.get_changeset(c.a_rev) + root_parents = c.cs_ranges[0].parents + c.is_range = cs_a in root_parents + #c.merge_root = len(root_parents) > 1 # a range starting with a merge might deserve a warning + except ChangesetDoesNotExistError: # probably because c.a_rev not found + pass + except IndexError: # probably because c.cs_ranges is empty, probably because revisions are missing + pass avail_revs = set() avail_show = [] c.cs_branch_name = c.cs_ref_name + c.a_branch_name = None other_scm_instance = c.a_repo.scm_instance c.update_msg = "" c.update_msg_other = "" - if org_scm_instance.alias == 'hg' and c.a_ref_name != 'ancestor': - if c.cs_ref_type != 'branch': - c.cs_branch_name = org_scm_instance.get_changeset(c.cs_ref_name).branch # use ref_type ? - c.a_branch_name = c.a_ref_name - if c.a_ref_type != 'branch': - try: - c.a_branch_name = other_scm_instance.get_changeset(c.a_ref_name).branch # use ref_type ? - except EmptyRepositoryError: - c.a_branch_name = 'null' # not a branch name ... but close enough - # candidates: descendants of old head that are on the right branch - # and not are the old head itself ... - # and nothing at all if old head is a descendant of target ref name - if not c.is_range and other_scm_instance._repo.revs('present(%s)::&%s', c.cs_ranges[-1].raw_id, c.a_branch_name): - c.update_msg = _('This pull request has already been merged to %s.') % c.a_branch_name - elif c.pull_request.is_closed(): - c.update_msg = _('This pull request has been closed and can not be updated.') - else: # look for descendants of PR head on source branch in org repo - avail_revs = org_scm_instance._repo.revs('%s:: & branch(%s)', - revs[0], c.cs_branch_name) - if len(avail_revs) > 1: # more than just revs[0] - # also show changesets that not are descendants but would be merged in - targethead = other_scm_instance.get_changeset(c.a_branch_name).raw_id - if org_scm_instance.path != other_scm_instance.path: - # Note: org_scm_instance.path must come first so all - # valid revision numbers are 100% org_scm compatible - # - both for avail_revs and for revset results - hgrepo = unionrepo.unionrepository(org_scm_instance.baseui, - org_scm_instance.path, - other_scm_instance.path) + try: + if not c.cs_ranges: + c.update_msg = _('Error: changesets not found when displaying pull request from %s.') % c.cs_rev + elif org_scm_instance.alias == 'hg' and c.a_ref_name != 'ancestor': + if c.cs_ref_type != 'branch': + c.cs_branch_name = org_scm_instance.get_changeset(c.cs_ref_name).branch # use ref_type ? + c.a_branch_name = c.a_ref_name + if c.a_ref_type != 'branch': + try: + c.a_branch_name = other_scm_instance.get_changeset(c.a_ref_name).branch # use ref_type ? + except EmptyRepositoryError: + c.a_branch_name = 'null' # not a branch name ... but close enough + # candidates: descendants of old head that are on the right branch + # and not are the old head itself ... + # and nothing at all if old head is a descendant of target ref name + if not c.is_range and other_scm_instance._repo.revs('present(%s)::&%s', c.cs_ranges[-1].raw_id, c.a_branch_name): + c.update_msg = _('This pull request has already been merged to %s.') % c.a_branch_name + elif c.pull_request.is_closed(): + c.update_msg = _('This pull request has been closed and can not be updated.') + else: # look for descendants of PR head on source branch in org repo + avail_revs = org_scm_instance._repo.revs('%s:: & branch(%s)', + revs[0], c.cs_branch_name) + if len(avail_revs) > 1: # more than just revs[0] + # also show changesets that not are descendants but would be merged in + targethead = other_scm_instance.get_changeset(c.a_branch_name).raw_id + if org_scm_instance.path != other_scm_instance.path: + # Note: org_scm_instance.path must come first so all + # valid revision numbers are 100% org_scm compatible + # - both for avail_revs and for revset results + hgrepo = unionrepo.unionrepository(org_scm_instance.baseui, + org_scm_instance.path, + other_scm_instance.path) + else: + hgrepo = org_scm_instance._repo + show = set(hgrepo.revs('::%ld & !::parents(%s) & !::%s', + avail_revs, revs[0], targethead)) + if show: + c.update_msg = _('The following additional changes are available on %s:') % c.cs_branch_name + else: + c.update_msg = _('No additional changesets found for iterating on this pull request.') else: - hgrepo = org_scm_instance._repo - show = set(hgrepo.revs('::%ld & !::%s & !::%s', - avail_revs, revs[0], targethead)) - c.update_msg = _('This pull request can be updated with changes on %s:') % c.cs_branch_name - else: - show = set() - avail_revs = set() # drop revs[0] - c.update_msg = _('No changesets found for updating this pull request.') + show = set() + avail_revs = set() # drop revs[0] + c.update_msg = _('No additional changesets found for iterating on this pull request.') - # TODO: handle branch heads that not are tip-most - brevs = org_scm_instance._repo.revs('%s - %ld - %s', c.cs_branch_name, avail_revs, revs[0]) - if brevs: - # also show changesets that are on branch but neither ancestors nor descendants - show.update(org_scm_instance._repo.revs('::%ld - ::%ld - ::%s', brevs, avail_revs, c.a_branch_name)) - show.add(revs[0]) # make sure graph shows this so we can see how they relate - c.update_msg_other = _('Note: Branch %s has another head: %s.') % (c.cs_branch_name, - h.short_id(org_scm_instance.get_changeset((max(brevs))).raw_id)) + # TODO: handle branch heads that not are tip-most + brevs = org_scm_instance._repo.revs('%s - %ld - %s', c.cs_branch_name, avail_revs, revs[0]) + if brevs: + # also show changesets that are on branch but neither ancestors nor descendants + show.update(org_scm_instance._repo.revs('::%ld - ::%ld - ::%s', brevs, avail_revs, c.a_branch_name)) + show.add(revs[0]) # make sure graph shows this so we can see how they relate + c.update_msg_other = _('Note: Branch %s has another head: %s.') % (c.cs_branch_name, + h.short_id(org_scm_instance.get_changeset((max(brevs))).raw_id)) - avail_show = sorted(show, reverse=True) + avail_show = sorted(show, reverse=True) - elif org_scm_instance.alias == 'git': - c.update_msg = _("Git pull requests don't support updates yet.") + elif org_scm_instance.alias == 'git': + c.cs_repo.scm_instance.get_changeset(c.cs_rev) # check it exists - raise ChangesetDoesNotExistError if not + c.update_msg = _("Git pull requests don't support iterating yet.") + except ChangesetDoesNotExistError: + c.update_msg = _('Error: some changesets not found when displaying pull request from %s.') % c.cs_rev c.avail_revs = avail_revs c.avail_cs = [org_scm_instance.get_changeset(r) for r in avail_show] - c.avail_jsdata = json.dumps(graph_data(org_scm_instance, avail_show)) + c.avail_jsdata = graph_data(org_scm_instance, avail_show) raw_ids = [x.raw_id for x in c.cs_ranges] c.cs_comments = c.cs_repo.get_comments(raw_ids) - c.statuses = c.cs_repo.statuses(raw_ids) + c.cs_statuses = c.cs_repo.statuses(raw_ids) ignore_whitespace = request.GET.get('ignorews') == '1' - line_context = request.GET.get('context', 3) + line_context = safe_int(request.GET.get('context'), 3) c.ignorews_url = _ignorews_url c.context_url = _context_url - c.fulldiff = request.GET.get('fulldiff') - diff_limit = self.cut_off_limit if not c.fulldiff else None + fulldiff = request.GET.get('fulldiff') + diff_limit = None if fulldiff else self.cut_off_limit # we swap org/other ref since we run a simple diff on one repo log.debug('running diff between %s and %s in %s', c.a_rev, c.cs_rev, org_scm_instance.path) - txtdiff = org_scm_instance.get_diff(rev1=safe_str(c.a_rev), rev2=safe_str(c.cs_rev), - ignore_whitespace=ignore_whitespace, - context=line_context) - - diff_processor = diffs.DiffProcessor(txtdiff or '', format='gitdiff', - diff_limit=diff_limit) - _parsed = diff_processor.prepare() - - c.limited_diff = False - if isinstance(_parsed, LimitedDiffContainer): - c.limited_diff = True - - c.files = [] - c.changes = {} + try: + raw_diff = diffs.get_diff(org_scm_instance, rev1=safe_str(c.a_rev), rev2=safe_str(c.cs_rev), + ignore_whitespace=ignore_whitespace, context=line_context) + except ChangesetDoesNotExistError: + raw_diff = _("The diff can't be shown - the PR revisions could not be found.") + diff_processor = diffs.DiffProcessor(raw_diff or '', diff_limit=diff_limit) + c.limited_diff = diff_processor.limited_diff + c.file_diff_data = [] c.lines_added = 0 c.lines_deleted = 0 - for f in _parsed: + for f in diff_processor.parsed: st = f['stats'] c.lines_added += st['added'] c.lines_deleted += st['deleted'] - fid = h.FID('', f['filename']) - c.files.append([fid, f['operation'], f['filename'], f['stats']]) - htmldiff = diff_processor.as_html(enable_comments=True, - parsed_lines=[f]) - c.changes[fid] = [f['operation'], f['filename'], htmldiff] + filename = f['filename'] + fid = h.FID('', filename) + html_diff = diffs.as_html(enable_comments=True, parsed_lines=[f]) + c.file_diff_data.append((fid, None, f['operation'], f['old_filename'], filename, html_diff, st)) # inline comments c.inline_cnt = 0 @@ -686,8 +613,7 @@ class PullrequestsController(BaseRepoCon for comments in lines.values(): c.inline_cnt += len(comments) # comments - c.comments = cc_model.get_comments(c.db_repo.repo_id, - pull_request=pull_request_id) + c.comments = cc_model.get_comments(c.db_repo.repo_id, pull_request=pull_request_id) # (badly named) pull-request status calculation based on reviewer votes (c.pull_request_reviewers, @@ -696,100 +622,21 @@ class PullrequestsController(BaseRepoCon ) = cs_model.calculate_pull_request_result(c.pull_request) c.changeset_statuses = ChangesetStatus.STATUSES - c.as_form = False - c.ancestor = None # there is one - but right here we don't know which + c.is_ajax_preview = False + c.ancestors = None # [c.a_rev] ... but that is shown in an other way return render('/pullrequests/pullrequest_show.html') @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') @jsonify def comment(self, repo_name, pull_request_id): pull_request = PullRequest.get_or_404(pull_request_id) - - status = request.POST.get('changeset_status') - close_pr = request.POST.get('save_close') - f_path = request.POST.get('f_path') - line_no = request.POST.get('line') - - if (status or close_pr) and (f_path or line_no): - # status votes and closing is only possible in general comments - raise HTTPBadRequest() - - allowed_to_change_status = self._get_is_allowed_change_status(pull_request) - if not allowed_to_change_status: - if status or close_pr: - h.flash(_('No permission to change pull request status'), 'error') - raise HTTPForbidden() - - text = request.POST.get('text', '').strip() - if close_pr: - text = _('Closing.') + '\n' + text - - comment = ChangesetCommentsModel().create( - text=text, - repo=c.db_repo.repo_id, - user=c.authuser.user_id, - pull_request=pull_request_id, - f_path=f_path, - line_no=line_no, - status_change=(ChangesetStatus.get_status_lbl(status) - if status and allowed_to_change_status else None), - closing_pr=close_pr - ) - - action_logger(self.authuser, - 'user_commented_pull_request:%s' % pull_request_id, - c.db_repo, self.ip_addr, self.sa) - - if status: - ChangesetStatusModel().set_status( - c.db_repo.repo_id, - status, - c.authuser.user_id, - comment, - pull_request=pull_request_id - ) - - if close_pr: - PullRequestModel().close_pull_request(pull_request_id) - action_logger(self.authuser, - 'user_closed_pull_request:%s' % pull_request_id, - c.db_repo, self.ip_addr, self.sa) - - Session().commit() - - if not request.environ.get('HTTP_X_PARTIAL_XHR'): - return redirect(pull_request.url()) - - data = { - 'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))), - } - if comment is not None: - c.comment = comment - data.update(comment.get_dict()) - data.update({'rendered_text': - render('changeset/changeset_comment_block.html')}) - - return data + allowed_to_change_status = self._is_allowed_to_change_status(pull_request) + return create_cs_pr_comment(repo_name, pull_request=pull_request, + allowed_to_change_status=allowed_to_change_status) @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') @jsonify def delete_comment(self, repo_name, comment_id): - co = ChangesetComment.get(comment_id) - if co.pull_request.is_closed(): - #don't allow deleting comments on closed pull request - raise HTTPForbidden() - - owner = co.author.user_id == c.authuser.user_id - repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name) - if h.HasPermissionAny('hg.admin')() or repo_admin or owner: - ChangesetCommentsModel().delete(comment=co) - Session().commit() - return True - else: - raise HTTPForbidden() + return delete_cs_pr_comment(repo_name, comment_id) diff --git a/kallithea/controllers/root.py b/kallithea/controllers/root.py new file mode 100644 --- /dev/null +++ b/kallithea/controllers/root.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +from tgext.routes import RoutedController +from kallithea.config.routing import make_map +from kallithea.lib.base import BaseController +from kallithea.controllers.error import ErrorController +from tg import config + + +# This is the main Kallithea entry point; TurboGears will forward all requests +# to an instance of 'controller.root.RootController' in the configured +# 'application' module (set by app_cfg.py). Requests are forwarded to +# controllers based on the routing mapper that lives in this root instance. +# The mapper is configured using routes defined in routing.py. This use of the +# 'mapper' attribute is a feature of tgext.routes, which is activated by +# inheriting from its RoutedController class. +class RootController(RoutedController, BaseController): + + mapper = make_map(config) + + # the following assignment hooks in error handling + error = ErrorController() diff --git a/kallithea/controllers/search.py b/kallithea/controllers/search.py --- a/kallithea/controllers/search.py +++ b/kallithea/controllers/search.py @@ -28,10 +28,10 @@ Original author and date, and relevant c import logging import traceback import urllib -from pylons.i18n.translation import _ -from pylons import request, config, tmpl_context as c +from tg.i18n import ugettext as _ +from tg import request, config, tmpl_context as c -from whoosh.index import open_dir, EmptyIndexError +from whoosh.index import open_dir, exists_in, EmptyIndexError from whoosh.qparser import QueryParser, QueryParserError from whoosh.query import Phrase, Prefix from webhelpers.util import update_params @@ -40,19 +40,16 @@ from kallithea.lib.auth import LoginRequ from kallithea.lib.base import BaseRepoController, render from kallithea.lib.indexers import CHGSETS_SCHEMA, SCHEMA, CHGSET_IDX_NAME, \ IDX_NAME, WhooshResultWrapper -from kallithea.model.repo import RepoModel +from kallithea.lib.page import Page from kallithea.lib.utils2 import safe_str, safe_int -from kallithea.lib.helpers import Page +from kallithea.model.repo import RepoModel log = logging.getLogger(__name__) class SearchController(BaseRepoController): - def __before__(self): - super(SearchController, self).__before__() - - @LoginRequired() + @LoginRequired(allow_default_user=True) def index(self, repo_name=None): c.repo_name = repo_name c.formated_results = [] @@ -85,16 +82,20 @@ class SearchController(BaseRepoControlle log.debug(cur_query) if c.cur_query: - p = safe_int(request.GET.get('page', 1), 1) + p = safe_int(request.GET.get('page'), 1) highlight_items = set() + index_dir = config['app_conf']['index_dir'] try: - idx = open_dir(config['app_conf']['index_dir'], - indexname=index_name) + if not exists_in(index_dir, index_name): + raise EmptyIndexError + idx = open_dir(index_dir, indexname=index_name) searcher = idx.searcher() qp = QueryParser(search_type, schema=schema_defn) if c.repo_name: - cur_query = u'repository:%s %s' % (c.repo_name, cur_query) + # use "repository_rawname:" instead of "repository:" + # for case-sensitive matching + cur_query = u'repository_rawname:%s %s' % (c.repo_name, cur_query) try: query = qp.parse(unicode(cur_query)) # extract words for highlight @@ -134,12 +135,10 @@ class SearchController(BaseRepoControlle except QueryParserError: c.runtime = _('Invalid search query. Try quoting it.') searcher.close() - except (EmptyIndexError, IOError): - log.error(traceback.format_exc()) - log.error('Empty Index data') - c.runtime = _('There is no index to search in. ' - 'Please run whoosh indexer') - except (Exception): + except EmptyIndexError: + log.error("Empty search index - run 'kallithea-cli index-create' regularly") + c.runtime = _('The server has no search index.') + except Exception: log.error(traceback.format_exc()) c.runtime = _('An error occurred during search operation.') diff --git a/kallithea/controllers/summary.py b/kallithea/controllers/summary.py --- a/kallithea/controllers/summary.py +++ b/kallithea/controllers/summary.py @@ -28,50 +28,44 @@ Original author and date, and relevant c import traceback import calendar import logging +import itertools from time import mktime from datetime import timedelta, date -from pylons import tmpl_context as c, request -from pylons.i18n.translation import _ +from tg import tmpl_context as c, request +from tg.i18n import ugettext as _ from webob.exc import HTTPBadRequest from beaker.cache import cache_region, region_invalidate -from kallithea.lib.compat import product from kallithea.lib.vcs.exceptions import ChangesetError, EmptyRepositoryError, \ NodeDoesNotExistError from kallithea.config.conf import ALL_READMES, ALL_EXTS, LANGUAGES_EXTENSIONS_MAP from kallithea.model.db import Statistics, CacheInvalidation, User -from kallithea.lib.utils import jsonify -from kallithea.lib.utils2 import safe_str -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\ - NotAnonymous -from kallithea.lib.base import BaseRepoController, render +from kallithea.lib.utils2 import safe_int, safe_str +from kallithea.lib.auth import LoginRequired, HasRepoPermissionLevelDecorator +from kallithea.lib.base import BaseRepoController, render, jsonify from kallithea.lib.vcs.backends.base import EmptyChangeset from kallithea.lib.markup_renderer import MarkupRenderer -from kallithea.lib.celerylib import run_task from kallithea.lib.celerylib.tasks import get_commits_stats from kallithea.lib.compat import json from kallithea.lib.vcs.nodes import FileNode -from kallithea.controllers.changelog import _load_changelog_summary +from kallithea.lib.page import RepoPage log = logging.getLogger(__name__) README_FILES = [''.join([x[0][0], x[1][0]]) for x in - sorted(list(product(ALL_READMES, ALL_EXTS)), + sorted(list(itertools.product(ALL_READMES, ALL_EXTS)), key=lambda y:y[0][1] + y[1][1])] class SummaryController(BaseRepoController): - def __before__(self): - super(SummaryController, self).__before__() - def __get_readme_data(self, db_repo): repo_name = db_repo.repo_name log.debug('Looking for README file') - @cache_region('long_term') + @cache_region('long_term', '_get_readme_from_cache') def _get_readme_from_cache(key, kind): readme_data = None readme_file = None @@ -105,24 +99,32 @@ class SummaryController(BaseRepoControll kind = 'README' valid = CacheInvalidation.test_and_set_valid(repo_name, kind) if not valid: - region_invalidate(_get_readme_from_cache, None, repo_name, kind) + region_invalidate(_get_readme_from_cache, None, '_get_readme_from_cache', repo_name, kind) return _get_readme_from_cache(repo_name, kind) - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def index(self, repo_name): - _load_changelog_summary() + p = safe_int(request.GET.get('page'), 1) + size = safe_int(request.GET.get('size'), 10) + collection = c.db_repo_scm_instance + c.cs_pagination = RepoPage(collection, page=p, items_per_page=size) + page_revisions = [x.raw_id for x in list(c.cs_pagination)] + c.cs_comments = c.db_repo.get_comments(page_revisions) + c.cs_statuses = c.db_repo.statuses(page_revisions) - username = '' - if self.authuser.username != User.DEFAULT_USER: - username = safe_str(self.authuser.username) + if request.authuser.is_default_user: + username = '' + else: + username = safe_str(request.authuser.username) _def_clone_uri = _def_clone_uri_by_id = c.clone_uri_tmpl - if '{repo}' in _def_clone_uri: - _def_clone_uri_by_id = _def_clone_uri.replace('{repo}', '_{repoid}') - elif '{repoid}' in _def_clone_uri: - _def_clone_uri_by_id = _def_clone_uri.replace('_{repoid}', '{repo}') + if '{repo}' in _def_clone_uri_by_id: + _def_clone_uri_by_id = _def_clone_uri_by_id.replace('{repo}', '_{repoid}') + elif '_{repoid}' in _def_clone_uri: + _def_clone_uri = _def_clone_uri.replace('_{repoid}', '{repo}') + else: + log.error("Configured clone_uri_tmpl %r has no '{repo}' or '_{repoid}' and cannot toggle to use repo id URLs", c.clone_uri_tmpl) c.clone_repo_url = c.db_repo.clone_url(user=username, uri_tmpl=_def_clone_uri) @@ -134,8 +136,8 @@ class SummaryController(BaseRepoControll else: c.show_stats = False - stats = self.sa.query(Statistics)\ - .filter(Statistics.repository == c.db_repo)\ + stats = Statistics.query() \ + .filter(Statistics.repository == c.db_repo) \ .scalar() c.stats_percentage = 0 @@ -148,12 +150,12 @@ class SummaryController(BaseRepoControll "desc": LANGUAGES_EXTENSIONS_MAP.get(x)}) for x, y in lang_stats_d.items()) - c.trending_languages = json.dumps( + c.trending_languages = ( sorted(lang_stats, reverse=True, key=lambda k: k[1])[:10] ) else: c.no_data = True - c.trending_languages = json.dumps([]) + c.trending_languages = [] c.enable_downloads = c.db_repo.enable_downloads c.readme_data, c.readme_file = \ @@ -161,9 +163,7 @@ class SummaryController(BaseRepoControll return render('summary/summary.html') @LoginRequired() - @NotAnonymous() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @HasRepoPermissionLevelDecorator('read') @jsonify def repo_size(self, repo_name): if request.is_xhr: @@ -171,9 +171,8 @@ class SummaryController(BaseRepoControll else: raise HTTPBadRequest() - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') + @LoginRequired(allow_default_user=True) + @HasRepoPermissionLevelDecorator('read') def statistics(self, repo_name): if c.db_repo.enable_statistics: c.show_stats = True @@ -192,25 +191,25 @@ class SummaryController(BaseRepoControll c.ts_min = ts_min_m c.ts_max = ts_max_y - stats = self.sa.query(Statistics)\ - .filter(Statistics.repository == c.db_repo)\ + stats = Statistics.query() \ + .filter(Statistics.repository == c.db_repo) \ .scalar() c.stats_percentage = 0 if stats and stats.languages: c.no_data = False is c.db_repo.enable_statistics lang_stats_d = json.loads(stats.languages) - c.commit_data = stats.commit_activity - c.overview_data = stats.commit_activity_combined + c.commit_data = json.loads(stats.commit_activity) + c.overview_data = json.loads(stats.commit_activity_combined) lang_stats = ((x, {"count": y, "desc": LANGUAGES_EXTENSIONS_MAP.get(x)}) for x, y in lang_stats_d.items()) - c.trending_languages = json.dumps( + c.trending_languages = ( sorted(lang_stats, reverse=True, key=lambda k: k[1])[:10] ) last_rev = stats.stat_on_revision + 1 - c.repo_last_rev = c.db_repo_scm_instance.count()\ + c.repo_last_rev = c.db_repo_scm_instance.count() \ if c.db_repo_scm_instance.revisions else 0 if last_rev == 0 or c.repo_last_rev == 0: pass @@ -218,12 +217,11 @@ class SummaryController(BaseRepoControll c.stats_percentage = '%.2f' % ((float((last_rev)) / c.repo_last_rev) * 100) else: - c.commit_data = json.dumps({}) - c.overview_data = json.dumps([[ts_min_y, 0], [ts_max_y, 10]]) - c.trending_languages = json.dumps({}) + c.commit_data = {} + c.overview_data = ([[ts_min_y, 0], [ts_max_y, 10]]) + c.trending_languages = {} c.no_data = True recurse_limit = 500 # don't recurse more than 500 times when parsing - run_task(get_commits_stats, c.db_repo.repo_name, ts_min_y, - ts_max_y, recurse_limit) + get_commits_stats(c.db_repo.repo_name, ts_min_y, ts_max_y, recurse_limit) return render('summary/statistics.html') diff --git a/kallithea/controllers/tags.py b/kallithea/controllers/tags.py deleted file mode 100644 --- a/kallithea/controllers/tags.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -""" -kallithea.controllers.tags -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Tags controller for Kallithea - -This file was forked by the Kallithea project in July 2014. -Original author and date, and relevant copyright and licensing information is below: -:created_on: Apr 21, 2010 -:author: marcink -:copyright: (c) 2013 RhodeCode GmbH, and others. -:license: GPLv3, see LICENSE.md for more details. - -""" - -import logging - -from pylons import tmpl_context as c - -from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator -from kallithea.lib.base import BaseRepoController, render -from kallithea.lib.compat import OrderedDict - -log = logging.getLogger(__name__) - - -class TagsController(BaseRepoController): - - def __before__(self): - super(TagsController, self).__before__() - - @LoginRequired() - @HasRepoPermissionAnyDecorator('repository.read', 'repository.write', - 'repository.admin') - def index(self): - c.repo_tags = OrderedDict() - - tags = [(name, c.db_repo_scm_instance.get_changeset(hash_)) for \ - name, hash_ in c.db_repo_scm_instance.tags.items()] - ordered_tags = sorted(tags, key=lambda x: x[1].date, reverse=True) - for name, cs_tag in ordered_tags: - c.repo_tags[name] = cs_tag - - return render('tags/tags.html') diff --git a/kallithea/front-end/kallithea-diff.less b/kallithea/front-end/kallithea-diff.less new file mode 100644 --- /dev/null +++ b/kallithea/front-end/kallithea-diff.less @@ -0,0 +1,216 @@ +/* bootstrap progress bar has margin-bottom we don't want that in files list */ +.cs_files .progress { + margin-bottom: 0; +} +/* progress bars should be aligned right */ +.cs_files .changes { + float: right; + color: @kallithea-theme-main-color; +} + +/* colors for deleted/changed/added, both for 3 labels in top right corner with total count, and for per file "diffstat" (rendered as Bootstrap progress-bar) */ +.changes .added { + color: inherit; + background-color: @add-bg-color; +} +.changes .changed { + background: @change-bg-color; +} +.changes .deleted { + background-color: @delete-bg-color; +} +/* binary +NEW_FILENODE = 1 +DEL_FILENODE = 2 +MOD_FILENODE = 3 +RENAMED_FILENODE = 4 +CHMOD_FILENODE = 5 +BIN_FILENODE = 6 +*/ +.changes .bin { + background-color: @add-bg-color; +} +/* added binary */ +.changes .bin.bin1 { + background-color: @add-bg-color; +} +/* deleted binary*/ +.changes .bin.bin2 { + background-color: @delete-bg-color; +} +/* mod binary*/ +.changes .bin.bin3 { + background-color: @change-bg-color; +} +/* rename file*/ +.changes .bin.bin4 { + background-color: #6D99FF; +} +/* chmod file*/ +.changes .bin.bin5 { + background-color: #6D99FF; +} + +/* center collapse button */ +.diff-collapse { + text-align: center; + margin-bottom: 15px; +} + +.code-difftable { + /* the whole line should be colored */ + border-collapse: collapse; + border-radius: 0px !important; + width: 100%; + + /* line coloring */ + .context { + background: none repeat scroll 0 0 @highlight-line-color; + color: #999; + } + .add { + background: none repeat scroll 0 0 #DDFFDD; + } + .add ins { + background: none repeat scroll 0 0 #AAFFAA; + text-decoration: none; + } + .del { + background: none repeat scroll 0 0 #FFDDDD; + } + .del del { + background: none repeat scroll 0 0 #FFAAAA; + text-decoration: none; + } + + /* tabs */ + td.code pre u:before { + content: "\21a6"; + display: inline-block; + width: 0; + } + /* CR */ + td.code pre u.cr:before { + content: "\21a4"; + display: inline-block; + } + /* whitespace characters */ + td.code pre u { + color: rgba(0, 0, 0, 0.3); + } + /* trailing spaces */ + td.code pre i { + border-style: solid; + border-width: 0 0 0 1px; + border-color: rgba(0, 0, 0, 0.3); + } + + /* line numbers */ + .lineno { + padding-left: 2px; + padding-right: 2px !important; + width: 30px; + border-right: 1px solid @panel-default-border !important; + vertical-align: middle !important; + text-align: center; + } + .lineno.new { + text-align: right; + } + .lineno.old { + text-align: right; + } + .lineno a { + color: #aaa !important; + font-size: 11px; + font-family: @font-family-monospace; + line-height: normal; + padding-left: 6px; + padding-right: 6px; + display: block; + } + .line:hover .lineno a { + color: #333 !important; + } + /** CODE **/ + .code { + display: block; + } + .code pre { + border: 0; + padding: 0; + margin: 0; + background: none; + min-height: 17px; + line-height: 17px; + white-space: pre-wrap; + word-break: break-all; + } + + /* leading +/- on changed lines */ + .del .code pre:before { + content: "-"; + color: #800; + } + .add .code pre:before { + content: "+"; + color: #080; + } + .code pre:before { + content: " "; + margin: 0 2px; + } +} + +/* comment bubble */ +.add-bubble { + position: relative; + display: none; + float: left; + width: 0px; + height: 0px; + left: -8px; + box-sizing: border-box; +} +/* comment bubble, only visible when in a commentable diff */ +.commentable-diff tr.line.add:hover td .add-bubble, +.commentable-diff tr.line.del:hover td .add-bubble, +.commentable-diff tr.line.unmod:hover td .add-bubble { + display: block; + z-index: 1; +} +.add-bubble div { + background: @kallithea-theme-main-color; + width: 16px; + height: 16px; + line-height: 14px; + cursor: pointer; + padding: 0 2px 2px 0.5px; + border: 1px solid @kallithea-theme-main-color; + border-radius: 3px; + box-sizing: border-box; + overflow: hidden; +} +.add-bubble div:before { + font-size: 14px; + color: #ffffff; + font-family: "kallithea"; + content: '\1f5ea'; +} +.add-bubble div:hover { + transform: scale(1.2, 1.2); +} + +/* file diff icons */ +.icon-diff-modified:before { + color: #d0b44c; +} +.icon-diff-removed:before { + color: #bd2c00; +} +.icon-diff-added:before { + color: #6cc644; +} +.icon-diff-renamed:before { + color: #677a85; +} diff --git a/kallithea/front-end/kallithea-labels.less b/kallithea/front-end/kallithea-labels.less new file mode 100644 --- /dev/null +++ b/kallithea/front-end/kallithea-labels.less @@ -0,0 +1,94 @@ +.label-meta { + color: #000; +} +.label-meta[data-tag="dead"] { + background-color: #E44; +} +.label-meta[data-tag="stale"] { + background-color: #EA4; +} +.label-meta[data-tag="featured"] { + background-color: #AEA; +} +.label-meta[data-tag="requires"] { + background-color: #9CF; +} +.label-meta[data-tag="recommends"] { + background-color: #BDF; +} +.label-meta[data-tag="lang"] { + background-color: #FAF474; +} +.label-meta[data-tag="license"] { + border: solid 1px #9CF; + background-color: #DEF; +} +.label-meta[data-tag="see"] { + border: solid 1px #CBD; + background-color: #EDF; +} +a.label-metameta[data-tag="license"]:hover { + background-color: @kallithea-theme-main-color; + color: #FFF; + text-decoration: none; +} + +/* repository vcs "alias" */ +.label-repo { + border: 1px solid; + color: inherit; + text-transform: uppercase; + padding: .2em .3em 0; +} + +/* permission labels */ +.label-admin { + background-color: #B94A48; + color: #ffffff; +} +.label-write { + background-color: #DB7525; + color: #ffffff; +} +.label-read { + background-color: #468847; + color: #ffffff; +} +.label-none { + background-color: #bfbfbf; + color: #ffffff; +} + +/* changeset labels */ +.label-merge { + background-color: #fca062; + color: #ffffff; + text-transform: uppercase; +} +.label-bookmark { + border: 1px solid #46A546; + color: #46A546; +} +.label-tag { + border: 1px solid #62cffc; + color: #62cffc; +} +.label-bumped, +.label-divergent, +.label-extinct, +.label-unstable { + background-color: #f00; + border-color: #600; + color: #fff; +} +.label-phase { + border: 1px solid #1F14CE; + color: #1F14CE; +} +.label-branch { + border: 1px solid #d9e8f8; + color: #577632; +} +.extra-container > .label { + padding-bottom: 0.2em; +} diff --git a/kallithea/front-end/kallithea-select2.less b/kallithea/front-end/kallithea-select2.less new file mode 100644 --- /dev/null +++ b/kallithea/front-end/kallithea-select2.less @@ -0,0 +1,68 @@ +// Style these like Bootstrap ".navbar-inverse .navbar-nav > li" +.branch-switcher.select2-container, +.repo-switcher.select2-container { + > a.select2-choice.select2-default { + line-height: @line-height-computed; + height: @navbar-height; + padding: @nav-link-padding; + padding-top: @navbar-padding-vertical; + padding-bottom: @navbar-padding-vertical; + color: @navbar-inverse-link-color !important; + background: inherit; + &:hover { + color: @navbar-inverse-link-hover-color !important; + background-color: @navbar-inverse-link-hover-bg; + } + border: inherit; + border-radius: inherit; + box-shadow: inherit; + > .select2-chosen { + margin-right: inherit; // don't leave room for .select2-arrow + line-height: inherit; + } + > .select2-arrow { + display: none; + } + } +} + +// Style these like Bootstrap .dropdown-menu +.branch-switcher-dropdown.select2-drop.select2-drop-active, +.repo-switcher-dropdown.select2-drop.select2-drop-active { + color: inherit; + background-color: @dropdown-bg; + border: 1px solid @dropdown-border; + .box-shadow(0 6px 12px rgba(0,0,0,.175)); + > .select2-results { + color: @dropdown-link-color; + .select2-highlighted { + color: @dropdown-link-hover-color; + background-color: @dropdown-link-hover-bg; + } + } +} + +.select2-container { + /* select2 already has border and padding, remove bootstrap form-control border and padding */ + &.form-control { + border: 0; + padding: 0; + } + /* make select2 as big as form-controls */ + .select2-choice { + height: 100%; + } + .select2-chosen { + line-height: @input-height-base - 2; /* subtract border width */ + } +} + +/* highlight query in user autocomplete search results */ +.select2-results .match { + font-weight: 700; +} + +/* fix select2 input style if input-sm is used */ +.select2-container.input-sm input { + .input-sm; +} diff --git a/kallithea/front-end/kallithea-variables.less b/kallithea/front-end/kallithea-variables.less new file mode 100644 --- /dev/null +++ b/kallithea/front-end/kallithea-variables.less @@ -0,0 +1,52 @@ +/* basic variables */ +@kallithea-theme-main-color: #577632; +@kallithea-theme-inverse-color: #FFF; +@kallithea-theme-inverse-bg: @kallithea-theme-main-color; +@kallithea-panel-margin: 10px; + +/* logo */ +@kallithea-logo-url: "../images/kallithea-logo.svg"; +@kallithea-logo-width: 140px; +@kallithea-logo-height: 30px; +@kallithea-logo-bottom: 4px; + +/* bootstrap override */ +@brand-primary: @kallithea-theme-main-color; +@link-hover-color: darken(@kallithea-theme-main-color, 20.0%); +@btn-default-bg: #E7E7E7; +@font-family-monospace: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace; +@navbar-height: 36px; +@navbar-margin-bottom: @kallithea-panel-margin; +@navbar-inverse-color: @kallithea-theme-inverse-color; +@navbar-inverse-bg: @kallithea-theme-inverse-bg; +@navbar-inverse-border: @kallithea-theme-inverse-bg; +@navbar-inverse-link-color: @kallithea-theme-inverse-color; +@navbar-inverse-link-hover-color: tint(@kallithea-theme-inverse-color, 15.0%); +@navbar-inverse-link-hover-bg: tint(@kallithea-theme-inverse-bg, 15.0%); +@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color; +@navbar-inverse-link-active-bg: @navbar-inverse-link-hover-bg; +@navbar-inverse-toggle-hover-bg: @navbar-inverse-link-hover-bg; +@navbar-inverse-toggle-border-color:@kallithea-theme-inverse-bg; +@nav-pills-active-link-hover-color: @navbar-inverse-color; +@nav-pills-active-link-hover-bg: @navbar-inverse-bg; +@nav-link-padding: 8px 10px; /* default: 10px 15px */ +@dropdown-link-color: @navbar-inverse-color; +@dropdown-bg: @navbar-inverse-bg; +@dropdown-link-hover-color: @navbar-inverse-link-hover-color; +@dropdown-link-hover-bg: @navbar-inverse-link-hover-bg; +@grid-gutter-width: 2 * @kallithea-panel-margin; /* default: 30px */ +@panel-heading-padding: 5px 15px; /* default: 10px 15px */ +@panel-primary-text: @kallithea-theme-inverse-color; +@panel-primary-heading-bg: @kallithea-theme-inverse-bg; +@panel-primary-border: @panel-primary-heading-bg; +@headings-font-weight: 700; +@table-cell-padding: 2px 4px; +@icon-font-path: ; /* no glyphicons */ +@icon-font-name: none; + +/* custom variables */ +@highlight-color: #FAFFA6; +@highlight-line-color: #DDE7EF; +@add-bg-color: #BBFFBB; +@change-bg-color: #DDDDDD; +@delete-bg-color: #FF8888; diff --git a/kallithea/front-end/main.less b/kallithea/front-end/main.less new file mode 100644 --- /dev/null +++ b/kallithea/front-end/main.less @@ -0,0 +1,28 @@ +/*! + * Don't edit the css file directly. + * + * Instead, edit the less file(s) and regenerate the css: + * + * npm install + * npm run less + * + */ + +/* 3rd party styles */ +@import "node_modules/bootstrap/less/bootstrap.less"; +@import (inline) "node_modules/datatables.net-bs/css/dataTables.bootstrap.css"; +@import (inline) "node_modules/at.js/dist/css/jquery.atwho.css"; +@import (less) "node_modules/select2/select2.css"; +@import (less) "node_modules/select2-bootstrap-css/select2-bootstrap.css"; +@import (less) "tmp/pygments.css"; +@import (less) "../public/fontello/css/kallithea.css"; + +/* kallithea styles */ +@import "kallithea-variables.less"; +@import "kallithea-labels.less"; +@import "kallithea-select2.less"; +@import "kallithea-diff.less"; +@import "style.less"; + +/* finally, import the optional theme file with local customizations */ +@import (optional) "theme.less"; diff --git a/kallithea/front-end/package.json b/kallithea/front-end/package.json new file mode 100644 --- /dev/null +++ b/kallithea/front-end/package.json @@ -0,0 +1,21 @@ +{ + "name": "kallithea", + "private": true, + "dependencies": { + "at.js": "1.5.4", + "bootstrap": "3.3.7", + "codemirror": "4.7", + "datatables.net": "1.10.13", + "datatables.net-bs": "1.10.13", + "jquery": "1.12.3", + "jquery.caret": "0.3.1", + "jquery.flot": "0.8.3", + "select2": "3.5.1", + "select2-bootstrap-css": "1.2.4" + }, + "devDependencies": { + "less": "~2.7", + "less-plugin-clean-css": "~1.5", + "license-checker": "24.1.0" + } +} diff --git a/kallithea/public/css/style.css b/kallithea/front-end/style.less rename from kallithea/public/css/style.css rename to kallithea/front-end/style.less --- a/kallithea/public/css/style.css +++ b/kallithea/front-end/style.less @@ -1,4818 +1,645 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td { - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; - background: transparent; - margin: 0; - padding: 0; -} - body { - line-height: 1; - height: 100%; - background: url("../images/background.png") repeat scroll 0 0 #B0B0B0; - font-family: Lucida Grande, Verdana, Lucida Sans Regular, Lucida Sans Unicode, Arial, sans-serif; - color: #000; - margin: 0; - padding: 0; - font-size: 12px; -} - -ol, ul { - list-style: none; -} - -blockquote, q { - quotes: none; -} - -blockquote:before, blockquote:after, q:before, q:after { - content: none; -} - -:focus { - outline: 0; -} - -del { - text-decoration: line-through; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -html { - height: 100%; + background: url("../images/background.png") repeat scroll 0 0 #B0B0B0; } -a { - color: #577632; - text-decoration: none; - cursor: pointer; -} - -a:hover { - color: #576622; - text-decoration: underline; -} - -h1, h2, h3, h4, h5, h6, -div.h1, div.h2, div.h3, div.h4, div.h5, div.h6 { - color: #292929; - font-weight: 700; -} - -h1, div.h1 { - font-size: 22px; -} - -h2, div.h2 { - font-size: 20px; -} - -h3, div.h3 { - font-size: 18px; -} - -h4, div.h4 { - font-size: 16px; -} - -h5, div.h5 { - font-size: 14px; -} - -h6, div.h6 { - font-size: 11px; -} - -ul.circle { - list-style-type: circle; -} - -ul.disc { - list-style-type: disc; -} - -ul.square { - list-style-type: square; -} - -ol.lower-roman { - list-style-type: lower-roman; +/* pseude content that should not be selected or copied by the user */ +[data-pseudo-content]:before { + content: attr(data-pseudo-content); } -ol.upper-roman { - list-style-type: upper-roman; -} - -ol.lower-alpha { - list-style-type: lower-alpha; -} - -ol.upper-alpha { - list-style-type: upper-alpha; -} - -ol.decimal { - list-style-type: decimal; -} - -div.color { - clear: both; - overflow: hidden; - position: absolute; - background: #FFF; - margin: 7px 0 0 60px; - padding: 1px 1px 1px 0; -} - -div.color a { - width: 15px; - height: 15px; - display: block; - float: left; - margin: 0 0 0 1px; - padding: 0; -} - -div.options { - clear: both; - overflow: hidden; - position: absolute; - background: #FFF; - margin: 7px 0 0 162px; - padding: 0; -} - -div.options a { - height: 1%; - display: block; - text-decoration: none; - margin: 0; - padding: 3px 8px; +/* class for texts where newlines should be preserved, for very light-weight ascii art markup (like pull request descriptions) */ +.formatted-fixed { + font-family: @font-family-monospace; + white-space: pre-wrap; } -code, -.code pre, -div.readme .readme_box pre, -div.rst-block pre, -.CodeMirror .CodeMirror-code pre { - font-size: 12px; - font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace; -} - -.top-left-rounded-corner { - border-top-left-radius: 8px; -} - -.top-right-rounded-corner { - border-top-right-radius: 8px; -} - -.bottom-left-rounded-corner { - border-bottom-left-radius: 8px; -} - -.bottom-right-rounded-corner { - border-bottom-right-radius: 8px; -} - -.top-left-rounded-corner-mid { - border-top-left-radius: 4px; -} - -.top-right-rounded-corner-mid { - border-top-right-radius: 4px; -} - -.bottom-left-rounded-corner-mid { - border-bottom-left-radius: 4px; -} - -.bottom-right-rounded-corner-mid { - border-bottom-right-radius: 4px; -} - -.help-block { - color: #999999; - display: block; - margin-bottom: 0; - margin-top: 5px; -} - -.empty_data { - color: #B9B9B9; -} - -.truncate { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; - -ms-text-overflow: ellipsis; -} - -.truncate.autoexpand:hover { - overflow: visible; +/* use monospace for changeset hashes */ +.changeset_hash { + font-family: @font-family-monospace; } -a.permalink { - visibility: hidden; - position: absolute; - margin: 3px 4px; -} - -a.permalink:hover { - text-decoration: none; -} - -h1:hover > a.permalink, -h2:hover > a.permalink, -h3:hover > a.permalink, -h4:hover > a.permalink, -h5:hover > a.permalink, -h6:hover > a.permalink, -div:hover > a.permalink, -div:hover > span > a.permalink { - visibility: visible; -} - -#header #logo { - padding-left: 10px; -} - -div.header img { - padding-top: 5px; -} - -#header #logo div.header, -#header #logo div.branding { - font-size: 20px; - color: white; - float: left; - height: 44px; - line-height: 44px; - margin-right: 5px; -} - -#header ul#logged-user { - margin-bottom: 5px !important; - border-radius: 0px 0px 8px 8px; - height: 37px; - background-color: #577632; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #577632, #577632); - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); -} - -#header ul#logged-user li { - list-style: none; - float: left; - margin: 8px 0 0; - padding: 4px 12px; - border-left: 1px solid #576622; -} - -#header ul#logged-user li.first { - border-left: none; - margin: 4px; -} - -#header ul#logged-user li.first div.gravatar { - margin-top: -2px; -} - -#header ul#logged-user li.first div.account { - padding-top: 4px; - float: left; -} - -#header ul#logged-user li.last { - border-right: none; -} - -#header ul#logged-user li a { - color: #fff; - font-weight: 700; - text-decoration: none; -} - -#header ul#logged-user li a:hover { - text-decoration: underline; -} - -#header ul#logged-user li.highlight a { - color: #fff; -} - -#header ul#logged-user li.highlight a:hover { - color: #FFF; -} -#header-dd { - clear: both; - position: fixed !important; - background-color: #577632; - opacity: 0.01; - cursor: pointer; - min-height: 10px; - width: 100% !important; - border-radius: 0px 0px 4px 4px; -} - -#header-dd:hover { - opacity: 0.2; - transition: opacity 0.5s ease-in-out; +/* Note: class 'icon-empty' or 'icon-gravatar' can be used to get icon-ish styling without an actual glyph */ +i[class^='icon-empty'], +i[class^='icon-gravatar'] { + background-repeat: no-repeat; + background-position: center; + display: inline-block; + min-width: 16px; + min-height: 16px; + margin: -2px 0 -4px 0; } -#header #header-inner { - min-height: 44px; - clear: both; - position: relative; - background-color: #577632; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #577632, #577632); - margin: 0; - padding: 0; - display: block; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); - border-radius: 0px 0px 4px 4px; -} -#header #header-inner.hover { - width: 100% !important; - border-radius: 0px 0px 0px 0px; - position: fixed !important; - z-index: 10000; -} - -.header-pos-fix, .anchor { - margin-top: -46px; - padding-top: 46px; +.inline-comments-general.show-general-status .hidden.general-only { + display: block !important; } - -#header #header-inner #home a { - height: 40px; - width: 46px; - display: block; - background-position: 0 0; - margin: 0; - padding: 0; -} - -#header #header-inner #home a:hover { - background-position: 0 -40px; +.truncate { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + -ms-text-overflow: ellipsis; } - -#header #header-inner #logo { - float: left; - position: absolute; -} - -#header #header-inner #logo h1 { - color: #FFF; - font-size: 20px; - margin: 12px 0 0 13px; - padding: 0; -} - -#header #header-inner #logo a { - color: #fff; - text-decoration: none; -} - -#header #header-inner #logo a:hover { - color: #bfe3ff; +.truncate.autoexpand:hover { + overflow: visible; } -#header #header-inner #quick { - position: relative; - float: right; - list-style-type: none; - list-style-position: outside; - margin: 4px 8px 0 0; - padding: 0; - border-radius: 4px; -} - -#header #header-inner #quick li span.short { - padding: 9px 6px 8px 6px; -} - -#header #header-inner #quick li span { - display: inline; - margin: 0; -} - -#header #header-inner #quick li span.normal { - border: none; - padding: 10px 12px 8px; -} - -#header #header-inner #quick li span.icon { - border-left: none; - padding-left: 10px; +/* show comment anchors when hovering over panel-heading */ +a.permalink { + visibility: hidden; } - -#header #header-inner #quick li span.icon_short { - top: 0; - left: 0; - border-left: none; - border-right: 1px solid #2e5c89; - padding: 8px 6px 4px; -} - -#header #header-inner #quick li span.icon img, -#header #header-inner #quick li span.icon_short img { - vertical-align: middle; - margin-bottom: 2px; -} - -#header #header-inner #quick ul.repo_switcher { - max-height: 275px; - overflow-x: hidden; - overflow-y: auto; -} - -#header #header-inner #quick ul.repo_switcher li.qfilter_rs { - padding: 2px 3px; - padding-right: 17px; -} - -#header #header-inner #quick ul.repo_switcher li.qfilter_rs input { - width: 100%; - border-radius: 10px; - padding: 2px 7px; +.panel-heading:hover .permalink { + visibility: visible; } -#header #header-inner #quick .repo_switcher_type { - position: absolute; - left: 0; - top: 9px; - margin: 0px 2px 0px 2px; -} - -.groups_breadcrumbs a { - color: #fff; -} - -.groups_breadcrumbs a:hover { - color: #bfe3ff; - text-decoration: none; -} - -td.quick_repo_menu:before { - font-family: "kallithea"; - content: "\23f5"; /* triangle-right */ - margin-left: 3px; - padding-right: 3px; -} - -td.quick_repo_menu { - cursor: pointer; - width: 8px; - border: 1px solid transparent; -} - -td.quick_repo_menu.active:before { - font-family: "kallithea"; - content: "\23f7"; /* triangle-down */ - margin-left: 1px; - padding-right: 1px; -} - -td.quick_repo_menu.active { - border: 1px solid #577632; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); - cursor: pointer; +.navbar-inverse { + border: none; } -td.quick_repo_menu .menu_items { - margin-top: 5px; - margin-left: -6px; - width: 150px; - position: absolute; - background-color: #FFF; - background: none repeat scroll 0 0 #FFFFFF; - border-color: #577632 #666666 #666666; - border-right: 1px solid #666666; - border-style: solid; - border-width: 1px; - box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2); - border-top-style: none; -} - -td.quick_repo_menu .menu_items li { - padding: 0 !important; -} - -td.quick_repo_menu .menu_items a { - display: block; - padding: 4px 12px 4px 8px; -} - -td.quick_repo_menu .menu_items a:hover { - background-color: #EEE; - text-decoration: none; +/* logo */ +nav.navbar.mainmenu > .navbar-header > .navbar-brand { + font-size: 20px; + padding-top: 12px; + > .branding:before { + content: ""; + display: inline-block; + margin-right: .2em; + background-image: url(@kallithea-logo-url); + width: @kallithea-logo-width; + height: @kallithea-logo-height; + margin-bottom: -@kallithea-logo-bottom; + margin-top: -12px; + } } -td.quick_repo_menu .menu_items .icon img { - margin-bottom: -2px; -} - -td.quick_repo_menu .menu_items.hidden { - display: none; -} - -.dt_repo { - white-space: nowrap; - color: #577632; -} - -.dt_repo_pending { - opacity: 0.5; -} - -.dt_repo i.icon-keyhole-circled, -.dt_repo i.icon-globe -{ - font-size: 16px; - vertical-align: -2px; - margin: 0px 1px 0px 3px; -} - -.dt_repo a { - text-decoration: none; -} - -.dt_repo .dt_repo_name:hover { - text-decoration: underline; -} - -.yui-dt-first th { - text-align: left; +/* code highlighting */ +/* don't use bootstrap style for code blocks */ +.code-highlighttable pre { + background: inherit; + border: 0; } -/* - Copyright (c) 2011, Yahoo! Inc. All rights reserved. - Code licensed under the BSD License: - http://developer.yahoo.com/yui/license.html - version: 2.9.0 -*/ -.yui-skin-sam .yui-dt-mask { - position: absolute; - z-index: 9500; -} -.yui-dt-tmp { - position: absolute; - left: -9000px; -} -.yui-dt-scrollable .yui-dt-bd { overflow: auto } -.yui-dt-scrollable .yui-dt-hd { - overflow: hidden; - position: relative; -} -.yui-dt-scrollable .yui-dt-bd thead tr, -.yui-dt-scrollable .yui-dt-bd thead th { - position: absolute; - left: -1500px; -} -.yui-skin-sam thead .yui-dt-sortable { cursor: pointer } -.yui-skin-sam thead .yui-dt-draggable { cursor: move } -.yui-dt-coltarget { - position: absolute; - z-index: 999; -} -.yui-dt-hd { zoom: 1 } -th.yui-dt-resizeable .yui-dt-resizerliner { position: relative } -.yui-dt-resizer { - position: absolute; - right: 0; - bottom: 0; - height: 100%; - cursor: e-resize; - cursor: col-resize; - background-color: #CCC; - opacity: 0; -} -.yui-dt-resizerproxy { - visibility: hidden; - position: absolute; - z-index: 9000; - background-color: #CCC; - opacity: 0; -} -th.yui-dt-hidden .yui-dt-liner, -td.yui-dt-hidden .yui-dt-liner, -th.yui-dt-hidden .yui-dt-resizer { display: none } -.yui-dt-editor, -.yui-dt-editor-shim { - position: absolute; - z-index: 9000; -} -.yui-skin-sam .yui-dt table { - margin: 0; - padding: 0; - font-family: arial; - font-size: inherit; - border-collapse: separate; - border-spacing: 0; - border: 1px solid #7f7f7f; -} -.yui-skin-sam .yui-dt thead { border-spacing: 0 } -.yui-skin-sam .yui-dt caption { - color: #000; - font-size: 85%; - font-weight: normal; - font-style: italic; - line-height: 1; - padding: 1em 0; - text-align: center; -} -.yui-skin-sam .yui-dt th, -.yui-skin-sam .yui-dt th a { - font-weight: normal; - text-decoration: none; - color: #000; - vertical-align: bottom; -} -.yui-skin-sam .yui-dt th { - margin: 0; - padding: 0; - border: 0; - border-right: 1px solid #cbcbcb; -} -.yui-skin-sam .yui-dt tr.yui-dt-first td { border-top: 1px solid #7f7f7f } -.yui-skin-sam .yui-dt th .yui-dt-liner { white-space: nowrap } -.yui-skin-sam .yui-dt-liner { - margin: 0; - padding: 0; -} -.yui-skin-sam .yui-dt-coltarget { - width: 5px; - background-color: red; -} -.yui-skin-sam .yui-dt td { - margin: 0; - padding: 0; - border: 0; - border-right: 1px solid #cbcbcb; - text-align: left; -} -.yui-skin-sam .yui-dt-list td { border-right: 0 } -.yui-skin-sam .yui-dt-resizer { width: 6px } -.yui-skin-sam .yui-dt-mask { - background-color: #000; - opacity: .25; -} -.yui-skin-sam .yui-dt-message { background-color: #FFF } -.yui-skin-sam .yui-dt-scrollable table { border: 0 } -.yui-skin-sam .yui-dt-scrollable .yui-dt-hd { - border-left: 1px solid #7f7f7f; - border-top: 1px solid #7f7f7f; - border-right: 1px solid #7f7f7f; -} -.yui-skin-sam .yui-dt-scrollable .yui-dt-bd { - border-left: 1px solid #7f7f7f; - border-bottom: 1px solid #7f7f7f; - border-right: 1px solid #7f7f7f; - background-color: #FFF; -} -.yui-skin-sam .yui-dt-scrollable .yui-dt-data tr.yui-dt-last td { border-bottom: 1px solid #7f7f7f } -.yui-skin-sam th.yui-dt-asc, -.yui-skin-sam th.yui-dt-sortable .yui-dt-label { margin-right: 10px } - -.yui-skin-sam th.yui-dt-asc .yui-dt-liner:after { - font-family: "kallithea"; - content: "\23f6"; /* triangle-up */ +/* every direct child of a panel, that is not .panel-heading, should auto + * overflow to prevent overflowing of elements like text boxes and tables */ +.panel > :not(.panel-heading){ + overflow-x: auto; + min-height: 0.01%; } -.yui-skin-sam th.yui-dt-desc .yui-dt-liner:after { - font-family: "kallithea"; - content: "\23f7"; /* triangle-down */ +/* allow other exceptions to automatic overflow-x */ +.panel > .overflow-x-visible { + overflow-x: visible; } -tbody .yui-dt-editable { cursor: pointer } -.yui-dt-editor { - text-align: left; - background-color: #f2f2f2; - border: 1px solid #808080; - padding: 6px; -} -.yui-dt-editor label { - padding-left: 4px; - padding-right: 6px; -} -.yui-dt-editor .yui-dt-button { - padding-top: 6px; - text-align: right; -} -.yui-skin-sam th.yui-dt-highlighted, -.yui-skin-sam th.yui-dt-highlighted a { background-color: #b2d2ff } -.yui-skin-sam tr.yui-dt-highlighted, -.yui-skin-sam tr.yui-dt-highlighted td.yui-dt-asc, -.yui-skin-sam tr.yui-dt-highlighted td.yui-dt-desc { - cursor: pointer; - background-color: #b2d2ff; -} -.yui-skin-sam .yui-dt-list th.yui-dt-highlighted, -.yui-skin-sam .yui-dt-list th.yui-dt-highlighted a { background-color: #b2d2ff } -.yui-skin-sam .yui-dt-list tr.yui-dt-highlighted, -.yui-skin-sam .yui-dt-list tr.yui-dt-highlighted td.yui-dt-asc, -.yui-skin-sam .yui-dt-list tr.yui-dt-highlighted td.yui-dt-desc { - cursor: pointer; - background-color: #b2d2ff; -} -.yui-skin-sam th.yui-dt-selected, -.yui-skin-sam th.yui-dt-selected a { background-color: #446cd7 } -.yui-skin-sam tr.yui-dt-selected td, -.yui-skin-sam tr.yui-dt-selected td.yui-dt-asc, -.yui-skin-sam tr.yui-dt-selected td.yui-dt-desc { - background-color: #426fd9; - color: #FFF; -} -.yui-skin-sam .yui-dt-list th.yui-dt-selected, -.yui-skin-sam .yui-dt-list th.yui-dt-selected a { background-color: #446cd7 } -.yui-skin-sam .yui-dt-list tr.yui-dt-selected td, -.yui-skin-sam .yui-dt-list tr.yui-dt-selected td.yui-dt-asc, -.yui-skin-sam .yui-dt-list tr.yui-dt-selected td.yui-dt-desc { - background-color: #426fd9; - color: #FFF; -} -.yui-skin-sam .yui-dt-paginator { - display: block; - margin: 6px 0; - white-space: nowrap; -} -.yui-skin-sam .yui-dt-paginator .yui-dt-first, -.yui-skin-sam .yui-dt-paginator .yui-dt-last, -.yui-skin-sam .yui-dt-paginator .yui-dt-selected { padding: 2px 6px } -.yui-skin-sam .yui-dt-paginator a.yui-dt-first, -.yui-skin-sam .yui-dt-paginator a.yui-dt-last { text-decoration: none } -.yui-skin-sam .yui-dt-paginator .yui-dt-previous, -.yui-skin-sam .yui-dt-paginator .yui-dt-next { display: none } -.yui-skin-sam a.yui-dt-page { - border: 1px solid #cbcbcb; - padding: 2px 6px; - text-decoration: none; - background-color: #fff; -} -.yui-skin-sam .yui-dt-selected { - border: 1px solid #fff; - background-color: #fff; -} - -#content #left { - left: 0; - width: 280px; - position: absolute; -} - -#content #right { - margin: 0 60px 10px 290px; -} - -#content div.box { - clear: both; - background: #fff; - margin: 0 0 10px; - padding: 0 0 10px; - border-radius: 4px 4px 4px 4px; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); -} - -#content div.box-left { - width: 49%; - clear: none; - float: left; - margin: 0 0 10px; +/* margin below PR comments */ +.comment > .panel, +/* margin below top level panels */ +#main > .panel { + margin-bottom: @kallithea-panel-margin; } -#content div.box-right { - width: 49%; - clear: none; - float: right; - margin: 0 0 10px; -} - -#content div.box div.title { - clear: both; - overflow: hidden; - background-color: #577632; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #577632, #577632); - margin: 0 0 20px; - padding: 0; - border-radius: 4px 4px 0 0; -} - -#content div.box div.title h5 { - float: left; - border: none; - color: #fff; - margin: 0; - padding: 11px 0 11px 10px; -} - -#content div.box div.title .link-white { - color: #FFFFFF; -} - -#content div.box div.title .link-white.current { - color: #BFE3FF; -} - -#content div.box div.title ul.links li { - list-style: none; - float: left; - margin: 0; - padding: 0; -} - -#content div.box div.title ul.links li a { - font-size: 13px; - font-weight: 700; - height: 1%; - margin: 4px; - text-decoration: none; +/* search highlighting */ +div.search-code-body pre .match { + background-color: @highlight-color; } - -#content div.box div.title ul.links.nav-tabs li a { - float: left; - color: #fff; - margin: 0; - padding: 11px 10px 11px 10px; -} - -#content div.box div.title ul.links.icon-only-links li a { - float: left; - color: #fff; - margin: 0; - padding: 11px 10px 11px 10px; -} - -#content div.box h1, -#content div.box h2, -#content div.box h3, -#content div.box h4, -#content div.box h5, -#content div.box h6, -#content div.box div.h1, -#content div.box div.h2, -#content div.box div.h3, -#content div.box div.h4, -#content div.box div.h5, -#content div.box div.h6 { - clear: both; - overflow: hidden; - margin: 8px 20px 3px; - padding-bottom: 2px; -} - -#content div.box div.normal-indent { - margin: 0 20px 10px 20px; -} - -#content div.box p { - color: #5f5f5f; - font-size: 12px; - line-height: 150%; - margin: 0 24px 10px; - padding: 0; -} - -#content div.box blockquote { - border-left: 4px solid #DDD; - color: #5f5f5f; - font-size: 11px; - line-height: 150%; - margin: 0 34px; - padding: 0 0 0 14px; -} - -#content div.box blockquote p { - margin: 10px 0; - padding: 0; +div.search-code-body pre .break { + background-color: @highlight-line-color; + width: 100%; + display: block; } -#content div.box dl { - margin: 10px 0px; -} - -#content div.box dt { - font-size: 12px; - margin: 0; -} - -#content div.box dd { - font-size: 12px; - margin: 0; - padding: 8px 0 8px 15px; -} - -#content div.box li { - font-size: 12px; - padding: 4px 0; -} - -#content div.box ul.disc, -#content div.box ul.circle { - margin: 10px 24px 10px 38px; -} - -#content div.box ul.square { - margin: 10px 24px 10px 40px; -} - -#content div.box img.left { - border: none; - float: left; - margin: 10px 10px 10px 0; -} - -#content div.box img.right { - border: none; - float: right; - margin: 10px 0 10px 10px; -} - -#content div.box div.messages { - clear: both; - overflow: hidden; - margin: 0 20px; - padding: 0; +/* use @alert-danger-text for form error messages and .alert-danger for the input element */ +.form-group .error-message { + color: @alert-danger-text; + display: inline-block; + padding-top: 5px; + &:empty{ + display: none; + } } - -#content div.box div.message { - clear: both; - overflow: hidden; - margin: 0; - padding: 5px 0; - white-space: pre-wrap; -} -#content div.box div.expand { - width: 110%; - height: 14px; - font-size: 10px; - text-align: center; - cursor: pointer; - color: #666; - background: linear-gradient(to bottom,rgba(255,255,255,0),rgba(64,96,128,0.1)); - display: none; - overflow: hidden; -} -#content div.box div.expand .expandtext { - background-color: #ffffff; - padding: 2px; - border-radius: 2px; -} - -#content div.box div.message a { - font-weight: 400 !important; -} - -#content div.box div.message div.image { - float: left; - margin: 9px 0 0 5px; - padding: 6px; -} - -#content div.box div.message div.image img { - vertical-align: middle; - margin: 0; -} - -#content div.box div.message div.text { - float: left; - margin: 0; - padding: 9px 6px; -} - -#content div.box div.message div.text h1, -#content div.box div.message div.text h2, -#content div.box div.message div.text h3, -#content div.box div.message div.text h4, -#content div.box div.message div.text h5, -#content div.box div.message div.text h6 { - border: none; - margin: 0; - padding: 0; +input.error { + .alert-danger; } -#content div.box div.message div.text span { - height: 1%; - display: block; - margin: 0; - padding: 5px 0 0; -} - -#content div.box div.message-error { - height: 1%; - clear: both; - overflow: hidden; - background: #FBE3E4; - border: 1px solid #FBC2C4; - color: #860006; -} - -#content div.box div.message-error h6 { - color: #860006; +/* datatable */ +.dataTables_left { + .pull-left; } - -#content div.box div.message-warning { - height: 1%; - clear: both; - overflow: hidden; - background: #FFF6BF; - border: 1px solid #FFD324; - color: #5f5200; -} - -#content div.box div.message-warning h6 { - color: #5f5200; -} - -#content div.box div.message-notice { - height: 1%; - clear: both; - overflow: hidden; - background: #8FBDE0; - border: 1px solid #6BACDE; - color: #003863; -} - -#content div.box div.message-notice h6 { - color: #003863; +.dataTables_right { + .pull-right; } -#content div.box div.message-success { - height: 1%; - clear: both; - overflow: hidden; - background: #E6EFC2; - border: 1px solid #C6D880; - color: #4e6100; -} - -#content div.box div.message-success h6 { - color: #4e6100; -} - -#content div.box div.form div.fields div.field { - height: 1%; - min-height: 12px; - border-bottom: 1px solid #DDD; - clear: both; - margin: 0; - padding: 10px 0; -} - -#content div.box div.form div.fields div.field-first { - padding: 0 0 10px; -} - -#content div.box div.form div.fields div.field-noborder { - border-bottom: 0 !important; -} - -#content div.box div.form div.fields div.field span.error-message { - height: 1%; - display: inline-block; - color: red; - margin: 8px 0 0 4px; - padding: 0; -} - -#content div.box div.form div.fields div.field span.success { - height: 1%; - display: block; - color: #316309; - margin: 8px 0 0; - padding: 0; -} - -#content div.box div.form div.fields div.field div.label { - left: 70px; - width: 155px; - position: absolute; - margin: 0; - padding: 5px 0 0 0px; -} - -#content div.box div.form div.fields div.field div.label-summary { - left: 30px; - width: 155px; - position: absolute; - margin: 0; - padding: 0px 0 0 0px; +/* make all datatable paginations small */ +.dataTables_paginate .pagination { + .pagination-sm; } -#content div.box-left div.form div.fields div.field div.label, -#content div.box-right div.form div.fields div.field div.label, -#content div.box-left div.form div.fields div.field div.label, -#content div.box-left div.form div.fields div.field div.label-summary, -#content div.box-right div.form div.fields div.field div.label-summary, -#content div.box-left div.form div.fields div.field div.label-summary { - clear: both; - overflow: hidden; - left: 0; - width: auto; - position: relative; - margin: 0; - padding: 0 0 8px; -} - -#content div.box div.form div.fields div.field div.label-select { - padding: 5px 0 0 5px; -} - -#content div.box-left div.form div.fields div.field div.label-select, -#content div.box-right div.form div.fields div.field div.label-select { - padding: 0 0 8px; -} - -#content div.box-left div.form div.fields div.field div.label-textarea, -#content div.box-right div.form div.fields div.field div.label-textarea { - padding: 0 0 8px !important; -} - -#content div.box div.form div.fields div.field div.label label, -div.label label { - color: #393939; - font-weight: 700; -} -#content div.box div.form div.fields div.field div.label label, -div.label-summary label { - color: #393939; - font-weight: 700; -} -#content div.box div.form div.fields div.field div.input { - margin: 0 0 0 200px; -} - -#content div.box div.form div.fields div.field div.input.summary { - margin: 0 0 0 110px; -} -#content div.box div.form div.fields div.field div.input.summary-short { - margin: 0 0 0 110px; -} -#content div.box div.form div.fields div.field div.file { - margin: 0 0 0 200px; -} -#content div.box div.form div.fields div.field div.editor { - margin: 0 0 0 200px; -} - -#content div.box-left div.form div.fields div.field div.input, -#content div.box-right div.form div.fields div.field div.input { - margin: 0 0 0 0px; -} - -#content div.box div.form div.fields div.field div.input input, -.reviewer_ac input { - background: #FFF; - border-top: 1px solid #b3b3b3; - border-left: 1px solid #b3b3b3; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; - color: #000; - font-size: 12px; - margin: 0; - padding: 7px 7px 6px; -} - -#content div.box div.form div.fields div.field div.input input#clone_url, -#content div.box div.form div.fields div.field div.input input#clone_url_id -{ - font-size: 14px; - padding: 0 2px; -} - -#content div.box div.form div.fields div.field div.file input { - background: none repeat scroll 0 0 #FFFFFF; - border-color: #B3B3B3 #EAEAEA #EAEAEA #B3B3B3; - border-style: solid; - border-width: 1px; - color: #000000; - font-size: 12px; - margin: 0; - padding: 7px 7px 6px; -} - -input[readonly], -input.disabled { - background-color: #F5F5F5 !important; -} - -#content div.box div.form div.fields div.field div.input input.small { - width: 30%; -} - -#content div.box div.form div.fields div.field div.input input.medium { - width: 55%; -} - -#content div.box div.form div.fields div.field div.input input.large { - width: 85%; -} - -#content div.box div.form div.fields div.field div.input input.date { - width: 177px; +/* show column sort icons in our font ... and before column header */ +table.dataTable { + .sorting_asc:before { + font-family: "kallithea"; + content: "\23f6"; + padding-right: 8px; + } + .sorting_desc:before { + font-family: "kallithea"; + content: "\23f7"; + padding-right: 8px; + } + .sorting:before { + font-family: "kallithea"; + content: "\2195"; + padding-right: 8px; + opacity: 0.5; + } + .sorting_asc:after, + .sorting_desc:after, + .sorting:after { + content: "" !important; + } } -#content div.box div.form div.fields div.field div.input input.button { - background: #D4D0C8; - border-top: 1px solid #FFF; - border-left: 1px solid #FFF; - border-right: 1px solid #404040; - border-bottom: 1px solid #404040; - color: #000; - margin: 0; - padding: 4px 8px; -} - -#content div.box div.form div.fields div.field div.textarea { - border-top: 1px solid #b3b3b3; - border-left: 1px solid #b3b3b3; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; - margin: 0 0 0 200px; - padding: 7px 7px 6px; -} - -#content div.box div.form div.fields div.field div.textarea-editor { - border: 1px solid #ddd; - padding: 0; -} - -#content div.box div.form div.fields div.field div.textarea textarea { - width: 100%; - height: 220px; - overflow-y: auto; - background: #FFF; - color: #000; - font-size: 12px; - outline: none; - border-width: 0; - margin: 0; - padding: 0; -} - -#content div.box-left div.form div.fields div.field div.textarea textarea, -#content div.box-right div.form div.fields div.field div.textarea textarea { - width: 100%; - height: 100px; -} - -#content div.box div.form div.fields div.field div.textarea table { - width: 100%; - border: none; - margin: 0; - padding: 0; -} - -#content div.box div.form div.fields div.field div.textarea table td { - background: #DDD; - border: none; - padding: 0; -} - -#content div.box div.form div.fields div.field div.textarea table td table { - width: auto; - border: none; - margin: 0; - padding: 0; -} - -#content div.box div.form div.fields div.field div.textarea table td table td { - font-size: 11px; - padding: 5px 5px 5px 0; -} - -#content div.box div.form div.fields div.field input[type=text]:focus, -#content div.box div.form div.fields div.field input[type=password]:focus, -#content div.box div.form div.fields div.field input[type=file]:focus, -#content div.box div.form div.fields div.field textarea:focus, -#content div.box div.form div.fields div.field select:focus, -.reviewer_ac input:focus { - background: #f6f6f6; - border-color: #666; -} - -.reviewer_ac { - padding: 10px -} - -div.form div.fields div.field div.button { - margin: 0; - padding: 0 0 0 8px; -} -#content div.box table.noborder { - border: 1px solid transparent; -} - -#content div.box table { - width: 100%; - border-collapse: separate; - margin: 0; - padding: 0; - border: 1px solid #eee; - border-radius: 4px; -} - -#content div.box table th { - background: #eee; - border-bottom: 1px solid #ddd; - padding: 5px 0px 5px 5px; - text-align: left; -} - -#content div.box table th.left { - text-align: left; -} - -#content div.box table th.right { - text-align: right; -} - -#content div.box table th.center { - text-align: center; -} - -#content div.box table th.selected { - vertical-align: middle; - padding: 0; +/* _dt_elements.html styling - some submit buttons have their own form but should still be shown inline */ +table.dataTable td > .btn + form { + display: inline; } -#content div.box table td { - background: #fff; - border-bottom: 1px solid #cdcdcd; - vertical-align: middle; - padding: 5px; -} - -#content div.box table td.compact { - padding: 0; -} - -#content div.box table tr.selected td { - background: #FFC; -} - -#content div.box table td.selected { - width: 3%; - text-align: center; - vertical-align: middle; - padding: 0; -} - -#content div.box table td.action { - width: 45%; - text-align: left; -} - -#content div.box table td.date { - width: 33%; - text-align: center; -} - -#content div.box div.action { - float: right; - background: #FFF; - text-align: right; - margin: 10px 0 0; - padding: 0; -} - -#content div.box div.action select { - font-size: 11px; - margin: 0; -} - -#content div.box div.action .ui-selectmenu { - margin: 0; - padding: 0; -} - -#content div.box div.pagination { - height: 1%; - clear: both; - overflow: hidden; - margin: 10px 0 0; - padding: 0; -} - -#content div.box div.pagination ul.pager { - float: right; - text-align: right; - margin: 0; - padding: 0; -} - -#content div.box div.pagination ul.pager li { - height: 1%; - float: left; - list-style: none; - background: #ebebeb url("../images/pager.png") repeat-x; - border-top: 1px solid #dedede; - border-left: 1px solid #cfcfcf; - border-right: 1px solid #c4c4c4; - border-bottom: 1px solid #c4c4c4; - color: #4A4A4A; - font-weight: 700; - margin: 0 0 0 4px; - padding: 0; -} - -#content div.box div.pagination ul.pager li.separator { - padding: 6px; -} - -#content div.box div.pagination ul.pager li.current { - background: #b4b4b4 url("../images/pager_selected.png") repeat-x; - border-top: 1px solid #ccc; - border-left: 1px solid #bebebe; - border-right: 1px solid #b1b1b1; - border-bottom: 1px solid #afafaf; - color: #515151; - padding: 6px; -} - -#content div.box div.pagination ul.pager li a { - height: 1%; - display: block; - float: left; - color: #515151; - text-decoration: none; - margin: 0; - padding: 6px; +table.dataTable .dt_repo_pending { + opacity: 0.5; } -#content div.box div.pagination ul.pager li a:hover, -#content div.box div.pagination ul.pager li a:active { - background: #b4b4b4 url("../images/pager_selected.png") repeat-x; - border-top: 1px solid #ccc; - border-left: 1px solid #bebebe; - border-right: 1px solid #b1b1b1; - border-bottom: 1px solid #afafaf; - margin: -1px; -} - -#content div.box div.pagination-right { - float: right; -} - -#content div.box div.pagination-wh { - height: 1%; - overflow: hidden; - text-align: right; - margin: 10px 0 0; - padding: 0; -} - -#content div.box div.pagination-wh > :first-child { - border-radius: 4px 0px 0px 4px; -} - -#content div.box div.pagination-wh > :last-child { - border-radius: 0px 4px 4px 0px; - border-right: 1px solid #cfcfcf; -} - -#content div.box div.pagination-wh a, -#content div.box div.pagination-wh span.pager_dotdot, -#content div.box div.pagination-wh span.yui-pg-previous, -#content div.box div.pagination-wh span.yui-pg-last, -#content div.box div.pagination-wh span.yui-pg-next, -#content div.box div.pagination-wh span.yui-pg-first { - height: 1%; - float: left; - background: #ebebeb url("../images/pager.png") repeat-x; - border-top: 1px solid #dedede; - border-left: 1px solid #cfcfcf; - border-bottom: 1px solid #c4c4c4; - color: #4A4A4A; - font-weight: 700; - padding: 6px; +/* language bars (summary page) */ +#lang_stats { + .progress-bar { + min-width: 15px; + border-top-right-radius: 8px; + border-bottom-right-radius: 8px; + } + td { + padding: 1px 0 !important; + } } -#content div.box div.pagination-wh span.pager_curpage { - height: 1%; - float: left; - background: #b4b4b4 url("../images/pager_selected.png") repeat-x; - border-top: 1px solid #ccc; - border-left: 1px solid #bebebe; - border-bottom: 1px solid #afafaf; - color: #515151; - font-weight: 700; - padding: 6px; -} - -#content div.box div.pagination-wh a:hover, -#content div.box div.pagination-wh a:active { - background: #b4b4b4 url("../images/pager_selected.png") repeat-x; - border-top: 1px solid #ccc; - border-left: 1px solid #bebebe; - border-bottom: 1px solid #afafaf; - text-decoration: none; -} - -#content div.box div.traffic div.legend { - clear: both; - overflow: hidden; - border-bottom: 1px solid #ddd; - margin: 0 0 10px; - padding: 0 0 10px; -} - -#content div.box div.traffic div.legend h6 { - float: left; - border: none; - margin: 0; - padding: 0; -} - -#content div.box div.traffic div.legend li { - list-style: none; - float: left; - font-size: 11px; - margin: 0; - padding: 0 8px 0 4px; -} - -#content div.box div.traffic div.legend li.visits { - border-left: 12px solid #edc240; -} - -#content div.box div.traffic div.legend li.pageviews { - border-left: 12px solid #afd8f8; -} - -#content div.box div.traffic table { - width: auto; -} - -#content div.box div.traffic table td { - background: transparent; - border: none; - padding: 2px 3px 3px; -} - -#content div.box div.traffic table td.legendLabel { - padding: 0 3px 2px; -} - -#content div.box #summary { - margin-right: 200px; - min-height: 240px; +/* use pointer cursor for expand_commit */ +.expand_commit .icon-align-left { + cursor: pointer; + color: #999; } -#summary-menu-stats { - float: left; - width: 180px; - position: absolute; - top: 0; - right: 0; -} - -#summary-menu-stats ul { - margin: 0 10px; - display: block; - background-color: #f9f9f9; - border: 1px solid #d1d1d1; - border-radius: 4px; -} - -#content #summary-menu-stats li { - border-top: 1px solid #d1d1d1; - padding: 0; -} - -#content #summary-menu-stats li:hover { - background: #f0f0f0; -} - -#content #summary-menu-stats li:first-child { - border-top: none; -} - -#summary-menu-stats a { - display: block; - padding: 12px 10px; - background-repeat: no-repeat; - background-position: 10px 50%; - padding-right: 10px; -} - -#repo_size_2.loaded { - margin-left: 30px; - display: block; - padding-right: 10px; - padding-bottom: 7px; -} - -#summary-menu-stats a:hover { - text-decoration: none; +/* don't break author, date and comment cells into multiple lines in changeset table */ +table.changesets { + .author, + .date, + .comments { + white-space: nowrap; + } } -#summary-menu-stats a span { - background-color: #DEDEDE; - color: #888 !important; - border-radius: 4px; - padding: 2px 4px; - font-size: 10px; -} - -#summary .metatag { - display: inline-block; - padding: 3px 5px; - margin-bottom: 3px; - margin-right: 1px; - border-radius: 5px; -} - -#content div.box #summary p { - margin-bottom: -5px; - width: 600px; - white-space: pre-wrap; -} - -#content div.box #summary p:last-child { - margin-bottom: 9px; -} - -#content div.box #summary p:first-of-type { - margin-top: 9px; -} - -.metatag { - display: inline-block; - margin-right: 1px; - border-radius: 4px 4px 4px 4px; - - border: solid 1px #9CF; - padding: 2px 3px 2px 3px !important; - background-color: #DEF; -} - -.metatag[tag="dead"] { - background-color: #E44; -} - -.metatag[tag="stale"] { - background-color: #EA4; -} - -.metatag[tag="featured"] { - background-color: #AEA; -} - -.metatag[tag="requires"] { - background-color: #9CF; -} - -.metatag[tag="recommends"] { - background-color: #BDF; -} - -.metatag[tag="lang"] { - background-color: #FAF474; +/* textareas should be at least 100px high and 400px wide */ +textarea.form-control { + font-family: @font-family-monospace; + min-height: 100px; + min-width: 400px; } -.metatag[tag="license"] { - border: solid 1px #9CF; - background-color: #DEF; -} -.metatag[tag="see"] { - border: solid 1px #CBD; - background-color: #EDF; -} - -a.metatag[tag="license"]:hover { - background-color: #577632; - color: #FFF; - text-decoration: none; -} - -#summary .desc { - white-space: pre; - width: 100%; -} - -#summary .repo_name { - font-size: 1.6em; - font-weight: bold; - vertical-align: baseline; - clear: right -} - -#footer { - clear: both; - overflow: hidden; - text-align: right; - margin: 0; - padding: 0 10px 4px; - margin: -10px 0 0; -} - -#footer div#footer-inner { - background-color: #577632; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #577632, #577632); - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); - border-radius: 4px 4px 4px 4px; -} - -#footer div#footer-inner p { - padding: 15px 25px 15px 0; - color: #FFF; - font-weight: 700; -} - -#footer div#footer-inner .footer-link { - float: left; - padding-left: 10px; +/* add some space between the code-browser icons and the file names */ +.browser-dir > i[class^='icon-'], +.submodule-dir > i[class^='icon-'], +.browser-file > i[class^='icon-'] { + padding-right: 0.3em; } -#footer div#footer-inner .footer-link a, -#footer div#footer-inner .footer-link-right a { - color: #FFF; -} - -#login div.title { - clear: both; - overflow: hidden; - position: relative; - background-color: #577632; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #577632, #577632); - margin: 0 auto; - padding: 0; -} - -#login div.inner .icon-lock { - font-size: 80pt; - color: #DDD; -} - -#login div.inner { - background: #FFF; - border-top: none; - border-bottom: none; - margin: 0 auto; - padding: 20px; +div.panel-primary { + border: none; } -#login div.form div.form-horizontal div.form-group > label { - width: 173px; - float: left; - text-align: right; - margin: 2px 10px 0 0; - padding: 5px 0 0 5px; +/* no extra vertical margin */ +#content div.panel ul.pagination { + margin: 0; } -#login div.form div.form-horizontal div.form-group div input { - background: #FFF; - border-top: 1px solid #b3b3b3; - border-left: 1px solid #b3b3b3; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; - color: #000; - font-size: 11px; - margin: 0; - padding: 7px 7px 6px; -} - -#login div.form .buttons { - float: right; -} - -#login div.form div.links { - clear: both; - overflow: hidden; - margin: 10px 0 0; - border-top: 1px solid #DDD; - padding: 10px 0 0; +/* remove margin below footer */ +.navbar.footer { + margin-bottom: 0; } .user-menu { - margin: 0px !important; - float: left; -} - -.user-menu .container { - padding: 0px 4px 0px 4px; - margin: 0px 0px 0px 0px; -} - -.user-menu .gravatar { - margin: 0px 0px 0px 0px; - cursor: pointer; -} -.user-menu .gravatar.enabled { - background-color: #FDF784 !important; -} -.user-menu .gravatar:hover { - background-color: #FDF784 !important; + padding: 0 !important; } #quick_login { - min-height: 110px; - padding: 4px; - position: absolute; - right: 0; - background-color: #577632; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #577632, #577632); - - z-index: 999; - border-radius: 0px 0px 4px 4px; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); - - overflow: hidden; + width: 360px; + margin-top: 15px; + min-height: 110px; } -#quick_login h4 { - color: #fff; - padding: 5px 0px 5px 14px; -} - -#quick_login .password_forgoten { - padding-right: 0px; - padding-top: 0px; - text-align: left; +#quick_login input#username, +#quick_login input#password { + display: block; + margin: 5px 0 10px; } - -#quick_login .password_forgoten a { - font-size: 10px; - color: #fff; - padding: 0px !important; - line-height: 20px !important; -} - -#quick_login .register { - padding-right: 10px; - padding-top: 5px; - text-align: left; -} - +#quick_login .password_forgotten a, #quick_login .register a { - font-size: 10px; - color: #fff; - padding: 0px !important; - line-height: 20px !important; + padding: 0 !important; + line-height: 25px !important; + float: left; + clear: both; } - #quick_login .submit { - margin: -20px 0 0 0px; - position: absolute; - right: 15px; + float: right; } - -#quick_login .links_left { - float: left; - margin-right: 130px; - width: 170px; +#quick_login .submit input#sign_in { + margin-top: 5px; } -#quick_login .links_right { - - position: absolute; - right: 0; +#quick_login > .pull-left { + width: 170px; +} +#quick_login > .pull-right { + width: 140px; } #quick_login .full_name { - color: #FFFFFF; - font-weight: bold; - padding: 3px 3px 3px 6px; -} -#quick_login .big_gravatar { - padding: 4px 0px 0px 6px; -} -#quick_login .notifications { - padding: 2px 0px 0px 6px; - color: #FFFFFF; - font-weight: bold; - line-height: 10px !important; -} -#quick_login .notifications a, -#quick_login .unread a { - color: #FFFFFF; - display: block; - padding: 0px !important; -} -#quick_login .notifications a:hover, -#quick_login .unread a:hover { - background-color: inherit !important; -} -#quick_login .email, -#quick_login .unread { - color: #FFFFFF; - padding: 3px 3px 3px 6px; -} -#quick_login .links .logout { -} - -#quick_login div.form div.fields { - padding-top: 2px; - padding-left: 10px; -} - -#quick_login div.form div.fields div.field { - padding: 5px; -} - -#quick_login div.form div.fields div.field div.label label { - color: #fff; - padding-bottom: 3px; -} - -#quick_login div.form div.fields div.field div.input input { - width: 236px; - background: #FFF; - border-top: 1px solid #b3b3b3; - border-left: 1px solid #b3b3b3; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; - color: #000; - font-size: 11px; - margin: 0; - padding: 5px 7px 4px; -} - -#quick_login div.form div.fields div.buttons { - clear: both; - overflow: hidden; - text-align: right; - margin: 0; - padding: 5px 14px 0px 5px; -} - -#quick_login div.form div.links { - clear: both; - overflow: hidden; - margin: 10px 0 0; - padding: 0 0 2px; -} - -#quick_login ol.links { - display: block; - font-weight: bold; - list-style: none outside none; - text-align: right; + font-weight: bold; + padding: 3px; } -#quick_login ol.links li { - line-height: 27px; - margin: 0; - padding: 0; - color: #fff; - display: block; - float: none !important; -} - -#quick_login ol.links li a { - color: #fff; - display: block; - padding: 2px; -} -#quick_login ol.links li a:HOVER { - background-color: inherit !important; -} - -#register div.title { - clear: both; - overflow: hidden; - position: relative; - background-color: #577632; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #577632, #577632); - margin: 0 auto; - padding: 0; -} - -#register div.inner { - background: #FFF; - border-top: none; - border-bottom: none; - margin: 0 auto; - padding: 20px; -} - -#register div.form div.fields div.field div.label { - width: 135px; - float: left; - text-align: right; - margin: 2px 10px 0 0; - padding: 5px 0 0 5px; +#quick_login .email { + padding: 3px 3px 3px 0; } - -#register div.form div.fields div.field div.input input { - width: 300px; - background: #FFF; - border-top: 1px solid #b3b3b3; - border-left: 1px solid #b3b3b3; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; - color: #000; - font-size: 11px; - margin: 0; - padding: 7px 7px 6px; -} - -#register div.form div.fields div.buttons { - clear: both; - overflow: hidden; - border-top: 1px solid #DDD; - text-align: left; - margin: 0; - padding: 10px 0 0 150px; -} - -#register div.form div.activation_msg { - padding-top: 4px; - padding-bottom: 4px; -} - -#journal .journal_day { - font-size: 20px; - padding: 10px 0px; - border-bottom: 2px solid #DDD; - margin-left: 10px; - margin-right: 10px; -} - -#journal .journal_container { - padding: 5px; - clear: both; - margin: 0px 5px 0px 10px; -} - -#journal .journal_action_container { - padding-left: 38px; +#quick_login :not(input) { + color: @kallithea-theme-inverse-color; + padding-bottom: 3px; } #journal .journal_user { - color: #747474; - font-size: 14px; - font-weight: bold; - height: 30px; -} - -#journal .journal_user.deleted { - color: #747474; - font-size: 14px; - font-weight: normal; - height: 30px; - font-style: italic; + color: #747474; + font-size: 14px; + font-weight: bold; + height: 30px; } - - -#journal .journal_icon { - clear: both; - float: left; - padding-right: 4px; - padding-top: 3px; -} - -#journal .journal_action { - padding-top: 4px; - min-height: 2px; - float: left +#journal .journal_user.deleted { + color: #747474; + font-size: 14px; + font-weight: normal; + height: 30px; + font-style: italic; } - -#journal .journal_action_params { - clear: left; - padding-left: 22px; -} - -#journal .journal_repo { - float: left; - margin-left: 6px; - padding-top: 3px; +#journal .journal_icon { + clear: both; + float: left; + padding-right: 4px; + padding-top: 3px; } - -#journal .date { - clear: both; - color: #777777; - font-size: 11px; - padding-left: 22px; +#journal .journal_action { + padding-top: 4px; + min-height: 2px; + float: left; } - -#journal .journal_repo .journal_repo_name { - font-weight: bold; - font-size: 1.1em; -} - -#journal .compare_view { - padding: 5px 0px 5px 0px; - width: 95px; +#journal .journal_action_params { + clear: left; + padding-left: 22px; } - -.journal_highlight { - font-weight: bold; - padding: 0 2px; - vertical-align: bottom; -} - -.trending_language_tbl, .trending_language_tbl td { - border: 0 !important; - margin: 0 !important; - padding: 0 !important; +#journal .date { + clear: both; + color: #777777; + font-size: 11px; + padding-left: 22px; } - -.trending_language_tbl, .trending_language_tbl tr { - border-spacing: 1px; +#journal .journal_repo_name { + font-weight: bold; + font-size: 1.1em; } - -.trending_language { - background-color: #577632; - color: #FFF; - display: block; - min-width: 20px; - text-decoration: none; - height: 12px; - margin-bottom: 0px; - margin-left: 5px; - white-space: pre; - padding: 3px; +#journal .compare_view { + padding: 5px 0px 5px 0px; + width: 95px; } - -h3.files_location { - font-size: 1.8em; - font-weight: 700; - border-bottom: none !important; - margin: 10px 0 !important; +.trending_language_tbl, +.trending_language_tbl td { + border: 0 !important; + margin: 0 !important; + padding: 0 !important; } - -#files_data dl dt { - float: left; - width: 60px; - margin: 0 !important; - padding: 5px; +.trending_language_tbl, +.trending_language_tbl tr { + border-spacing: 1px; } - -#files_data dl dd { - margin: 0 !important; - padding: 5px !important; +h3.files_location { + font-size: 1.8em; + font-weight: 700; + border-bottom: none !important; + margin: 10px 0 !important; } - -#files_data .codeblock #editor_container .error-message { - color: red; - padding: 10px 10px 10px 26px -} - .file_history { - padding-top: 10px; - font-size: 16px; + padding-top: 10px; + font-size: 16px; } .file_author { - float: left; -} - -.file_author .item { - float: left; - padding: 5px; - color: #888; -} - -.changeset_id { - color: #666666; - margin-right: -3px; -} - -.changeset-logical-index { - color: #666666; - font-style: italic; - font-size: 85%; - padding-right: 0.5em; - text-align: right; -} - -.changeset_hash { - color: #000000; -} - -#changeset_content { - border-left: 1px solid #CCC; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - padding: 5px; -} - -#changeset_compare_view_content { - border: 1px solid #CCC; - padding: 5px; -} - -#changeset_content .container { - min-height: 100px; - font-size: 1.2em; - overflow: hidden; -} - -#changeset_compare_view_content .compare_view_commits { - width: auto !important; -} - -#changeset_compare_view_content .compare_view_commits td { - padding: 0px 0px 0px 12px !important; -} - -#changeset_content .container .right { - float: right; - width: 20%; - text-align: right; -} - -#changeset_content .container .message { - white-space: pre-wrap; -} -#changeset_content .container .message a:hover { - text-decoration: none; -} -.cs_files .cur_cs { - margin: 10px 2px; - font-weight: bold; -} - -.cs_files .node { - float: left; -} - -.cs_files .changes { - float: right; - color: #577632; -} - -.cs_files .changes .added { - background-color: #BBFFBB; - float: left; - text-align: center; - font-size: 9px; - padding: 2px 0px 2px 0px; -} - -.cs_files .changes .deleted { - background-color: #FF8888; - float: left; - text-align: center; - font-size: 9px; - padding: 2px 0px 2px 0px; + float: left; } -/*new binary -NEW_FILENODE = 1 -DEL_FILENODE = 2 -MOD_FILENODE = 3 -RENAMED_FILENODE = 4 -CHMOD_FILENODE = 5 -BIN_FILENODE = 6 -*/ -.cs_files .changes .bin { - background-color: #BBFFBB; - float: left; - text-align: center; - font-size: 9px; - padding: 2px 0px 2px 0px; -} -.cs_files .changes .bin.bin1 { - background-color: #BBFFBB; -} - -/*deleted binary*/ -.cs_files .changes .bin.bin2 { - background-color: #FF8888; -} - -/*mod binary*/ -.cs_files .changes .bin.bin3 { - background-color: #DDDDDD; -} - -/*rename file*/ -.cs_files .changes .bin.bin4 { - background-color: #6D99FF; -} - -/*rename file*/ -.cs_files .changes .bin.bin4 { - background-color: #6D99FF; -} - -/*chmod file*/ -.cs_files .changes .bin.bin5 { - background-color: #6D99FF; -} - -.cs_files .cs_added, -.cs_files .cs_A { - height: 16px; - margin-top: 7px; - text-align: left; -} - -.cs_files .cs_changed, -.cs_files .cs_M { - height: 16px; - margin-top: 7px; - text-align: left; -} - -.cs_files .cs_removed, -.cs_files .cs_D { - height: 16px; - margin-top: 7px; - text-align: left; -} - -.cs_files .cs_renamed, -.cs_files .cs_R { - height: 16px; - margin-top: 7px; - text-align: left; -} - -.table { - position: relative; -} - -#graph { - position: relative; - overflow: hidden; -} - -#graph_nodes { - position: absolute; -} - -#graph_content, -#graph .info_box, -#graph .container_header { - margin-left: 100px; -} - -#graph_content { - position: relative; -} - -#graph .container_header { - padding: 10px; - height: 25px; -} - -#graph_content #rev_range_container { - float: left; - margin: 0px 0px 0px 3px; -} - -#graph_content #rev_range_clear { - float: left; - margin: 0px 0px 0px 3px; -} - -#graph_content #changesets { - table-layout: fixed; - border-collapse: collapse; - border-left: none; - border-right: none; - border-color: #cdcdcd; +.file_author .item { + float: left; + padding: 5px; + color: #888; } - -#graph_content #changesets tr.out-of-range, -#graph_content #changesets tr.mergerow { - opacity: 0.5; -} - -#graph_content #changesets td { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - height: 31px; - border-color: #cdcdcd; - text-align: left; -} - -#graph_content .container .checkbox { - width: 14px; - font-size: 0.85em; -} - -#graph_content .container .status { - width: 14px; - font-size: 0.85em; -} - -#graph_content .container .author { - width: 105px; -} - -#graph_content .container .hash { - width: 100px; - font-size: 0.85em; -} - -#graph_content #changesets .container .date { - width: 76px; - color: #666; - font-size: 10px; -} - -#graph_content_pr .compare_view_commits .expand_commit, -#graph_content .container .expand_commit { - width: 24px; - cursor: pointer; -} - -#graph_content #changesets .container .right { - width: 120px; - padding-right: 0px; - overflow: visible; - position: relative; -} - -#graph_content .container .mid { - padding: 0; -} - -#graph_content .log-container { - position: relative; -} - -#graph_content .container #singlerange, -#graph_content .container .changeset_range { - float: left; - margin: 6px 3px; -} - -#graph_content .container .author img { - vertical-align: middle; -} - -#graph_content .container .author .user { - color: #444444; -} - -#graph_content .container .mid .message { - white-space: pre-wrap; - padding: 0; - overflow: hidden; - height: 1.1em; -} - -#graph_content_pr .compare_view_commits .message { - padding: 0 !important; - height: 1.1em; -} - -#graph_content .container .mid .message.expanded, -#graph_content_pr .compare_view_commits .message.expanded { - height: auto; - margin: 8px 0px 8px 0px; - overflow: initial; -} - -#graph_content .container .extra-container { - display: block; - position: absolute; - top: -15px; - right: 0; - padding-left: 5px; - background: #FFFFFF; - height: 41px; +table#updaterevs-table tr.mergerow, +table#updaterevs-table tr.out-of-range, +table#changesets tr.mergerow, +table#changesets tr.out-of-range { + opacity: 0.6; } - -#pull_request_overview .comments-container, -#changeset_compare_view_content .comments-container, -#graph_content .comments-container, -#shortlog_data .comments-container, -#graph_content .logtags { - display: block; - float: left; - overflow: hidden; - padding: 0; - margin: 0; - white-space: nowrap; -} - -#graph_content .comments-container { - margin: 0.8em 0; - margin-right: 0.5em; -} - -#graph_content .tagcontainer { - width: 80px; - position: relative; - float: right; - height: 100%; - top: 7px; - margin-left: 0.5em; -} - -#graph_content .logtags { - min-width: 80px; - height: 1.1em; - position: absolute; - left: 0px; - width: auto; - top: 0px; -} - -#graph_content .logtags.tags { - top: 14px; -} - -#graph_content .logtags:hover { - overflow: visible; - position: absolute; - width: auto; - right: 0; - left: initial; +.issue-tracker-link { + color: #3F6F9F; + font-weight: bold !important; } - -#graph_content .logtags .booktag, -#graph_content .logtags .tagtag { - float: left; - line-height: 1em; - margin-bottom: 1px; - margin-right: 1px; - padding: 1px 3px; - font-size: 10px; -} - -#graph_content .container .mid .message a:hover { - text-decoration: none; -} - -#compare_branches + .table .revision-link, -#compare_tags + .table .revision-link, -#compare_bookmarks + .table .revision-link, -.table #files_data .revision-link, -#repos_list_wrap .revision-link, -#shortlog_data .revision-link { - font-weight: normal !important; - font-family: monospace; - font-size: 12px; - color: #577632; -} - -.revision-link { - color: #3F6F9F; - font-weight: bold !important; -} - -.issue-tracker-link { - color: #3F6F9F; - font-weight: bold !important; -} - -.changeset-status-container { - padding-right: 5px; - margin-top: 1px; - float: right; - height: 14px; -} -.code-header .changeset-status-container { - float: left; - padding: 2px 0px 0px 2px; -} -.code-header .changeset-status-container .changeset-status-lbl { - float: left; - padding: 0px 4px 0px 0px; -} -.changeset-status-container div.changeset-status-ico { - float: left; -} -.code-header .changeset-status-container .changeset-status-ico, -.container .changeset-status-ico { - float: left; -} - /* changeset statuses (must be the same name as the status) */ .changeset-status-not_reviewed { - color: #bababa; + color: #bababa; } .changeset-status-approved { - color: #81ba51; + color: #81ba51; } .changeset-status-rejected { - color: #cc392e; + color: #d06060; } .changeset-status-under_review { - color: #ffc71e; -} - -#graph_content .comments-cnt { - color: rgb(136, 136, 136); - padding: 5px 0; -} - -#shortlog_data .comments-cnt { - color: rgb(136, 136, 136); - padding: 3px 0; -} - -.right .changes { - clear: both; -} - -.right .changes .changed_total { - display: block; - float: right; - text-align: center; - min-width: 45px; - cursor: pointer; - color: #444444; - background: #FEA; - border-radius: 0px 0px 0px 6px; - padding: 1px; -} - -.right .changes .added, -.changed, .removed { - display: block; - padding: 1px; - color: #444444; - float: right; - text-align: center; - min-width: 15px; -} - -.right .changes .added { - background: #CFC; -} - -.right .changes .changed { - background: #FEA; -} - -.right .changes .removed { - background: #FAA; -} - -.right .merge { - padding: 1px 3px 1px 3px; - background-color: #fca062; - font-size: 10px; - color: #ffffff; - text-transform: uppercase; - white-space: nowrap; - border-radius: 3px; - margin-right: 2px; -} - -.right .parent { - color: #666666; - clear: both; -} -.right .logtags { - line-height: 2.2em; -} -.repotag, .branchtag, .logtags .tagtag, .logtags .booktag { - margin: 0px 2px; -} - -.repotag, -.branchtag, -.tagtag, -.booktag, -.spantag { - padding: 1px 3px 1px 3px; - font-size: 10px; - color: #577632; - white-space: nowrap; - border-radius: 4px; - border: 1px solid #d9e8f8; - line-height: 1.5em; -} - -#graph_content .branchtag, -#graph_content .tagtag, -#graph_content .booktag { - margin: 1.1em 0; - margin-right: 0.5em; -} - -.repotag, -.branchtag, -.tagtag, -.booktag { - float: left; -} - -.right .logtags .branchtag, -.right .logtags .tagtag, -.right .logtags .booktag, -.right .merge { - float: right; - line-height: 1em; - margin: 1px 1px !important; - display: block; -} - -.repotag { - border-color: #56A546; - color: #46A546; - font-size: 8px; - text-transform: uppercase; -} - -#context-bar .repotag, -.repo-icons .repotag { - border-color: white; - color: white; - margin-top: 3px; -} - -.repo-icons .repotag { - margin-top: 0px; - padding-top: 0px; - padding-bottom: 0px; -} - -.booktag { - border-color: #46A546; - color: #46A546; -} - -.tagtag { - border-color: #62cffc; - color: #62cffc; -} - -.logtags .branchtag a:hover, -.logtags .branchtag a, -.branchtag a, -.branchtag a:hover { - text-decoration: none; - color: inherit; -} -.logtags .tagtag { - padding: 1px 3px 1px 3px; - background-color: #62cffc; - font-size: 10px; - color: #ffffff; - white-space: nowrap; - border-radius: 3px; -} - -.tagtag a, -.tagtag a:hover, -.logtags .tagtag a, -.logtags .tagtag a:hover { - text-decoration: none; - color: inherit; -} -.logbooks .booktag, -.logbooks .booktag, -.logtags .booktag, -.logtags .booktag { - padding: 1px 3px 1px 3px; - background-color: #46A546; - font-size: 10px; - color: #ffffff; - white-space: nowrap; - border-radius: 3px; -} -.logbooks .booktag, -.logbooks .booktag a, -.right .logtags .booktag, -.logtags .booktag a { - color: #ffffff; -} - -.logbooks .booktag, -.logbooks .booktag a:hover, -.logtags .booktag, -.logtags .booktag a:hover, -.booktag a, -.booktag a:hover { - text-decoration: none; - color: inherit; -} -div.browserblock { - overflow: hidden; - border: 1px solid #ccc; - background: #f8f8f8; - font-size: 100%; - line-height: 125%; - padding: 0; - border-radius: 6px 6px 0px 0px; -} - -div.browserblock .browser-header { - background: #FFF; - padding: 10px 0px 15px 0px; - width: 100%; -} - -div.browserblock .browser-nav { - float: left -} - -div.browserblock .browser-branch { - float: left; -} - -div.browserblock .browser-branch label { - color: #4A4A4A; - vertical-align: text-top; - padding-right: 2px; -} - -div.browserblock .browser-header span { - margin-left: 5px; - font-weight: 700; -} - -div.browserblock .browser-search { - clear: both; - padding: 8px 8px 0px 5px; - height: 20px; -} - -div.browserblock #node_filter_box { -} - -div.browserblock .search_activate { - float: left -} - -div.browserblock .add_node { - float: left; - padding-left: 5px; -} - -div.browserblock .search_activate a:hover, -div.browserblock .add_node a:hover { - text-decoration: none !important; -} - -div.browserblock .browser-body { - background: #EEE; - border-top: 1px solid #CCC; -} - -table.code-browser { - border-collapse: collapse; - width: 100%; -} - -table.code-browser tr { - margin: 3px; -} - -table.code-browser thead th { - background-color: #EEE; - height: 20px; - font-size: 1.1em; - font-weight: 700; - text-align: left; - padding-left: 10px; -} - -table.code-browser tbody td { - padding-left: 10px; - height: 20px; -} - -table.code-browser .browser-file { - height: 16px; - padding-left: 5px; - text-align: left; -} -.diffblock .changeset_header { - height: 16px; -} -.diffblock .changeset_file { - float: left; -} -.diffblock .diff-menu-wrapper { - float: left; -} - -.diffblock .diff-menu { - position: absolute; - background: none repeat scroll 0 0 #FFFFFF; - border-color: #577632 #666666 #666666; - border-right: 1px solid #666666; - border-style: solid solid solid; - border-width: 1px; - box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2); - margin-top: 5px; - margin-left: 1px; - -} -.diffblock .diff-actions { - padding: 2px 0px 0px 2px; - float: left; -} -.diffblock .diff-menu ul li { - padding: 0px 0px 0px 0px !important; -} -.diffblock .diff-menu ul li a { - display: block; - padding: 3px 8px 3px 8px !important; -} -.diffblock .diff-menu ul li a:hover { - text-decoration: none; - background-color: #EEEEEE; -} -table.code-browser .browser-dir { - height: 16px; - padding-left: 5px; - text-align: left; -} - -table.code-browser .submodule-dir { - height: 16px; - padding-left: 5px; - text-align: left; -} - -/* add some padding to the right of the file, folder, or submodule icon and -before the text */ -table.code-browser i[class^='icon-'] { - padding-right: .3em; -} - -.box .search { - clear: both; - overflow: hidden; - margin: 0; - padding: 0 20px 10px; -} - -.box .search div.search_path { - background: none repeat scroll 0 0 #EEE; - border: 1px solid #CCC; - color: blue; - margin-bottom: 10px; - padding: 10px 0; -} - -.box .search div.search_path div.link { - font-weight: 700; - margin-left: 25px; -} - -.box .search div.search_path div.link a { - color: #577632; - cursor: pointer; - text-decoration: none; -} - -#path_unlock { - color: red; - font-size: 1.2em; - padding-left: 4px; -} - -.info_box span { - margin-left: 3px; - margin-right: 3px; -} - -.info_box .rev { - color: #577632; - font-size: 1.6em; - font-weight: bold; - vertical-align: sub; -} - -.info_box input#at_rev, -.info_box input#size { - background: #FFF; - border-top: 1px solid #b3b3b3; - border-left: 1px solid #b3b3b3; - border-right: 1px solid #eaeaea; - border-bottom: 1px solid #eaeaea; - color: #000; - font-size: 12px; - margin: 0; - padding: 1px 5px 1px; -} - -.info_box input#view { - text-align: center; - padding: 4px 3px 2px 2px; -} - -.info_box_elem { - display: inline-block; - padding: 0 2px; -} - -.yui-overlay, .yui-panel-container { - visibility: hidden; - position: absolute; - z-index: 2; -} - -#tip-box { - position: absolute; - - background-color: #FFF; - border: 2px solid #577632; - font: 100% sans-serif; - width: auto; - opacity: 1; - padding: 8px; - - white-space: pre-wrap; - border-radius: 8px 8px 8px 8px; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); - z-index: 100000; -} - -.hl-tip-box { - z-index: 1; - position: absolute; - color: #666; - background-color: #FFF; - border: 2px solid #577632; - font: 100% sans-serif; - width: auto; - opacity: 1; - padding: 8px; - white-space: pre-wrap; - border-radius: 8px 8px 8px 8px; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6); -} - - -.mentions-container { - width: 90% !important; -} -.mentions-container .yui-ac-content { - width: 100% !important; -} - -.ac { - vertical-align: top; -} - -.ac .yui-ac { - position: inherit; - font-size: 100%; -} - -.ac .perm_ac { - width: 20em; -} - -.ac .yui-ac-input { - width: 100%; -} - -.ac .yui-ac-container { - position: absolute; - top: 1.6em; - width: auto; -} - -.ac .yui-ac-content { - position: absolute; - border: 1px solid gray; - background: #fff; - z-index: 9050; -} - -.ac .yui-ac-shadow { - position: absolute; - width: 100%; - background: #000; - opacity: .10; - z-index: 9049; - margin: .3em; -} - -.ac .yui-ac-content ul { - width: 100%; - margin: 0; - padding: 0; - z-index: 9050; -} - -.ac .yui-ac-content li { - cursor: default; - white-space: nowrap; - margin: 0; - padding: 2px 5px; - height: 18px; - z-index: 9050; - display: block; - width: auto !important; -} - -.ac .yui-ac-content li .ac-container-wrap { - width: auto; -} - -.ac .yui-ac-content li.yui-ac-prehighlight { - background: #B3D4FF; - z-index: 9050; -} - -.ac .yui-ac-content li.yui-ac-highlight { - background: #556CB5; - color: #FFF; - z-index: 9050; -} -.ac .yui-ac-bd { - z-index: 9050; + color: #ffc71e; } #repo_size { - display: block; - margin-top: 4px; - color: #666; - float: right; -} - -.currently_following { - padding-left: 10px; - padding-bottom: 5px; -} - -.action_button { - border: 0; - display: inline; -} - -.action_button:hover { - border: 0; - text-decoration: underline; - cursor: pointer; -} - -#switch_repos { - position: absolute; - height: 25px; - z-index: 1; -} - -#switch_repos select { - min-width: 150px; - max-height: 250px; - z-index: 1; + display: block; + margin-top: 4px; + color: #666; + float: right; } - -.breadcrumbs { - border: medium none; - color: #FFF; - float: left; - font-weight: 700; - font-size: 14px; - margin: 0; - padding: 11px 0 11px 10px; -} - -.breadcrumbs .hash { - text-transform: none; - color: #fff; -} - -.breadcrumbs a { - color: #FFF; +.currently_following { + padding-left: 10px; + padding-bottom: 5px; } - -.flash_msg { -} - -.flash_msg ul { -} - -.error_red { - color: red; -} - -.flash_msg .alert-error { - background-color: #c43c35; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); - border-color: #c43c35 #c43c35 #882a25; -} - -.flash_msg .alert-error a { - text-decoration: underline; +#switch_repos { + position: absolute; + height: 25px; + z-index: 1; } - -.flash_msg .alert-warning { - color: #404040 !important; - background-color: #eedc94; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #fceec1, #eedc94); - border-color: #eedc94 #eedc94 #e4c652; -} - -.flash_msg .alert-warning a { - text-decoration: underline; -} - -.flash_msg .alert-success { - background-color: #57a957; - background-repeat: repeat-x !important; - background-image: linear-gradient(to bottom, #62c462, #57a957); - border-color: #57a957 #57a957 #3d773d; -} - -.flash_msg .alert-success a { - text-decoration: underline; - color: #FFF !important; -} - -.flash_msg .alert-info { - background-color: #339bb9; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #5bc0de, #339bb9); - border-color: #339bb9 #339bb9 #22697d; -} - -.flash_msg .alert-info a { - text-decoration: underline; +#switch_repos select { + min-width: 150px; + max-height: 250px; + z-index: 1; } - -.flash_msg .alert-error, -.flash_msg .alert-warning, -.flash_msg .alert-success, -.flash_msg .alert-info { - font-size: 12px; - font-weight: 700; - min-height: 14px; - line-height: 14px; - margin-bottom: 10px; - margin-top: 0; - display: block; - overflow: auto; - padding: 6px 10px 6px 10px; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - position: relative; - color: #FFF; - border-width: 1px; - border-style: solid; - border-radius: 4px; - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); -} - -div#legend_data { - padding-left: 10px; +table#permissions_manage span.private_repo_msg { + font-size: 0.8em; + opacity: 0.6; } -div#legend_container table { - border: none !important; -} -div#legend_container table, -div#legend_choices table { - width: auto !important; -} - -table#permissions_manage { - width: 0 !important; +table#permissions_manage td.private_repo_msg { + font-size: 0.8em; } - -table#permissions_manage span.private_repo_msg { - font-size: 0.8em; - opacity: 0.6; +table#permissions_manage tr#add_perm_input td { + vertical-align: middle; } - -table#permissions_manage td.private_repo_msg { - font-size: 0.8em; -} - -table#permissions_manage tr#add_perm_input td { - vertical-align: middle; -} - div.gravatar { - background-color: #FFF; - float: left; - margin-right: 0.7em; - padding: 1px 1px 1px 1px; - line-height: 0; - border-radius: 3px; -} - -div.gravatar img { - border-radius: 2px; -} - -#header, #content, #footer { - min-width: 978px; + float: left; + background-color: #FFF; + margin-right: 0.7em; + padding: 1px 1px 1px 1px; + line-height: 0; + border-radius: 3px; } - -#content { - clear: both; - padding: 10px 10px 14px 10px; +div.gravatar img { + border-radius: 2px; } - -#content.hover { - padding: 55px 10px 14px 10px !important; -} - -#content div.box div.title div.search { - border-left: 1px solid #576622; -} - -#content div.box div.title div.search div.input input { - border: 1px solid #576622; +.panel-body.settings .nav-pills > :not(.active) > a { + color: inherit; } - -.btn { - color: #515151; - background-color: #DADADA; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #F4F4F4, #DADADA); - - border-top: 1px solid #DDD; - border-left: 1px solid #c6c6c6; - border-right: 1px solid #DDD; - border-bottom: 1px solid #c6c6c6; - outline: none; - margin: 0px 3px 3px 0px; - border-radius: 4px 4px 4px 4px !important; - cursor: pointer !important; - padding: 3px 3px 3px 3px; - display: inline-block; +.panel-body.no-padding { + padding: 0; } - -ul.nav-stacked { - margin: 20px; - color: #393939; - font-weight: 700; +.panel-body ~ .panel-body { + padding-top: 0; } - -ul.nav-stacked a { - color: inherit; -} - -ul.nav-stacked li.active { - list-style-type: disc +.panel-body.no-padding ~ .panel-body { + padding-top: 15px; } - -/* make .btn inputs and buttons and divs look the same */ -button.btn, -input.btn { - font-family: inherit; - font-size: inherit; - line-height: inherit; +.panel-body > :last-child { + margin-bottom: 0; } - -.btn::-moz-focus-inner { - border: 0; - padding: 0; -} - -.btn.badge { - cursor: default !important; +.panel-body.settings .text-muted { + margin: 5px 0; } - -input[disabled].btn, -.btn.disabled { - color: #999; -} - -.btn.btn-danger.disabled { - color: #eee; - background-color: #c77; - border-color: #b66 -} - -.btn.btn-small { - padding: 2px 6px; +ins, +div.options a:hover { + text-decoration: none; } - -.btn.btn-mini { - padding: 0px 4px; -} - -.btn:focus { - outline: none; +img, +nav.navbar #quick li a:hover span.normal, +#clone_url, +#clone_url_id { + border: none; } -.btn:hover { - text-decoration: none; - color: #515151; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25), 0 0 3px #FFFFFF !important; -} -.btn.badge:hover { - box-shadow: none !important; -} -.btn.disabled:hover { - background-position: 0; - color: #999; - text-decoration: none; - box-shadow: none !important; +img.icon, +.right .merge img { + vertical-align: bottom; } - -.btn.red { - color: #fff; - background-color: #c43c35; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); - border-color: #c43c35 #c43c35 #882a25; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} - - -.btn.blue { - color: #fff; - background-color: #339bb9; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #5bc0de, #339bb9); - border-color: #339bb9 #339bb9 #22697d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +#content div.panel div.panel-heading ul.links, +#content div.panel div.message div.dismiss { + float: right; + margin: 0; + padding: 0; } - -.btn.green { - color: #fff; - background-color: #57a957; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #62c462, #57a957); - border-color: #57a957 #57a957 #3d773d; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} - -.btn.yellow { - color: #fff; - background-color: #faa732; - background-repeat: repeat-x; - background-image: linear-gradient(to bottom, #fbb450, #f89406); - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} - -label.disabled { - color: #aaa; -} - -.btn.blue.hidden { - display: none; +nav.navbar #home, +#content div.panel ul.left, +#content div.panel ol.left, +div#commit_history, +div#legend_data, +div#legend_container, +div#legend_choices { + float: left; } -.btn.active { - font-weight: bold; -} - -ins, div.options a:hover { - text-decoration: none; -} - -img, -#header #header-inner #quick li a:hover span.normal, -#content div.box div.form div.fields div.field div.textarea table td table td a, -#clone_url, -#clone_url_id -{ - border: none; -} - -img.icon, .right .merge img { - vertical-align: bottom; -} - -#header ul#logged-user, -#content div.box div.title ul.links, -#content div.box div.message div.dismiss, -#content div.box div.traffic div.legend ul { - float: right; - margin: 0; - padding: 0; -} - -#header #header-inner #home, -#header #header-inner #logo, -#content div.box ul.left, -#content div.box ol.left, -div#commit_history, -div#legend_data, div#legend_container, div#legend_choices { - float: left; -} - -#header #header-inner #quick li #quick_login, -#header #header-inner #quick li:hover ul ul, -#header #header-inner #quick li:hover ul ul ul, -#header #header-inner #quick li:hover ul ul ul ul, -#content #left #menu ul.closed, -#content #left #menu li ul.collapsed, -.yui-tt-shadow { - display: none; -} - -#header #header-inner #quick li:hover #quick_login, -#header #header-inner #quick li:hover ul, -#header #header-inner #quick li li:hover ul, -#header #header-inner #quick li li li:hover ul, -#header #header-inner #quick li li li li:hover ul, -#content #left #menu ul.opened, -#content #left #menu li ul.expanded { - display: block; -} - -.repo-switcher .select2-choice { - padding: 0px 8px 1px !important; - display: block; - height: 100%; -} - -.repo-switcher .select2-container, -.repo-switcher .select2-choice, -.repo-switcher .select2-choice span { - background: transparent !important; - border: 0 !important; - box-shadow: none !important; - color: #FFFFFF !important; -} - -.repo-switcher .select2-arrow { - display: none !important; +/* set size for statistics charts */ +#commit_history { + width: 450px; + height: 300px; } - -.repo-switcher .select2-chosen:after { - font-family: 'kallithea'; - content: ' \23f7'; -} - -.repo-switcher-dropdown.select2-drop.select2-drop-active { - box-shadow: none; - color: #fff; - background-color: #576622; -} - -.repo-switcher-dropdown.select2-drop.select2-drop-active .select2-results .select2-highlighted { - background-color: #6388ad; -} - -#content div.graph { - padding: 0 10px 10px; - height: 450px; -} - -#content div.box ol.lower-roman, -#content div.box ol.upper-roman, -#content div.box ol.lower-alpha, -#content div.box ol.upper-alpha, -#content div.box ol.decimal { - margin: 10px 24px 10px 44px; -} - -#content div.box div.form, -#content div.box div.table, -#content div.box div.traffic { - position: relative; - clear: both; - margin: 0; - padding: 0 20px 10px; -} - -#content div.box div.form div.fields, -#login div.form-horizontal, -#login div.form-horizontal div.form-group, -#register div.form, -#register div.form div.fields { - clear: both; - overflow: hidden; - margin: 0; - padding: 0; -} - -#content div.box div.form div.fields div.field div.label span, -#login div.form div.form-horizontal div.form-group div.label span, -#register div.form div.fields div.field div.label span { - height: 1%; - display: block; - color: #363636; - margin: 0; - padding: 2px 0 0; -} - -#content div.box div.form div.fields div.field div.input input.error, -#login div.form div.form-horizontal div.form-group div.input input.error, -#register div.form div.fields div.field div.input input.error { - background: #FBE3E4; - border-top: 1px solid #e1b2b3; - border-left: 1px solid #e1b2b3; - border-right: 1px solid #FBC2C4; - border-bottom: 1px solid #FBC2C4; -} - -#content div.box div.form div.fields div.field div.input input.success, -#login div.form div.form-horizontal div.form-group div.input input.success, -#register div.form div.fields div.field div.input input.success { - background: #E6EFC2; - border-top: 1px solid #cebb98; - border-left: 1px solid #cebb98; - border-right: 1px solid #c6d880; - border-bottom: 1px solid #c6d880; +#overview { + clear: both; + width: 450px; + height: 100px; } -#content div.box-left div.form div.fields div.field div.textarea, -#content div.box-right div.form div.fields div.field div.textarea, -#content div.box div.form div.fields div.field div.select select, -#content div.box table th.selected input, -#content div.box table td.selected input { - margin: 0; -} - -#content div.box-left div.form div.fields div.field div.select, -#content div.box-left div.form div.fields div.field div.checkboxes, -#content div.box-left div.form div.fields div.field div.radios, -#content div.box-right div.form div.fields div.field div.select, -#content div.box-right div.form div.fields div.field div.checkboxes, -#content div.box-right div.form div.fields div.field div.radios { - margin: 0 0 0 0px !important; - padding: 0; -} - -#content div.box div.form div.fields div.field div.select, -#content div.box div.form div.fields div.field div.checkboxes, -#content div.box div.form div.fields div.field div.radios { - margin: 0 0 0 200px; - padding: 0; -} - -#content div.box div.form div.fields div.field div.select a:hover, -#content div.box div.form div.fields div.field div.select a.ui-selectmenu:hover, -#content div.box div.action a:hover { - color: #000; - text-decoration: none; -} - -#content div.box div.form div.fields div.field div.select a.ui-selectmenu-focus, -#content div.box div.action a.ui-selectmenu-focus { - border: 1px solid #666; -} - -#content div.box div.form div.fields div.field div.checkboxes div.checkbox, -#content div.box div.form div.fields div.field div.radios div.radio { - clear: both; - overflow: hidden; - margin: 0; - padding: 8px 0 2px; -} - -#content div.box div.form div.fields div.field div.checkboxes div.checkbox input, -#content div.box div.form div.fields div.field div.radios div.radio input { - float: left; - margin: 0; -} - -#content div.box div.form div.fields div.field div.checkboxes div.checkbox label, -#content div.box div.form div.fields div.field div.radios div.radio label { - height: 1%; - display: block; - float: left; - margin: 2px 0 0 4px; -} - -div.form div.fields div.field div.button input, -#content div.box div.form div.fields div.buttons input -div.form div.fields div.buttons input, -#content div.box div.action div.button input { - font-size: 11px; - font-weight: 700; - margin: 0; -} - -div.form div.fields div.field div.highlight, -#content div.box div.form div.fields div.buttons div.highlight { - display: inline; -} - -#content div.box div.form div.fields div.buttons, -div.form div.fields div.buttons { - margin: 10px 0 0 200px; - padding: 0; +#content #left #menu ul.closed, +#content #left #menu li ul.collapsed { + display: none; } - -#content div.box-left div.form div.fields div.buttons, -#content div.box-right div.form div.fields div.buttons, -div.box-left div.form div.fields div.buttons, -div.box-right div.form div.fields div.buttons { - margin: 10px 0 0; -} - -#content div.box table td.user, -#content div.box table td.address { - width: 10%; - text-align: center; -} - -#content div.box div.action div.button, -#login div.form div.form-horizontal div.form-group div.input div.link, -#register div.form div.fields div.field div.input div.link { - text-align: right; - margin: 6px 0 0; - padding: 0; -} - -#content div.box div.pagination div.results, -#content div.box div.pagination-wh div.results { - text-align: left; - float: left; - margin: 0; - padding: 0; -} - -#content div.box div.pagination div.results span, -#content div.box div.pagination-wh div.results span { - height: 1%; - display: block; - float: left; - background: #ebebeb url("../images/pager.png") repeat-x; - border-top: 1px solid #dedede; - border-left: 1px solid #cfcfcf; - border-right: 1px solid #c4c4c4; - border-bottom: 1px solid #c4c4c4; - color: #4A4A4A; - font-weight: 700; - margin: 0; - padding: 6px 8px; -} - -#content div.box div.pagination ul.pager li.disabled, -#content div.box div.pagination-wh a.disabled { - color: #B4B4B4; - padding: 6px; -} - -#login, #register { - width: 520px; - margin: 10% auto 0; - padding: 0; -} - -#login div.color, -#register div.color { - clear: both; - overflow: hidden; - background: #FFF; - margin: 10px auto 0; - padding: 3px 3px 3px 0; -} - -#login div.color a, -#register div.color a { - width: 20px; - height: 20px; - display: block; - float: left; - margin: 0 0 0 3px; - padding: 0; -} - -#login div.title h5, -#register div.title h5 { - color: #fff; - margin: 10px; - padding: 0; -} - -#login div.form div.form-horizontal div.form-group, -#register div.form div.fields div.field { - clear: both; - overflow: hidden; - margin: 0; - padding: 0 0 10px; +#content #left #menu ul.opened, +#content #left #menu li ul.expanded { + display: block !important; } -#login div.form div.form-horizontal div.form-group span.error-message, -#register div.form div.fields div.field span.error-message { - height: 1%; - display: block; - color: red; - margin: 8px 0 0; - padding: 0; - max-width: 320px; -} - -#login div.form div.form-horizontal div.form-group label, -#register div.form div.fields div.field div.label label { - color: #000; - font-weight: 700; -} - -#login div.form div.form-horizontal div.form-group div, -#register div.form div.fields div.field div.input { - float: left; - margin: 0; - padding: 0; -} - -#login div.form div.form-horizontal div.form-group div input.large { - width: 250px; -} - -#login div.form div.form-horizontal div.form-group div.checkbox, -#register div.form div.fields div.field div.checkbox { - margin: 0 0 0 184px; - padding: 0; -} - -#login div.form div.form-horizontal div.form-group div.checkbox label, -#register div.form div.fields div.field div.checkbox label { - color: #565656; - font-weight: 700; -} - -#login div.form div.buttons input, -#register div.form div.fields div.buttons input { - color: #000; - font-size: 1em; - font-weight: 700; - margin: 0; -} - -#changeset_content .container .wrapper, -#graph_content .container .wrapper { - width: 600px; -} - -#changeset_content .container .date, -.ac .match { - font-weight: 700; - padding-top: 5px; - padding-bottom: 5px; -} - -div#legend_container table td, -div#legend_choices table td { - border: none !important; - height: 20px !important; - padding: 0 !important; -} - -.q_filter_box { - border-radius: 4px; - border: 0 none; - margin-bottom: -4px; - margin-top: -4px; - padding-left: 3px; -} - -#node_filter { - border: 0px solid #545454; - color: #AAAAAA; - padding-left: 3px; -} - - -.group_members_wrap { - min-height: 85px; - padding-left: 20px; -} - -.group_members .group_member { - height: 30px; - padding: 0px 0px 0px 0px; -} - -.reviewer_status { - float: left; -} - -.reviewers_member { - height: 15px; - padding: 0px 0px 0px 10px; -} - -.emails_wrap { - padding: 0px 20px; -} - -.emails_wrap .email_entry { - height: 30px; - padding: 0px 0px 0px 10px; -} -.emails_wrap .email_entry .email { - float: left -} -.emails_wrap .email_entry .email_action { - float: left -} - -.ips_wrap { - padding: 0px 20px; -} - -.ips_wrap .ip_entry { - height: 30px; - padding: 0px 0px 0px 10px; -} -.ips_wrap .ip_entry .ip { - float: left -} -.ips_wrap .ip_entry .ip_action { - float: left -} - - -/*README STYLE*/ - -div.readme { - padding: 0px; -} - -div.readme h2 { - font-weight: normal; -} - -div.readme .readme_box { - background-color: #fafafa; -} - -div.readme .readme_box { - clear: both; - overflow: hidden; - margin: 0; - padding: 0 20px 10px; -} - -div.readme .readme_box h1, -div.readme .readme_box h2, -div.readme .readme_box h3, -div.readme .readme_box h4, -div.readme .readme_box h5, -div.readme .readme_box h6 { - border-bottom: 0 !important; - margin: 0 !important; - padding: 0 !important; - line-height: 1.5em !important; -} - - -div.readme .readme_box h1:first-child { - padding-top: .25em !important; -} - -div.readme .readme_box h2, -div.readme .readme_box h3 { - margin: 1em 0 !important; -} - -div.readme .readme_box h2 { - margin-top: 1.5em !important; - border-top: 4px solid #e0e0e0 !important; - padding-top: .5em !important; -} - -div.readme .readme_box p { - color: black !important; - margin: 1em 0 !important; - line-height: 1.5em !important; -} - -div.readme .readme_box ul { - list-style: disc !important; - margin: 1em 0 1em 2em !important; -} - -div.readme .readme_box ol { - list-style: decimal; - margin: 1em 0 1em 2em !important; -} - -div.readme .readme_box code { - font-size: 12px !important; - background-color: ghostWhite !important; - color: #444 !important; - padding: 0 .2em !important; - border: 1px solid #dedede !important; -} - -div.readme .readme_box pre code { - padding: 0 !important; - font-size: 12px !important; - background-color: #eee !important; - border: none !important; -} - -div.readme .readme_box pre { - margin: 1em 0; - font-size: 12px; - background-color: #eee; - border: 1px solid #ddd; - padding: 5px; - color: #444; - overflow: auto; - border-radius: 3px; -} - -div.readme .readme_box table { - display: table; - border-collapse: separate; - border-spacing: 2px; - border-color: gray; - width: auto !important; -} - - -/** RST STYLE **/ - - -div.rst-block { - padding: 0px; -} - -div.rst-block h2 { - font-weight: normal; -} - -div.rst-block { - background-color: #fafafa; -} - -div.rst-block { - clear: both; - overflow: hidden; - margin: 0; - padding: 0 20px; -} - -div.rst-block h1, -div.rst-block h2, -div.rst-block h3, -div.rst-block h4, -div.rst-block h5, -div.rst-block h6 { - border-bottom: 0 !important; - margin: 0 !important; - padding: 0 !important; - line-height: 1.5em !important; -} - - -div.rst-block h1:first-child { - padding-top: .25em !important; -} - -div.rst-block h2, -div.rst-block h3 { - margin: 1em 0 !important; -} - -div.rst-block h2 { - margin-top: 1.5em !important; - border-top: 4px solid #e0e0e0 !important; - padding-top: .5em !important; -} - -div.rst-block p { - color: black !important; - margin: 1em 0 !important; - line-height: 1.5em !important; -} - -div.rst-block ul { - list-style: disc !important; - margin: 1em 0 1em 2em !important; -} - -div.rst-block ol { - list-style: decimal; - margin: 1em 0 1em 2em !important; -} - -div.rst-block code { - font-size: 12px !important; - background-color: ghostWhite !important; - color: #444 !important; - padding: 0 .2em !important; - border: 1px solid #dedede !important; -} - -div.rst-block pre code { - padding: 0 !important; - font-size: 12px !important; - background-color: #eee !important; - border: none !important; -} - -div.rst-block pre { - margin: 1em 0; - font-size: 12px; - background-color: #eee; - border: 1px solid #ddd; - padding: 5px; - color: #444; - overflow: auto; - border-radius: 3px; +#content div.panel ol.lower-roman, +#content div.panel ol.upper-roman, +#content div.panel ol.lower-alpha, +#content div.panel ol.upper-alpha, +#content div.panel ol.decimal { + margin: 10px 24px 10px 44px; } - -/** comment main **/ -.comments { - padding: 10px 20px; - max-width: 978px; -} - -.comments .comment .comment-wrapp { - border: 1px solid #ddd; - margin-top: 10px; - border-radius: 4px; -} - -.comments .comment .meta { - background: #f8f8f8; - padding: 4px; - border-bottom: 1px solid #ddd; - min-height: 18px; - overflow: auto; -} - -.comments .comment .meta img { - vertical-align: middle; -} - -.comments .comment .meta .user { - font-weight: bold; - float: left; - padding: 4px 2px 2px 2px; -} - -.comments .comment .meta .date { - float: left; - padding: 4px 4px 0px 4px; -} - -.comments .comment .text { - background-color: #FAFAFA; +div.form div.form-group div.button input, +#content div.panel div.form div.buttons input, +div.form div.buttons input, +#content div.panel div.action div.button input { + font-size: 11px; + font-weight: 700; + margin: 0; } -.comment .text div.rst-block p { - margin: 0.5em 0px !important; -} - -.comments-number { - margin: 5px; - padding: 0px 0px 10px 0px; - font-weight: bold; - color: #666; - font-size: 16px; -} - -.automatic-comment { - font-style: italic; +div.form div.form-group div.highlight, +#content div.panel div.form div.buttons div.highlight { + display: inline; } - -/** comment form **/ - -.status-block { - margin: 5px; - clear: both +#content div.panel table td.user, +#content div.panel table td.address { + width: 10%; + text-align: center; } - -.comment-form textarea { - width: 100%; - height: 100px; - font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace; -} - -form.comment-form { - margin-top: 10px; - margin-left: 10px; -} - -.comment-inline-form .comment-block-ta, -.comment-form .comment-block-ta { - border: 1px solid #ccc; - border-radius: 3px; - box-sizing: border-box; +#content div.panel div.action div.button { + text-align: right; + margin: 6px 0 0; + padding: 0; } - -.comment-form-submit { - margin-top: 5px; - margin-left: 525px; -} - -.file-comments { - display: none; -} - -.comment-form .comment { - margin-left: 10px; -} - -.comment-form .comment-help { - padding: 5px 5px 5px 5px; - color: #666; +.ac .match { + font-weight: 700; + padding-top: 5px; + padding-bottom: 5px; } -.comment-form .comment-help .preview-btn, -.comment-form .comment-help .edit-btn { - float: right; - margin: -6px 0px 0px 0px; -} - -.comment-form .preview-box.unloaded, -.comment-inline-form .preview-box.unloaded { - height: 50px; - text-align: center; - padding: 20px; - background-color: #fafafa; -} - -.comment-form .comment-button { - padding-top: 5px; -} - -.add-another-button { - margin-left: 10px; - margin-top: 10px; - margin-bottom: 10px; +.q_filter_box { + border-radius: 4px; + border: 0 none; + margin-bottom: -4px; + margin-top: -4px; + padding-left: 3px; } - -.comment .buttons { - float: right; - margin: -1px 0px 0px 0px; -} - - -.show-inline-comments { - position: relative; - top: 1px -} - -/** comment inline form **/ -.comment-inline-form { - margin: 4px; - max-width: 978px; +#node_filter { + border: 0px solid #545454; + color: #AAAAAA; + padding-left: 3px; } -.comment-inline-form .submitting-overlay { - display: none; - height: 0; - text-align: center; - font-size: 16px; - opacity: 0.5; +/** comment main **/ +.comment .panel, +.comment-inline-form { + max-width: 978px; } - -.comment-inline-form .clearfix, -.comment-form .clearfix { - background: #EEE; - border-radius: 4px; - padding: 5px; - margin: 0px; +.comment .panel-body { + background-color: #FAFAFA; } - -div.comment-inline-form { - padding: 4px 0px 6px 0px; -} - -.comment-inline-form textarea { - width: 100%; - height: 100px; - font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace; +.comments-number { + padding: 10px 0; + color: #666; } - -form.comment-inline-form { - margin-top: 10px; - margin-left: 10px; -} - -.comment-inline-form-submit { - margin-top: 5px; - margin-left: 525px; -} - -.file-comments { - display: none; -} - -.comment-inline-form .comment { - margin-left: 10px; +.automatic-comment { + font-style: italic; } - -.comment-inline-form .comment-help { - padding: 5px 5px 5px 5px; - color: #666; -} - -.comment-inline-form .comment-help .preview-btn, -.comment-inline-form .comment-help .edit-btn { - float: right; - margin: -6px 0px 0px 0px; -} - -.comment-inline-form .comment-button { - padding-top: 5px; -} - -/** comment inline **/ -.inline-comments { - padding: 0 20px; +/** comment form **/ +.status-block { + margin: 5px; + clear: both; } - -.inline-comments div.rst-block { - clear: both; - overflow: hidden; - margin: 0; - padding: 0 20px 0px; -} - -.inline-comments .comment .comment-wrapp { - max-width: 978px; - border: 1px solid #ddd; - border-radius: 4px; - margin: 3px 3px 5px 5px; - background-color: #FAFAFA; -} - -.inline-comments .add-button-row { - padding: 2px 4px 8px 5px; +.panel-heading .pull-left input[type=checkbox], +.panel-heading .pull-right input[type=checkbox] { + position: relative; + top: 4px; + margin: -10px 2px 0; } - -.inline-comments .comment .meta { - background: #f8f8f8; - padding: 4px; - border-bottom: 1px solid #ddd; - min-height: 20px; - overflow: auto; -} - -.inline-comments .comment .meta img { - vertical-align: middle; +/** indent actual inline comments - not general comments **/ +td.inline-comments { + padding: @kallithea-panel-margin; } - -.inline-comments .comment .meta .user { - font-weight: bold; - float: left; - padding: 3px; +.inline-comments .comments-number { + padding: 0px 0px 10px 0px; } - -.inline-comments .comment .meta .date { - float: left; - padding: 3px; -} - -.inline-comments .comment .text { - background-color: #FAFAFA; +.comment-inline-well { + margin-bottom: @kallithea-panel-margin; } - -.inline-comments .comments-number { - padding: 0px 0px 10px 0px; - font-weight: bold; - color: #666; - font-size: 16px; -} -.inline-comments-button .add-comment { - margin: 2px 0px 8px 5px !important -} - +input.status_change_checkbox, input.status_change_radio { - margin: 2px 0 5px 15px; - vertical-align: middle; -} - -.notification-paginator { - padding: 0px 0px 4px 16px; + margin: 0 0 5px 15px; } - -#context-pages .pull-request span, -.menu_link_notifications { - padding: 4px 4px !important; - text-align: center; - color: #888 !important; - background-color: #DEDEDE !important; - border-radius: 4px !important; -} - -#context-pages .forks span, -.menu_link_notifications { - padding: 4px 4px !important; - text-align: center; - color: #888 !important; - background-color: #DEDEDE !important; - border-radius: 4px !important; -} - - -.notification-header { - padding-top: 6px; +@keyframes animated-comment-background { + 0% { + background-position: 0 0; + } + 100% { + background-position: 20px 0; + } } -.notification-header .desc { - font-size: 16px; - height: 24px; - float: left -} -.notification-list .container.unread { - background: none repeat scroll 0 0 rgba(255, 255, 180, 0.6); +.comment-preview.failed .user, +.comment-preview.failed .panel-body { + color: #666; } -.notification-header .gravatar { - background: none repeat scroll 0 0 transparent; - padding: 0px 0px 0px 8px; -} -.notification-list .container .notification-header .desc { - font-weight: bold; - font-size: 17px; -} -.notification-table { - border: 1px solid #ccc; - border-radius: 6px 6px 6px 6px; - clear: both; - margin: 0px 20px 0px 20px; +.comment-preview .comment-submission-status { + float: right; } -.notification-header .delete-notifications { - float: right; - padding-top: 8px; - cursor: pointer; -} -.notification-header .read-notifications { - float: right; - padding-top: 8px; - cursor: pointer; +.comment-preview .comment-submission-status .btn-group { + margin-left: 10px; } -.notification-subject { - clear: both; - border-bottom: 1px solid #eee; - padding: 5px 0px 5px 38px; +.comment-preview.submitting .panel-body { + background-image: linear-gradient(-45deg, #FAFAFA, #FAFAFA 25%, #FFF 25%, #FFF 50%, #FAFAFA 50%, #FAFAFA 75%, #FFF 75%, #FFF 100%); + background-size: 20px 20px; + animation: animated-comment-background 0.4s linear infinite; } - -.notification-body { - clear: both; - margin: 34px 2px 2px 8px -} - /**** PULL REQUESTS *****/ -.pullrequests_section_head { - padding: 10px 10px 10px 0px; - margin: 0 20px; - font-size: 16px; - font-weight: bold; -} - div.pr-details-title.closed { - color: #555; - background: #eee; + color: #555; + background: #eee; } - -div.pr-details-title { - font-size: 1.6em; - padding: 5px 0px 5px 10px; -} - div.pr { - margin: 0px 20px; - padding: 4px 4px; -} -div.pr-desc { - margin: 0px 20px; + margin: 0px 15px; + padding: 4px 4px; } tr.pr-closed td { - background-color: #eee !important; - color: #555 !important; + background-color: #eee !important; + color: #555 !important; } - span.pr-closed-tag { - margin-bottom: 1px; - margin-right: 1px; - padding: 1px 3px; - font-size: 10px; - padding: 1px 3px 1px 3px; - font-size: 10px; - color: #577632; - white-space: nowrap; - border-radius: 4px; - border: 1px solid #d9e8f8; - line-height: 1.5em; + margin-bottom: 1px; + margin-right: 1px; + padding: 1px 3px; + font-size: 10px; + color: @kallithea-theme-main-color; + white-space: nowrap; + border-radius: 4px; + border: 1px solid #d9e8f8; + line-height: 1.5em; } - -.pr-box { - max-width: 978px; -} - #s2id_org_ref, #s2id_other_ref, #s2id_org_repo, #s2id_other_repo { - min-width: 150px; - margin: 5px; + min-width: 150px; + margin: 5px; +} +#pr-summary > .pr-not-edit { + min-height: 50px !important; } - -#pr-summary .msg-div { - margin: 5px 0; +/* make 'next iteration' changeset table smaller and scrollable */ +#pr-summary #updaterevs { + max-height: 200px; + overflow-y: auto; + overflow-x: hidden; } /**** PERMS *****/ -#perms .perms_section_head { - padding: 10px 10px 10px 0px; - font-size: 16px; - font-weight: bold; - text-transform: capitalize; -} - -#perms .perm_tag { - padding: 1px 3px 1px 3px; - font-size: 10px; - font-weight: bold; - text-transform: uppercase; - white-space: nowrap; - border-radius: 3px; -} - -#perms .perm_tag.admin { - background-color: #B94A48; - color: #ffffff; -} - -#perms .perm_tag.write { - background-color: #DB7525; - color: #ffffff; -} - -#perms .perm_tag.read { - background-color: #468847; - color: #ffffff; -} - -#perms .perm_tag.none { - background-color: #bfbfbf; - color: #ffffff; -} - -.perm-gravatar { - vertical-align: middle; - padding: 2px; -} .perm-gravatar-ac { - vertical-align: middle; - padding: 2px; - width: 14px; - height: 14px; -} - -/***************************************************************************** - DIFFS CSS -******************************************************************************/ -.diff-collapse { - text-align: center; - margin-bottom: -15px; -} -.diff-collapse-button { - cursor: pointer; - color: #666; - font-size: 16px; -} -.diff-container { - -} - -.diff-container.hidden { - display: none; - overflow: hidden; -} - - -div.diffblock { - overflow: auto; - padding: 0px; - border: 1px solid #ccc; - background: #f8f8f8; - font-size: 100%; - line-height: 100%; - /* new */ - line-height: 125%; - border-radius: 6px 6px 0px 0px; -} -div.diffblock.margined { - margin: 0px 20px 0px 20px; -} -div.diffblock .code-header { - border-bottom: 1px solid #CCCCCC; - background: #EEEEEE; - padding: 10px 0 10px 0; - min-height: 14px; -} - -div.diffblock .code-header.banner { - border-bottom: 1px solid #CCCCCC; - background: #EEEEEE; - height: 14px; - margin: 0; - padding: 3px 100px 11px 100px; -} - -div.diffblock .code-header-title { - padding: 0px 0px 10px 5px !important; - margin: 0 !important; -} -div.diffblock .code-header .hash { - float: left; - padding: 2px 0 0 2px; -} -div.diffblock .code-header .date { - float: left; - text-transform: uppercase; - padding: 2px 0px 0px 2px; -} -div.diffblock .code-header div { - margin-left: 4px; - font-weight: bold; - font-size: 14px; -} - -div.diffblock .parents { - float: left; - min-height: 26px; - font-size: 10px; - font-weight: 400; - vertical-align: middle; - padding: 0px 2px 2px 2px; - background-color: #eeeeee; - border-bottom: 1px solid #CCCCCC; -} - -div.diffblock .children { - float: right; - min-height: 26px; - font-size: 10px; - font-weight: 400; - vertical-align: middle; - text-align: right; - padding: 0px 2px 2px 2px; - background-color: #eeeeee; - border-bottom: 1px solid #CCCCCC; + vertical-align: middle; + padding: 2px; + width: 14px; + height: 14px; } -div.diffblock .code-body { - background: #FFFFFF; - clear: both; -} -div.diffblock pre.raw { - background: #FFFFFF; - color: #000000; -} -table.code-difftable { - border-collapse: collapse; - width: 99%; - border-radius: 0px !important; -} -table.code-difftable td { - padding: 0 !important; - background: none !important; - border: 0 !important; - vertical-align: baseline !important -} -table.code-difftable .context { - background: none repeat scroll 0 0 #DDE7EF; - color: #999; -} -table.code-difftable .add { - background: none repeat scroll 0 0 #DDFFDD; -} -table.code-difftable .add ins { - background: none repeat scroll 0 0 #AAFFAA; - text-decoration: none; -} -table.code-difftable .del { - background: none repeat scroll 0 0 #FFDDDD; -} -table.code-difftable .del del { - background: none repeat scroll 0 0 #FFAAAA; - text-decoration: none; -} - -table.code-highlighttable div.code-highlight pre u:before, -table.code-difftable td.code pre u:before { - content: "\21a6"; - display: inline-block; - width: 0; -} -table.code-highlighttable div.code-highlight pre u.cr:before, -table.code-difftable td.code pre u.cr:before { - content: "\21a4"; - display: inline-block; - color: rgba(0,0,0,0.5); -} -table.code-highlighttable div.code-highlight pre u, -table.code-difftable td.code pre u { - color: rgba(0,0,0,0.15); -} -table.code-highlighttable div.code-highlight pre i, -table.code-difftable td.code pre i { - border-style: solid; - border-left-width: 1px; - color: rgba(0,0,0,0.5); -} - -/** LINE NUMBERS **/ -table.code-difftable .lineno { - padding-left: 2px; - padding-right: 2px !important; - width: 30px; - -moz-user-select: none; - -webkit-user-select: none; - border-right: 1px solid #CCC !important; - border-left: 0px solid #CCC !important; - border-top: 0px solid #CCC !important; - border-bottom: none !important; - vertical-align: middle !important; - text-align: center; -} -table.code-difftable .lineno.new { - text-align: right; -} -table.code-difftable .lineno.old { - text-align: right; -} -table.code-difftable .lineno a { - color: #aaa !important; - font: 11px Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace !important; - letter-spacing: -1px; - padding-left: 10px; - padding-right: 8px; - box-sizing: border-box; - cursor: pointer; - display: block; - width: 100%; +/* avoid gaps between the navbar and browser */ +.navbar.mainmenu { + border-top-left-radius: 0; + border-top-right-radius: 0; } - -table.code-difftable .lineno-inline { - background: none repeat scroll 0 0 #FFF !important; - padding-left: 2px; - padding-right: 2px; - text-align: right; - width: 30px; - -moz-user-select: none; - -webkit-user-select: none; -} - -/** CODE **/ -table.code-difftable .code { - display: block; - width: 100%; -} -table.code-difftable .code td { - margin: 0; - padding: 0; -} -table.code-difftable .code pre { - margin: 0 0 0 12px; - padding: 0; - min-height: 17px; - line-height: 17px; - white-space: pre-wrap; -} - -table.code-difftable .del .code pre:before { - content: "-"; - color: #800; - float: left; - left: -1em; - position: relative; - width: 0; -} - -table.code-difftable .add .code pre:before { - content: "+"; - color: #080; - float: left; - left: -1em; - position: relative; - width: 0; -} - -table.code-difftable .unmod .code pre:before { - content: " "; - float: left; - left: -1em; - position: relative; - width: 0; -} - -.add-bubble { - position: relative; - display: none; - float: left; - width: 0px; - height: 0px; - left: -8px; - box-sizing: border-box; -} - -/* comment bubble, only visible when in a commentable diff */ -.commentable-diff tr.line.add:hover td .add-bubble, -.commentable-diff tr.line.del:hover td .add-bubble, -.commentable-diff tr.line.unmod:hover td .add-bubble { - display: block; - z-index: 1; -} - -.add-bubble div { - background: #577632; - width: 16px; - height: 16px; - cursor: pointer; - padding: 0 2px 2px 0.5px; - border: 1px solid #577632; - border-radius: 3px; - box-sizing: border-box; -} - -.add-bubble div:before { - font-size: 14px; - color: #ffffff; - font-family: "kallithea"; - content: '\1f5ea'; -} - -.add-bubble div:hover { - transform: scale(1.2, 1.2); +.navbar.footer { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; } /* show some context of link targets - but only works when the link target @@ -4823,53 +650,309 @@ div.comment:target:before { margin: -100px 0 0; content: ""; } +div.comment:target > .panel { + border: solid 2px #ee0 !important; +} +.lineno:target a { + border: solid 2px #ee0 !important; + margin: -2px; +} +.btn-image-diff-show, +.btn-image-diff-swap { + margin: 5px; +} +.img-diff { + max-width: 45%; + height: auto; + margin: 5px; + /* http://lea.verou.me/demos/css3-patterns.html */ + background-image: linear-gradient(45deg, #888 25%, transparent 25%, transparent), linear-gradient(-45deg, #888 25%, transparent 25%, transparent), linear-gradient(45deg, transparent 75%, #888 75%), linear-gradient(-45deg, transparent 75%, #888 75%); + background-size: 10px 10px; + background-color: #999; +} +.img-preview { + max-width: 100%; + height: auto; + margin: 5px; +} +div.comment-prev-next-links div.prev-comment, +div.comment-prev-next-links div.next-comment { + display: inline-block; + min-width: 150px; + margin: 3px 15px; +} +#comments-general-comments div.comment-prev-next-links div.prev-comment, +#comments-general-comments div.comment-prev-next-links div.next-comment { + margin-left: 0; +} -div.comment:target>.comment-wrapp { - border: solid 2px #ee0 !important; - margin: 2px 2px 4px 4px; +/* changelog graph */ +#graph_nodes, +#updaterevs-graph { + .make-xs-column(1); + height: 0; +} +#graph_content, +#graph_content_pr, +#updaterevs-table { + .make-xs-column-offset(1); + .make-xs-column(11); + padding: 0; +} + +/* use bootstrap grid columns for centered columns */ +.centered-column { + .make-sm-column-offset(3); + .make-sm-column(6); + .form { + .form-horizontal; + .form-group > label { + .make-sm-column(4); + } + .form-group > div { + .make-sm-column(8); + } + .form-group > div:first-child { /* in case there is no label */ + .make-sm-column-offset(4); + .make-sm-column(8); + } + } } -.lineno:target a { - border: solid 2px #ee0 !important; - margin: -2px; +/* use columns and form-horizontal for settings pages ... on wide screens */ +@media (min-width: @screen-sm-min) { + .settings { + max-width: @container-md; + > ul.nav-stacked { + .make-sm-column(2); + max-width: (@container-md/12)*2; + } + > div { + .make-sm-column(10); + max-width: (@container-md/12)*10; + } + .form { + .form-horizontal; + } + .form-group { + .clearfix; + > label { + .make-xs-column(3); + overflow: hidden; + text-overflow: ellipsis; + input { + width: 100%; + } + } + > div { + .make-xs-column(9); + } + .buttons { + .make-xs-column-offset(3); + } + } + } } -.btn-image-diff-show, -.btn-image-diff-swap { - margin: 5px; +/* use columns and form-horizontal for summary page */ +#summary { + max-width: @container-md; + .form-horizontal; + .make-sm-column(10); + padding-left: 0; + .form-group > label { + .make-sm-column(2); + } + .form-group > div { + .make-sm-column(10); + } +} +#summary-menu-stats { + .make-sm-column(2); + padding-right: 0; +} + +/* use columns and form-horizontal for pull request page */ +.pr-box { + .make-sm-column(9); + padding-left: 0; + max-width: @container-md; + #pr-summary { + .form-horizontal; + .form-group > label { + .make-sm-column(3); + } + .form-group > div { + .make-sm-column(9); + } + .form-group > .buttons { + .make-sm-column-offset(3); + .make-sm-column(9); + } + } +} +.pr-reviewers-box { + .make-sm-column(3); + padding-right: 0; } -.img-diff { - max-width: 45%; - height: auto; - margin: 5px; - /* http://lea.verou.me/demos/css3-patterns.html */ - background-image: - linear-gradient(45deg, #888 25%, transparent 25%, transparent), - linear-gradient(-45deg, #888 25%, transparent 25%, transparent), - linear-gradient(45deg, transparent 75%, #888 75%), - linear-gradient(-45deg, transparent 75%, #888 75%); - background-size: 10px 10px; - background-color: #999; +/* repo table icons */ +#repos_list_wrap_wrapper { + /* make icon-folder and repotag the same width */ + .icon-folder:before { + margin: 0; // default margin would otherwise add to the total width + width: 24px; + text-align: left; + } + .label-repo { + display: inline-block; + width: 24px; + } } -.img-preview { - max-width: 100%; - height: auto; - margin: 5px; +/* changelog table columns */ +.table#changesets { + table-layout: fixed; + td { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + vertical-align: baseline; + &:last-child { + padding-right: 0; + } + } + .checkbox-column { + width: 20px; + padding: 0; + /* the optional second checkbox will be inline-block but should wrap to a new line */ + white-space: normal; + > input[type=checkbox] { + margin-top: inherit; + vertical-align: text-bottom; + } + } + .changeset-logical-index { + color: @gray-light; + font-style: italic; + font-size: 85%; + text-align: right; + overflow: visible; + } + .changeset-logical-index, + .expand_commit, + .status { + width: 28px; + } + .author { + width: 200px; + @media (max-width: @screen-sm-max) { + width: 120px; + } + @media (max-width: @screen-xs-max) { + width: 20px; + /* keep gravatar but hide name on tiny screens to give important columns more room */ + span { + .hidden; + } + } + > .icon-user::before { + margin: 0; + } + } + .hash { + .small; + width: 110px; + @media (max-width: @screen-xs-max) { + width: 48px; + } + } + .date { + .small; + width: 100px; + } + /* hide on small screens to give important columns more room */ + .status, + .expand_commit, + .comments, + .extra-container { + .hidden-xs; + } + .mid > .log-container { + position: relative; + overflow: hidden; + > .extra-container { + position: absolute; + top: 0; + right: 0; + background: white; + box-shadow: -10px 0px 10px 0px white; + } + } } -div.comment-prev-next-links div.prev-comment, -div.comment-prev-next-links div.next-comment { - display: inline-block; - min-width: 150px; - margin: 3px 6px; +/* undo Bootstrap chrome/webkit blue outline on focus in navbar */ +.navbar-inverse .navbar-nav > li > a:focus { + outline: 0; +} + +/* use same badge coloring in navbar inverse as in panel-heading */ +.navbar-inverse { + .badge { + color: @navbar-inverse-bg; + background-color: @navbar-inverse-color; + } } -#help_kb { - display: none; +/* pygments style */ +div.search-code-body pre .match { + background-color: @highlight-color; +} +div.search-code-body pre .break { + background-color: @highlight-line-color; + width: 100%; + color: #747474; + display: block; +} +div.annotatediv { + margin-left: 2px; + margin-right: 4px; +} +.code-highlight { + border-left: 1px solid #ccc; +} +.code-highlight pre, +.linenodiv pre { + padding: 5px 2px 0px 5px; + margin: 0; +} +.code-highlight pre div:target { + background-color: #FFFFBE !important; +} +.linenos a { text-decoration: none; } + +/* Stylesheets for the context bar */ +#quick_login > .pull-right .list-group-item { + background-color: @kallithea-theme-main-color; + border: 0; +} +#content #context-pages .follow .show-following, +#content #context-pages .following .show-follow { + display: none; } -.icon-only-links i { - color: white; +nav.navbar #quick > li > a, +#context-pages > ul > li > a { + height: @navbar-height; } + +/* align with panel-heading */ +nav.navbar#context-bar > .container-fluid { + padding-left: 15px; +} + +/* at.js */ +.atwho-view strong { + /* the blue color doesn't look good, use normal color */ + color: inherit; +} diff --git a/kallithea/i18n/be/LC_MESSAGES/kallithea.po b/kallithea/i18n/be/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/be/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/be/LC_MESSAGES/kallithea.po @@ -1,104 +1,128 @@ # Belarusian translations for Kallithea. -# Copyright (C) 2015 Various authors, licensing as GPLv3 +# Copyright (C) 2016 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. -# Automatically generated, 2015. +# Automatically generated, 2016. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" -"PO-Revision-Date: 2017-04-22 21:08+0000\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"PO-Revision-Date: 2017-08-20 10:44+0000\n" "Last-Translator: Viktar Vauchkevich \n" -"Language-Team: Belarusian " -"\n" +"Language-Team: Belarusian \n" "Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" -"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.14-dev\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.17-dev\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "Яшчэ не было змен" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Нічога" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(зачынена)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" -msgstr "Адлюстроўваць прабелы" - -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +msgstr "Паказваць прабелы" + +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ігнараваць прабелы" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Павялічыць кантэкст да %(num)s радкоў" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +#, fuzzy +#| msgid "No permission to change pull request status" +msgid "No permission to change status" +msgstr "Няма правоў змяняць статус pull-запыту" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 msgid "Such revision does not exist for this repository" msgstr "Няма такой рэвізіі ў гэтым рэпазітары" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "Нельга рэдагаваць статус змен, злучаных з зачыненымі pull-request'ами" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Выбраць набор змен" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, python-format +msgid "Could not find other repository %s" +msgstr "Не атрымалася знайсці іншы рэпазітар %s" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "Немагчыма параўноўваць рэпазітары розных тыпаў" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "Немагчыма параўноўваць рэпазітары без агульнага продка" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "Няма адказу" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "Невядомая памылка" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." msgstr "Запыт не распазнаны серверам з-за няправільнага сінтаксісу." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Несанкцыянаваны доступ да рэсурсу" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "У вас няма правоў для прагляду гэтай старонкі" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Рэсурс не знойдзены" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -106,360 +130,361 @@ msgstr "" "Сервер не можа выканаць запыт з-за нечаканых умоваў, якія ўзніклі падчас " "яго спрацавання." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Змены ў рэпазітары %s" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "%s выканаў каміт у %s" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "Змены апынуліся занадта вялікімі і былі скарочаныя..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 #, python-format msgid "%s %s feed" msgstr "Стужка навін %s %s" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "Змены апынуліся занадта вялікімі і былі выразаныя..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s выканаў каміт у %s" - -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" +msgstr "Змены ў рэпазітары %s" + +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Націсніце каб дадаць новы файл" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "Няма файлаў. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "%s (%s)" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Рэпазітар заблакаваў %s у %s" -#: kallithea/controllers/files.py:317 +#: kallithea/controllers/files.py:312 msgid "You can only delete files with revision being a valid branch" -msgstr "Вы можаце выдаляць файлы толькі ў рэвізіі, злучанай з існай галінкай" - -#: kallithea/controllers/files.py:328 +msgstr "Вы можаце выдаляць файлы толькі ў рэвізіі, злучанай з існай галінай" + +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s выдалены з дапамогай Kallithea" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s выдалены" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "Падчас каміта адбылася памылка" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 msgid "You can only edit files with revision being a valid branch" -msgstr "Вы можаце рэдагаваць файлы толькі ў рэвізіі, злучанай з існай галінкай" - -#: kallithea/controllers/files.py:391 +msgstr "" +"Вы можаце рэдагаваць файлы толькі ў рэвізіі, злучанай з існай галінай" + +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s адрэдагаваны з дапамогай Kallithea" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "Без змен" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" -msgstr "Змены ўжыты ў %s" - -#: kallithea/controllers/files.py:443 +msgstr "Змены захаваныя ў %s" + +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "Файл дададзены з дапамогай Kallithea" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "Пуста" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "Безназоўны" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Размяшчэнне павінна быць адносным шляхам, і не можа ўтрымліваць \"..\" у " "шляхі" -#: kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" -msgstr "Магчымасць спампоўваць адключана" - -#: kallithea/controllers/files.py:537 +msgstr "Магчымасць спампоўваць адключаная" + +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "Невядомая рэвізія %s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "Пусты рэпазітар" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "Невядомы тып архіва" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Набор змен" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" -msgstr "Галінкі" - -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +msgstr "Галіны" + +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Тэгі" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" -msgstr "Адбылася памылка падчас стварэння форка рэпазітара %s" - -#: kallithea/controllers/home.py:84 +msgstr "Памылка падчас стварэння форка рэпазітара %s" + +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "Групы" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Рэпазітары" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" -msgstr "Галінка" - -#: kallithea/controllers/home.py:136 +msgstr "Галіна" + +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Зачыненыя галіны" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "Тэгі" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "Закладкі" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" -msgstr "Публічны часопіс" - -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +msgstr "Публічны журнал" + +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" -msgstr "Часопіс" - -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +msgstr "Журнал" + +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "Няслушная капча" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "Рэгістрацыя ў Kallithea прайшла паспяхова" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "Рэгістрацыя ў %s прайшла паспяхова" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" -msgstr "Спасылка для скідання пароля адасланая" - -#: kallithea/controllers/login.py:246 +msgstr "Код для скідання пароля адпраўлены" + +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" -msgstr "Няспраўны код для скідання пароля" - -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +msgstr "Няслушны код скідання пароля" + +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "Пароль абноўлены" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "Няслушны рэцэнзент \"%s\"" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" msgstr "%s (зачынена)" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Змены" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" msgstr "Адмысловы" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" -msgstr "Галінкі ўдзельніка" - -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +msgstr "Галіны ўдзельніка" + +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "Закладкі" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "Памылка пры стварэнні pull-запыту: %s" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "Няма апісання" - -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "Pull-запыт створаны паспяхова" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 msgid "Error occurred while creating pull request" msgstr "Адбылася памылка пры стварэнні pull-запыту" -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "Адсутныя рэвізіі адносна папярэдняга pull-запыту:" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Новыя рэвізіі на %s %s адносна папярэдняга pull-запыту:" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "Гэты pull-запыт заснаваны на іншай рэвізіі %s, просты diff немагчымы." - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Няма змен на %s %s адносна папярэдняй версіі." - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Зачынены, замешчаны %s." - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "Pull-запыт створаны паспяхова" + +#: kallithea/controllers/pullrequests.py:375 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" msgstr "Абнаўленне для pull-запыту створана" -#: kallithea/controllers/pullrequests.py:514 +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Няма апісання" + +#: kallithea/controllers/pullrequests.py:432 msgid "Pull request updated" msgstr "Pull-запыт абноўлены" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "Pull-запыт паспяхова выдалены" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, fuzzy, python-format +#| msgid "Changeset for %s %s not found in %s" +msgid "Revision %s not found in %s" +msgstr "Набор змен для %s %s не знойдзены ў %s" + +#: kallithea/controllers/pullrequests.py:508 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "Няма змен для абнаўлення гэтага pull-запыту." + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." -msgstr "Гэты pull-запыт ужо прыняты на галінку %s." - -#: kallithea/controllers/pullrequests.py:597 +msgstr "Гэты pull-запыт ужо прыняты на галіну %s." + +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "Гэты pull-запыт быў зачынены і не можа быць абноўлены." -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "Гэты pull-запыт можа быць абноўлены з %s:" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:543 +#, fuzzy, python-format +#| msgid "The following changes are available on %s:" +msgid "The following additional changes are available on %s:" +msgstr "Гэтыя змены даступныя на %s:" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "Няма змен для абнаўлення гэтага pull-запыту." -#: kallithea/controllers/pullrequests.py:627 +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." -msgstr "Увага: Галінка %s мае яшчэ адну верхавіну: %s." - -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "Абнаўленне pull-запытаў git не падтрымліваецца." - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "Няма правоў змяняць статус pull-запыту" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "Зачынены." - -#: kallithea/controllers/search.py:135 +msgstr "Увага: Галіна %s мае яшчэ адну верхавіну: %s." + +#: kallithea/controllers/pullrequests.py:564 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." +msgstr "Абнаўленне pull-запытаў git яшчэ не падтрымліваецца." + +#: kallithea/controllers/pullrequests.py:566 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "Няма змен для абнаўлення гэтага pull-запыту." + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "Недапушчальны пошукавы запыт. Паспрабуйце скласці яго ў двукоссі." #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Індэксы адсутнічаюць. Калі ласка, запусціце індэксатар Whoosh" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." -msgstr "Адбылася памылка пры выкананні гэтага пошуку." - -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +msgstr "Памылка пры выкананні гэтага пошуку." + +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "Няма дадзеных" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "Статыстычныя дадзеныя адключаны для гэтага рэпазітара" @@ -469,153 +494,155 @@ msgstr "Налады аўтарызацыі паспяхова абноўлены" #: kallithea/controllers/admin/auth_settings.py:146 msgid "error occurred during update of auth settings" -msgstr "адбылася памылка пры абнаўленні налад аўтарызацыі" - -#: kallithea/controllers/admin/defaults.py:97 +msgstr "памылка пры абнаўленні налад аўтарызацыі" + +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Стандартныя налады паспяхова абноўлены" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" -msgstr "Адбылася памылка пры абнаўленні стандартных налад" +msgstr "Памылка пры абнаўленні стандартных налад" + +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "Назаўжды" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" -msgstr "Назаўжды" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 хвілін" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "5 хвілін" +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "1 гадзіна" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" -msgstr "1 гадзіна" - -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 дзень" -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 месяц" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Тэрмін" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "Адбылася памылка падчас стварэння gist-запіса" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "Gist-запіс %s выдалены" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:196 msgid "Unmodified" msgstr "Без змен" -#: kallithea/controllers/admin/gists.py:262 +#: kallithea/controllers/admin/gists.py:225 msgid "Successfully updated gist content" -msgstr "" - -#: kallithea/controllers/admin/gists.py:267 +msgstr "Gist-запіс абноўлены" + +#: kallithea/controllers/admin/gists.py:230 msgid "Successfully updated gist data" -msgstr "Дадзеныя gist-запісы абноўлены" - -#: kallithea/controllers/admin/gists.py:270 +msgstr "Gist-запіс абноўлены" + +#: kallithea/controllers/admin/gists.py:233 #, python-format msgid "Error occurred during update of gist %s" -msgstr "Адбылася памылка пры абнаўленні gist-запісы %s" - -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +msgstr "Памылка пры абнаўленні gist-запісу %s" + +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -"Вы не можаце змяніць дадзеныя гэтага карыстача, паколькі ён важны для " -"працы ўсяго прыкладання" - -#: kallithea/controllers/admin/my_account.py:129 +"Вы не можаце змяніць дадзеныя гэтага карыстальніка, паколькі ён важны для " +"працы ўсёй праграмы" + +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "Ваш уліковы запіс паспяхова абноўлены" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" -msgstr "Адбылася памылка пры абнаўленні карыстача %s" - -#: kallithea/controllers/admin/my_account.py:178 +msgstr "Памылка пры абнаўленні карыстальніка %s" + +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "Памылка пры абнаўленні пароля" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" -msgstr "Карыстачу дададзены e-mail %s" - -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +msgstr "Карыстальніку дададзены e-mail %s" + +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" -msgstr "Адбылася памылка пры захаванні e-mail" - -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +msgstr "Памылка пры захаванні e-mail" + +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" -msgstr "E-mail карыстача выдалены" +msgstr "E-mail карыстальніка выдалены" + +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "API-ключ паспяхова створаны" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "API-ключ паспяхова скінуты" #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "API-ключ паспяхова створаны" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "API-ключ паспяхова скінуты" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API-ключ паспяхова выдалены" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Чытанне" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Запіс" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -623,623 +650,624 @@ msgstr "Запіс" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Адміністратар" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Адключана" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Дазволена, з ручной актывацыяй уліковага запісу" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Дазволена, з аўтаматычнай актывацыяй уліковага запісу" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "Ручная актывацыя вонкавага ўліковага запісу" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "Аўтаматычная актывацыя вонкавага ўліковага запісу" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "Адключана" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Дазволена, з ручной актывацыяй уліковага запісу" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Дазволена, з аўтаматычнай актывацыяй уліковага запісу" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "Ручная актывацыя вонкавага ўліковага запісу" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "Аўтаматычная актывацыя вонкавага ўліковага запісу" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Уключана" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" -msgstr "Глабальныя прывілеі паспяхова абноўлены" - -#: kallithea/controllers/admin/permissions.py:139 +msgstr "Глабальныя прывілеі паспяхова абноўленыя" + +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Адбылася памылка падчас абнаўлення прывілеяў" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Адбылася памылка пры стварэнні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" -msgstr "Створана новая група рэпазітароў %s" - -#: kallithea/controllers/admin/repo_groups.py:250 +msgstr "Створаная новая група рэпазітароў %s" + +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" -msgstr "Група рэпазітароў %s абноўлена" - -#: kallithea/controllers/admin/repo_groups.py:266 +msgstr "Група рэпазітароў %s абноўленая" + +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Адбылася памылка пры абнаўленні групы рэпазітароў %s" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" -msgstr "Дадзеная група ўтрымоўвае %s рэпазітароў і не можа быць выдалена" - -#: kallithea/controllers/admin/repo_groups.py:291 +msgstr "Група ўтрымлівае %s рэпазітароў і не можа быць выдаленая" + +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" -msgstr "Група ўтрымоўвае ў сабе %s падгруп і не можа быць выдалены" - -#: kallithea/controllers/admin/repo_groups.py:297 +msgstr "Група ўтрымлівае ў сабе %s падгруп і не можа быць выдаленая" + +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" -msgstr "Група рэпазітароў %s выдалена" - -#: kallithea/controllers/admin/repo_groups.py:302 +msgstr "Група рэпазітароў %s выдаленая" + +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" -msgstr "Адбылася памылка пры выдаленні групы рэпазітароў %s" - -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +msgstr "Памылка пры выдаленні групы рэпазітароў %s" + +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "Адміністратар не можа адклікаць свае прывелеі" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" -msgstr "Прывілеі групы рэпазітароў абноўлены" - -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +msgstr "Прывілеі групы рэпазітароў абноўленыя" + +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" -msgstr "Адбылася памылка пры водгуку прывелеі" - -#: kallithea/controllers/admin/repos.py:152 +msgstr "Памылка пры водгуку прывелея" + +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" -msgstr "Адбылася памылка пры стварэнні рэпазітара %s" - -#: kallithea/controllers/admin/repos.py:213 +msgstr "Памылка пры стварэнні рэпазітара %s" + +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Рэпазітар %s створаны з %s" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" -msgstr "Зроблены форк(копія) рэпазітара %s на %s" - -#: kallithea/controllers/admin/repos.py:225 +msgstr "Зроблены форк рэпазітара %s на %s" + +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Рэпазітар %s створаны" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Рэпазітар %s паспяхова абноўлены" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" -msgstr "Адбылася памылка падчас абнаўлення рэпазітара %s" - -#: kallithea/controllers/admin/repos.py:310 +msgstr "Памылка падчас абнаўлення рэпазітара %s" + +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" -msgstr "Форки %s адлучаны" - -#: kallithea/controllers/admin/repos.py:313 +msgstr "Форкі %s адлучаныя" + +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" -msgstr "Выдалены форки рэпазітара %s" - -#: kallithea/controllers/admin/repos.py:318 +msgstr "Выдаленыя форки рэпазітара %s" + +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Рэпазітар %s выдалены" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Немагчыма выдаліць %s, ён усё яшчэ мае форкі" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" -msgstr "Адбылася памылка падчас выдалення %s" - -#: kallithea/controllers/admin/repos.py:374 +msgstr "Памылка падчас выдалення %s" + +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" -msgstr "Прывілеі рэпазітара абноўлены" - -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "Адбылася памылка пры стварэнні поля" - -#: kallithea/controllers/admin/repos.py:444 +msgstr "Прывілеі рэпазітара абноўленыя" + +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" +msgstr "Памылка пры стварэнні поля" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" -msgstr "Адбылася памылка пры выдаленні поля" - -#: kallithea/controllers/admin/repos.py:460 +msgstr "Памылка пры выдаленні поля" + +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "-- Не форк --" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:446 msgid "Updated repository visibility in public journal" msgstr "Бачнасць рэпазітара ў публічным часопісе абноўлена" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:450 msgid "An error occurred during setting this repository in public journal" -msgstr "Адбылася памылка пры ўсталёўцы рэпазітара ў агульнадаступны часопіс" - -#: kallithea/controllers/admin/repos.py:512 +msgstr "Памылка пры даданні рэпазітара ў агульнадаступны часопіс" + +#: kallithea/controllers/admin/repos.py:466 msgid "Nothing" msgstr "Нічога" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:468 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Рэпазітар %s адзначаны як форк %s" -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:475 msgid "An error occurred during this operation" -msgstr "Адбылася памылка пры выкананні аперацыі" - -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 +msgstr "Памылка пры выкананні аперацыі" + +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 msgid "Repository has been locked" msgstr "Рэпазітар заблакаваны" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" -msgstr "Рэпазітар адблакаваны" - -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +msgstr "Рэпазітар разблакаваны" + +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" -msgstr "Адбылася памылка падчас разблакавання" - -#: kallithea/controllers/admin/repos.py:582 +msgstr "Памылка падчас разблакавання" + +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "Кэш скінуты" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" -msgstr "Адбылася памылка пры ачыстцы кэша" - -#: kallithea/controllers/admin/repos.py:601 +msgstr "Памылка пры скіданні кэша" + +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" -msgstr "Занесены змены з выдаленага рэпазітара" - -#: kallithea/controllers/admin/repos.py:604 +msgstr "Занесеныя змены з аддаленага рэпазітара" + +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" -msgstr "Адбылася памылка пры занясенні змен з выдаленага рэпазітара" - -#: kallithea/controllers/admin/repos.py:637 +msgstr "Памылка пры занясенні змен з аддаленага рэпазітара" + +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "Адбылася памылка пры выдаленні статыстыкі рэпазітара" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "Абноўлены налады VCS" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -"Немагчыма ўключыць падтрымку hgsubversion. Бібліятэка «hgsubversion» " +"Немагчыма ўключыць падтрымку hgsubversion. Бібліятэка hgsubversion " "адсутнічае" -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" -msgstr "Адбылася памылка пры абнаўленні налад прыкладання" - -#: kallithea/controllers/admin/settings.py:211 +msgstr "Памылка пры абнаўленні наладаў праграмы" + +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." -msgstr "Рэпазітары паспяхова перасканіраваны, дададзена: %s, выдалена: %s." - -#: kallithea/controllers/admin/settings.py:226 +msgstr "Рэпазітары паспяхова перасканаваныя, дададзена: %s, выдалена: %s." + +#: kallithea/controllers/admin/settings.py:189 #, python-format msgid "Invalidated %s repositories" msgstr "Скінуць кэш для %s рэпазітароў" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" -msgstr "Абноўленыя параметры налады прыкладання" - -#: kallithea/controllers/admin/settings.py:337 +msgstr "Абноўленыя налады праграмы" + +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Налады візуалізацыі абноўленыя" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" -msgstr "Адбылася памылка пры абнаўленні налад візуалізацыі" - -#: kallithea/controllers/admin/settings.py:368 +msgstr "Адбылася памылка пры абнаўленні наладаў візуалізацыі" + +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" -msgstr "Калі ласка, увядзіце email-адрас" - -#: kallithea/controllers/admin/settings.py:383 +msgstr "Калі ласка, увядзіце e-mail-адрас" + +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Задача адпраўкі e-mail створаная" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +#, fuzzy +#| msgid "No data ready yet" +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 "Added new hook" msgstr "Дададзены новы хук" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Абноўленыя хукі" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" -msgstr "адбылася памылка пры стварэнні хука" - -#: kallithea/controllers/admin/settings.py:458 +msgstr "Памылка пры стварэнні хука" + +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" -msgstr "Запланавана пераіндэксаванне базы Whoosh" - -#: kallithea/controllers/admin/user_groups.py:150 +msgstr "Запланаванае пераіндэксаванне базы Whoosh" + +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" -msgstr "Створана група карыстачоў %s" - -#: kallithea/controllers/admin/user_groups.py:163 +msgstr "Створана група карыстальнікаў %s" + +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" -msgstr "Адбылася памылка пры стварэнні групы карыстачоў %s" - -#: kallithea/controllers/admin/user_groups.py:201 +msgstr "Памылка пры стварэнні групы карыстальнікаў %s" + +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" -msgstr "Група карыстачоў %s абноўлена" - -#: kallithea/controllers/admin/user_groups.py:224 +msgstr "Група карыстальнікаў %s абноўленая" + +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" -msgstr "Адбылася памылка пры абнаўленні групы карыстачоў %s" - -#: kallithea/controllers/admin/user_groups.py:242 +msgstr "Памылка пры абнаўленні групы карыстальнікаў %s" + +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" -msgstr "Група карыстачоў паспяхова выдалена" - -#: kallithea/controllers/admin/user_groups.py:247 +msgstr "Група карыстальнікаў паспяхова выдаленая" + +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" -msgstr "Адбылася памылка пры выдаленні групы карыстачоў" - -#: kallithea/controllers/admin/user_groups.py:314 +msgstr "Памылка пры выдаленні групы карыстальнікаў" + +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" -msgstr "Мэтавая група не можа быць такі ж" - -#: kallithea/controllers/admin/user_groups.py:320 +msgstr "Мэтавая група не можа быць той жа самай" + +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" -msgstr "Прывілеі групы карыстачоў абноўлены" - -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +msgstr "Прывілеі групы карыстальнікаў абноўленыя" + +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" -msgstr "Абноўлены прывілеі" - -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +msgstr "Абноўленыя прывілеі" + +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" -msgstr "Адбылася памылка пры захаванні прывілеяў" - -#: kallithea/controllers/admin/users.py:134 +msgstr "Памылка пры захаванні прывілеяў" + +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" -msgstr "Карыстач %s створаны" - -#: kallithea/controllers/admin/users.py:149 +msgstr "Карыстальнік %s створаны" + +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" -msgstr "Адбылася памылка пры стварэнні карыстача %s" - -#: kallithea/controllers/admin/users.py:182 +msgstr "Памылка пры стварэнні карыстальніка %s" + +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" -msgstr "Карыстач паспяхова абноўлены" - -#: kallithea/controllers/admin/users.py:218 +msgstr "Карыстальнік паспяхова абноўлены" + +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" -msgstr "Карыстач паспяхова выдалены" - -#: kallithea/controllers/admin/users.py:223 +msgstr "Карыстальнік паспяхова выдалены" + +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" -msgstr "Адбылася памылка пры выдаленні карыстача" - -#: kallithea/controllers/admin/users.py:236 +msgstr "Памылка пры выдаленні карыстальніка" + +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" -msgstr "Дададзены IP %s у белы спіс карыстача" - -#: kallithea/controllers/admin/users.py:469 +msgstr "Дададзены IP %s у белы спіс карыстальніка" + +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "Адбылася памылка пры захаванні IP" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" -msgstr "Выдалены IP %s з белага спісу карыстача" - -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "IP %s заблакаваны" - -#: kallithea/lib/auth.py:757 +msgstr "Выдалены IP %s з белага спісу карыстальніка" + +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" +"Вы павінны быць зарэгістраваным карыстальнікам, каб выканаць гэта дзеянне" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "Старонка даступная толькі аўтарызаваным карыстальнікам" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "Няслушны API-ключ" -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "Вы павінны быць зарэгістраваным карыстачом, каб выканаць гэта дзеянне" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "Старонка даступная толькі аўтарызаваным карыстачам" - -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "Рэпазітар не знойдзены на файлавай сістэме" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "Набор змен для %s %s не знойдзены ў %s" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "Двайковы файл" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Набор змены апынуўся занадта вялікімі і быў падрэзаны, выкарыстоўвайце " "меню параўнання для паказу выніку параўнання" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "Змен не выяўлена" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Deleted branch: %s" -msgstr "Выдалена галінка: %s" - -#: kallithea/lib/helpers.py:612 +msgstr "Выдаленая галіна: %s" + +#: kallithea/lib/helpers.py:614 #, python-format msgid "Created tag: %s" msgstr "Створаны тэг: %s" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, python-format msgid "Changeset %s not found" msgstr "Набор змен %s не знойдзены" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Паказаць адрозненні разам %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "Параўнанне" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "і" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "на %s больш" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "версіі" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "Імя форка %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "Pull-запыт %s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "[выдалены] рэпазітар" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "[створаны] рэпазітар" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "[створаны] рэпазітар як форк" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "[форкнуты] рэпазітар" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "[абноўлены] рэпазітар" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "[загружаны] архіў з рэпазітара" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "[выдалены] рэпазітар" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" -msgstr "[створаны] карыстач" - -#: kallithea/lib/helpers.py:775 +msgstr "[створаны] карыстальнік" + +#: kallithea/lib/helpers.py:778 msgid "[updated] user" -msgstr "[абноўлены] карыстач" - -#: kallithea/lib/helpers.py:777 +msgstr "[абноўлены] карыстальнік" + +#: kallithea/lib/helpers.py:780 msgid "[created] user group" -msgstr "[створана] група карыстачоў" - -#: kallithea/lib/helpers.py:779 +msgstr "[створана] група карыстальнікаў" + +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" -msgstr "[абноўлена] група карыстачоў" - -#: kallithea/lib/helpers.py:781 +msgstr "[абноўлена] група карыстальнікаў" + +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "[каментар] да рэвізіі ў рэпазітары" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" -msgstr "[пракаменціравана] у запыце на занясенне змен для" - -#: kallithea/lib/helpers.py:785 +msgstr "[каментар] у pull-запыце для" + +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" -msgstr "[зачынены] Pull-запыт для" - -#: kallithea/lib/helpers.py:787 +msgstr "[зачынены] pull-запыт для" + +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "[адпраўлена] у" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" -msgstr "[занесены змены з дапамогай Kallithea] у рэпазітары" - -#: kallithea/lib/helpers.py:791 +msgstr "[каміт праз Kallithea] у рэпазітары" + +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" -msgstr "[занесены змены з выдаленага рэпазітара] у рэпазітар" - -#: kallithea/lib/helpers.py:793 +msgstr "[занесены з аддаленага рэпазітара] у рэпазітар" + +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" -msgstr "[занесены змены] з" - -#: kallithea/lib/helpers.py:795 +msgstr "[занесены] з" + +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "[дададзены ў назіранні] рэпазітар" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "[выдалены з назірання] рэпазітар" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr " і на %s больш" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Няма файлаў" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "новы файл" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "зменены" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "выдалены" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "пераназваны" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1247,42 +1275,42 @@ msgid "" "repositories" msgstr "" "Рэпазітар %s адсутнічае ў базе дадзеных; магчыма, ён быў створаны ці " -"пераназваны з файлавай сістэмы. Калі ласка, перазапусціце прыкладанне для" -" сканавання рэпазітароў" - -#: kallithea/lib/utils2.py:415 +"пераназваны з файлавай сістэмы. Калі ласка, перазапусціце прыкладанне для " +"сканавання рэпазітароў" + +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d год" -msgstr[1] "%d гадоў" -msgstr[2] "%d гады" - -#: kallithea/lib/utils2.py:416 +msgstr[1] "%d гады" +msgstr[2] "%d гадоў" + +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d месяц" -msgstr[1] "%d месяца" +msgstr[1] "%d месяцы" msgstr[2] "%d месяцаў" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d дзень" -msgstr[1] "%d дня" +msgstr[1] "%d дні" msgstr[2] "%d дзён" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d гадзіна" -msgstr[1] "%d гадзін" -msgstr[2] "%d гадзіны" - -#: kallithea/lib/utils2.py:419 +msgstr[1] "%d гадзіны" +msgstr[2] "%d гадзін" + +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1290,7 +1318,7 @@ msgstr[0] "%d хвіліна" msgstr[1] "%d хвіліны" msgstr[2] "%d хвілін" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1298,846 +1326,452 @@ msgstr[0] "%d секунда" msgstr[1] "%d секунды" msgstr[2] "%d секунд" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "у %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "%s назад" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "у %s і %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "%s і %s назад" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" -msgstr "прама цяпер" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Рэпазітар - няма доступу" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Рэпазітар - доступ на чытанне" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Рэпазітар - доступ на запіс" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Рэпазітар - адміністраванне" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Група Рэпазітароў - няма доступу" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Група Рэпазітароў - доступ на чытанне" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Група Рэпазітароў - доступ на запіс" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Група Рэпазітароў - адміністраванне" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "Адміністратар Kallithea" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Стварэнне рэпазітароў адключана" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Стварэнне рэпазітароў уключана" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Магчымасць ствараць форк рэпазітара адключана" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Магчымасць ствараць форк рэпазітара ўключана" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Рэгістрацыя адключана" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Рэгістрацыя новага карыстача ў Kallithea з ручной актывацыяй" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Рэгістрацыя новага карыстача ў Kallithea з аўтаматычнай актывацыяй" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Не прагледжана" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "Ухвалена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "Адхілена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "На разглядзе" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "верхні ўзровень" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Група Рэпазітароў - няма доступу" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Група рэпазітароў - доступ на чытанне" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Група рэпазітароў - доступ на запіс" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Група рэпазітароў - адміністраванне" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Група карыстачоў - няма доступу" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Група карыстачоў - доступ на чытанне" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Група карыстачоў - доступ на запіс" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Група карыстачоў - адміністраванне" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Стварэнне груп рэпазітароў адключана" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Стварэнне груп рэпазітароў уключана" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Стварэнне груп карыстачоў адключана" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Стварэнне груп карыстачоў уключана" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "Рэгістрацыя адключана" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Рэгістрацыя карыстача з ручной актывацыяй уліковага запісу" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Рэгістрацыя карыстача з аўтаматычнай актывацыяй" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +msgstr "цяпер" + +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "на радку %s" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Згадванне]" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "верхні ўзровень" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "Адміністратар Kallithea" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 #, fuzzy msgid "Default user has read access to new repositories" msgstr "Несанкцыянаваны доступ да рэсурсу" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 #, fuzzy msgid "Default user has write access to new repositories" msgstr "Несанкцыянаваны доступ да рэсурсу" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" -msgstr "" - -#: kallithea/model/db.py:1684 +msgstr "Толькі адміністратары могуць ствараць групы репазітароў" + +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" -msgstr "" - -#: kallithea/model/db.py:1686 +msgstr "Неадміністратары могуць ствараць групы репазітароў" + +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" -msgstr "" - -#: kallithea/model/db.py:1687 +msgstr "Толькі адміністратары могуць ствараць групы карыстальнікаў" + +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" -msgstr "" - -#: kallithea/model/db.py:1689 +msgstr "Неадміністратары могуць ствараць групы карыстальнікаў" + +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" -msgstr "" - -#: kallithea/model/db.py:1690 +msgstr "Толькі адміністратары могуць ствараць рэпазітары верхняга ўзроўню" + +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" -msgstr "" - -#: kallithea/model/db.py:1695 +msgstr "Неадміністратары могуць ствараць рэпазітары верхняга ўзроўню" + +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 msgid "Only admins can fork repositories" -msgstr "" - -#: kallithea/model/db.py:1696 +msgstr "Месцазнаходжанне рэпазітароў" + +#: kallithea/model/db.py:1733 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "Рэгістрацыя адключаная" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "Рэгістрацыя карыстальніка з ручной актывацыяй уліковага запісу" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "Рэгістрацыя карыстальніка з аўтаматычнай актывацыяй" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "Не прагледжана" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "На разглядзе" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2265 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Ухвалена" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "Ухвалена" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Калі ласка, увядзіце лагін" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Увядзіце значэнне даўжынёй не меней %(min)i знакаў" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Калі ласка, увядзіце пароль" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Увядзіце не меней %(min)i знакаў" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "Імя не можа ўтрымліваць толькі лічбы" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "%(user)s пакінуў каментар да набору змен %(age)s" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "%(user)s адправіў паведамленне %(age)s" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "%(user)s згадаў вас %(age)s" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "%(user)s зарэгістраваўся ў Kallithea %(age)s" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "%(user)s адкрыў новы pull-запыт %(age)s" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "%(user)s пакінуў каментар да pull-запыту %(age)s" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "%(user)s пакінуў каментар да набору змен %(when)s" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "%(user)s адправіў паведамленне %(when)s" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "%(user)s згадаў вас %(when)s" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "%(user)s зарэгістраваўся ў Kallithea %(when)s" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "%(user)s адкрыў новы pull-запыт %(when)s" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "%(user)s пакінуў каментар да pull-запыту %(when)s" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, fuzzy, python-format +#| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "[пракаментавана] у запыце на занясенне змен для" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" -msgstr "Новы карыстач \"%(new_username)s\" зарэгістраваны" - -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "%(user)s просіць вас разгледзець pull request %(pr_nice_id)s: %(pr_title)s" - -#: kallithea/model/notification.py:309 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "[пракаменціравана] у запыце на занясенне змен для" - -#: kallithea/model/notification.py:322 +msgstr "Новы карыстальнік \"%(new_username)s\" зарэгістраваны" + +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "Зачынены" -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "%(user)s просіць вас разгледзець pull request %(pr_nice_id)s: %(pr_title)s" - -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" +"%(user)s просіць вас разгледзець pull request %(pr_nice_id)s: %(pr_title)s" + +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Памылка пры стварэнні pull-запыту: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "Пацвердзіце выдаленне гэтага pull-request'а" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Адсутныя рэвізіі адносна папярэдняга pull-запыту:" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Новыя рэвізіі на %s %s адносна папярэдняга pull-запыту:" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" +"Гэты pull-запыт заснаваны на іншай рэвізіі %s, просты diff немагчымы." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "Няма змен на %s %s адносна папярэдняй версіі." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "апошняя версія" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" -msgstr "Рэгістрацыя новага карыстача" - -#: kallithea/model/user.py:256 -msgid "You can't remove this user since it is crucial for the entire application" -msgstr "" -"Вы не можаце выдаліць карыстача, паколькі гэта крытычна для працы ўсяго " -"прыкладання" - -#: kallithea/model/user.py:261 +msgstr "Рэгістрацыя новага карыстальніка" + +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" +"Вы не можаце выдаліць карыстальніка, паколькі гэта крытычна для працы " +"ўсёй праграмы" + +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -"Карыстач \"%s\" усё яшчэ з'яўляецца ўладальнікам %s рэпазітароў і таму не" -" можа быць выдалены. Зменіце ўладальніка ці выдаліце гэтыя рэпазітары: %s" - -#: kallithea/model/user.py:266 +"Карыстальнік \"%s\" усё яшчэ з'яўляецца ўладальнікам %s рэпазітароў і " +"таму не можа быць выдалены. Змяніце ўладальніка ці выдаліце гэтыя " +"рэпазітары: %s" + +#: kallithea/model/user.py:263 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" -"Карыстач \"%s\" усё яшчэ з'яўляецца ўладальнікам %s груп рэпазітароў і " -"таму не можа быць выдалены. Зменіце ўладальніка ці выдаліце дадзеныя " +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" +"Карыстальнік \"%s\" усё яшчэ з'яўляецца ўладальнікам %s груп рэпазітароў " +"і таму не можа быць выдалены. Змяніце ўладальніка ці выдаліце гэтая " "групы: %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -"Карыстач \"%s\" усё яшчэ з'яўляецца ўладальнікам %s груп карыстачоў і " -"таму не можа быць выдалены. Зменіце ўладальніка ці выдаліце дадзеныя " -"групы: %s" - -#: kallithea/model/user.py:360 +"Карыстальнік \"%s\" усё яшчэ з'яўляецца ўладальнікам %s груп " +"карыстальнікаў і таму не можа быць выдалены. Змяніце ўладальніка ці " +"выдаліце гэтыя групы: %s" + +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "Спасылка скіду пароля" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" -msgstr "Спасылка скіду пароля" - -#: kallithea/model/user.py:409 +msgstr "Паведамленне пра скіданне пароля" + +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "Значэнне не можа быць пустым спісам" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" -msgstr "Карыстач з імем \"%(username)s\" ужо існуе" - -#: kallithea/model/validators.py:97 +msgstr "Карыстальнік з імем \"%(username)s\" ужо існуе" + +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Імя \"%(username)s\" недапушчальнае" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" -msgstr "" -"Імя карыстача можа ўтрымоўваць толькі літары, лічбы, знакі падкрэслення, " -"кропкі і працяжнік; а гэтак жа павінна пачынацца з літары, лічбы або са " -"знака падкрэслення" - -#: kallithea/model/validators.py:126 +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" +"Імя карыстальніка можа ўтрымоўваць толькі літары, лічбы, знакі " +"падкрэслення, кропкі і працяжнік; а гэтак жа павінна пачынацца з літары, " +"лічбы або са знака падкрэслення" + +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "Імя \"%(username)s\" недапушчальнае" + #: kallithea/model/validators.py:133 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "Імя \"%(username)s\" недапушчальна" - -#: kallithea/model/validators.py:152 msgid "Invalid user group name" -msgstr "Няслушнае імя групы карыстачоў" - -#: kallithea/model/validators.py:153 +msgstr "Няслушнае імя групы карыстальнікаў" + +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" -msgstr "Група карыстачоў \"%(usergroup)s\" ужо існуе" - -#: kallithea/model/validators.py:155 +msgstr "Група карыстальнікаў \"%(usergroup)s\" ужо існуе" + +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -"імя групы карыстачоў можа ўтрымоўваць толькі літары, лічбы, знакі " +"імя групы карыстальнікаў можа ўтрымоўваць толькі літары, лічбы, знакі " "падкрэслення, кропкі і працяжнік; а гэтак жа павінна пачынацца з літары " "ці лічбы" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "Немагчыма выкарыстоўваць гэту групу як бацькоўскую" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Група \"%(group_name)s\" ужо існуе" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Рэпазітар з імем \"%(group_name)s\" ужо існуе" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "Недапушчальныя знакі (не ascii) у паролі" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "Няслушна зададзены стары пароль" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "Паролі не супадаюць" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 msgid "Invalid username or password" msgstr "Няслушнае імя ці пароль" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:312 msgid "Token mismatch" msgstr "Несупадзенне токенаў" -#: kallithea/model/validators.py:345 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Імя рэпазітара %(repo)s забароненае" -#: kallithea/model/validators.py:347 +#: kallithea/model/validators.py:330 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Рэпазітар %(repo)s ужо існуе" -#: kallithea/model/validators.py:348 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Рэпазітар \"%(repo)s\" ужо існуе ў групе \"%(group)s\"" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Група рэпазітароў \"%(repo)s\" ужо існуе" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 msgid "Invalid repository URL" msgstr "Няслушны URL рэпазітара" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -2145,440 +1779,331 @@ msgstr "" "Няслушны URL рэпазітара. Ён мусіць быць карэктным URL http, https, ssh, " "svn+http ці svn+https" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "Тып форка будзе супадаць з бацькоўскім" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" -msgstr "У вас недастаткова мае рацыю для стварэння рэпазітароў у гэтай групе" - -#: kallithea/model/validators.py:506 +msgstr "У вас недастаткова правоў для стварэння рэпазітароў у гэтай групе" + +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" -msgstr "недастаткова мае рацыю для стварэння рэпазітара ў каранёвым каталогу" - -#: kallithea/model/validators.py:556 +msgstr "недастаткова правоў для стварэння рэпазітара ў каранёвым каталогу" + +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "У Вас недастаткова прывілеяў для стварэння групы ў гэтым месцы" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" -msgstr "Дадзенае імя карыстача ці групы карыстачоў недапушчальна" - -#: kallithea/model/validators.py:690 +msgstr "Дадзенае імя карыстальніка ці групы карыстальнікаў недапушчальна" + +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "Гэты шлях хібны" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 msgid "This email address is already in use" -msgstr "Гэты E-mail ужо заняты" - -#: kallithea/model/validators.py:725 +msgstr "Гэты e-mail ужо ўжываецца" + +#: kallithea/model/validators.py:682 #, python-format msgid "Email address \"%(email)s\" not found" -msgstr "\"%(email)s\" не знойдзены." - -#: kallithea/model/validators.py:762 +msgstr "Email-адрас \"%(email)s\" не знойдзены" + +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" "Для ўваходу па LDAP павінна быць паказана значэнне атрыбута CN - гэта " -"эквівалент імя карыстача" - -#: kallithea/model/validators.py:774 +"эквівалент імя карыстальніка" + +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Калі ласка, увядзіце існы IPv4 ці IPv6 адрас" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" "Значэнне маскі падсеткі павінна быць у межах ад 0 да 32 (%(bits)r - " "няслушна)" -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -"Ключавое імя можа толькі складацца з літар, знака падкрэслення, працяжнік" -" ці лікаў" - -#: kallithea/model/validators.py:822 +"Ключавое імя можа толькі складацца з літар, знака падкрэслення, працяжнік " +"ці лікаў" + +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "Файла няма ў каталогу" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "Пра праграму" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Панэль кіравання" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "фільтр..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "рэпазітары" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "Дадаць рэпазітар" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 msgid "Add Repository Group" msgstr "Дадаць групу рэпазітароў" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" -msgstr "Вы маеце адміністратарскія правы на гэту групу і можаце рэдагаваць яе" - -#: kallithea/templates/index_base.html:32 +msgstr "" +"Вы маеце адміністратарскія правы на гэту групу і можаце рэдагаваць яе" + +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "Змяніць групу рэпазітароў" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "Імя групы" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "Рэпазітар" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "Апісанне" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Імя" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "Апошняя змена" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "Стан" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "Уладальнік" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "Па ўзрастанні" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "Па змяншэнні" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Рэпазітары не знойдзены." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Памылка дадзеных." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Загрузка..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "Увайсці" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "Увайсці ў %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" -msgstr "Імя карыстача" - -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +msgstr "Імя карыстальніка" + +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "Пароль" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Запомніць" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" -msgstr "Забыліся пароль?" - -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +msgstr "Забыліся на пароль?" + +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "Няма акаўнта?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "Увайсці" #: kallithea/templates/password_reset.html:5 msgid "Password Reset" -msgstr "Скід пароля" - -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +msgstr "Скінуць пароль" + +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" -msgstr "Забыліся пароль для %s?" - -#: kallithea/templates/password_reset.html:14 +msgstr "Забыліся на пароль для %s?" + +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "Скінуць Ваш пароль" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "Паштовы адрас" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "Капча" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:47 msgid "Send Password Reset Email" -msgstr "Паслаць спасылку скіду пароля" - -#: kallithea/templates/password_reset.html:47 +msgstr "Паслаць спасылку для скідання пароля" + +#: kallithea/templates/password_reset.html:52 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." -msgstr "Спасылка для скіду пароля была адасланая на адпаведны e-mail." - -#: kallithea/templates/password_reset_confirmation.html:19 +msgstr "" +"Спасылка для скіду пароля будзе адпраўленая на адпаведны email-адрас, " +"калі ён зарэгістраваны ў сістэме." + +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 msgid "New Password" msgstr "Новы пароль" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 msgid "Confirm New Password" msgstr "Пацвердзіце новы пароль" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "Рэгістрацыя" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" -msgstr "Рэгістра на %s" - -#: kallithea/templates/register.html:42 +msgstr "Рэгістрацыя на %s" + +#: kallithea/templates/register.html:45 msgid "Re-enter password" -msgstr "Паўторыце пароль" - -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +msgstr "Паўтарыце пароль" + +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "Імя" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "Прозвішча" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." -msgstr "Калі ласка, пачакайце, пакуль адміністратар пацвердзіць Вашу рэгістрацыю." - -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Галінкі яшчэ не створаны" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "Зачыненыя галінкі" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Пазнакі адсутнічаюць" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Закладак яшчэ няма" +msgstr "" +"Калі ласка, пачакайце, пакуль адміністратар пацвердзіць Вашу рэгістрацыю." #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" -msgstr "Часопіс адміністратара" +msgstr "Журнал адміністратара" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." -msgstr "Фільтр часопіса..." +msgstr "Фільтр журнала..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "Адфільтраваць" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2587,30 +2112,16 @@ msgstr[1] "%s запісаў" msgstr[2] "%s запісы" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Дзеянне" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Рэпазітар" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Дата" @@ -2618,166 +2129,166 @@ msgstr "Дата" msgid "From IP" msgstr "З IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" -msgstr "Дзеянні яшчэ не вырабляліся" +msgstr "Няма інфармацыі" #: kallithea/templates/admin/auth/auth_settings.html:5 msgid "Authentication Settings" msgstr "Налады аўтэнтыфікацыі" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "Аўтэнтыфікацыя" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" -msgstr "Убудовы аўтэнтыфікацыі" - -#: kallithea/templates/admin/auth/auth_settings.html:31 +msgstr "Плагіны аўтэнтыфікацыі" + +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" -msgstr "Уключаныя ўбудовы" - -#: kallithea/templates/admin/auth/auth_settings.html:33 +msgstr "Уключаныя плагіны" + +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -"Спіс убудоў, падзеленых коскі. Kallithea будзе спрабаваць аўтэнтыфікаваць" -" карыстача ў парадку ўказання ўбудоў" - -#: kallithea/templates/admin/auth/auth_settings.html:34 +"Спіс плагінаў, падзеленых коскамі. Kallithea будзе спрабаваць " +"аўтэнтыфікаваць карыстальніка ў парадку ўказання плагінаў" + +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" -msgstr "Даступныя ўбудаваныя ўбудовы" - -#: kallithea/templates/admin/auth/auth_settings.html:51 +msgstr "Даступныя ўбудаваныя плагіны" + +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" -msgstr "Убудова" +msgstr "Плагін" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "Захаваць" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 msgid "Repository Defaults" -msgstr "Значэнні па змаўчанні" - -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +msgstr "Значэнні па змоўчанні" + +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Тып" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Прыватны рэпазітар" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "Прыватныя рэпазітары бачныя толькі іх удзельнікам." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 msgid "Enable statistics" msgstr "Уключыць статыстыку" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 msgid "Enable statistics window on summary page." msgstr "Уключыць акно статыстыкі на старонцы «Агульныя звесткі»." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 msgid "Enable downloads" msgstr "Уключыць спампоўку" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "Уключыць меню спампоўкі на старонцы «Агульныя звесткі»." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "Уключыць блакаванне" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." -msgstr "Уключыць аўтаблакоўку для рэпазітара." +msgstr "Уключыць аўтаблакаванне для рэпазітара." #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" -msgstr "Праўка gist-запісы" - -#: kallithea/templates/admin/gists/edit.html:36 +msgstr "Правіць gist-запіс" + +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "Апісанне..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "Мінае" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 msgid "Never" msgstr "Ніколі" @@ -2786,7 +2297,8 @@ msgid "Update Gist" msgstr "Абнавіць" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "Адмена" @@ -2794,13 +2306,13 @@ msgstr "Адмена" #: kallithea/templates/admin/gists/index.html:16 #, python-format msgid "Private Gists for User %s" -msgstr "Прыватная gist-запіс для карыстача %s" +msgstr "Прыватны gist-запіс для карыстальніка %s" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 #, python-format msgid "Public Gists for User %s" -msgstr "Публічная gist-запіс для карыстача %s" +msgstr "Публічны gist-запіс для карыстальніка %s" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 @@ -2809,65 +2321,65 @@ msgstr "Публічныя gist-запісы" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" -msgstr "Стварыць новую gist-запіс" - -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +msgstr "Стварыць новы gist-запіс" + +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" -msgstr "Створана" - -#: kallithea/templates/admin/gists/index.html:74 +msgstr "Створаны" + +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "Gist-запісы адсутнічаюць" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 msgid "New Gist" -msgstr "" - -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +msgstr "Новы gist-запіс" + +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" -msgstr "Скід" +msgstr "Скінуць" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 @@ -2875,290 +2387,268 @@ msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "Выдаліць" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" -msgstr "Пацвердзіце выдаленне гэтай gist-запісы" - -#: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 +msgstr "Пацвердзіце выдаленне гэтага gist-запісу" + +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 #: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 #: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 #: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Рэдагаваць" -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "Паказаць толькі тэкст" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "створана" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "Паказаць толькі тэкст" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "Мой Акаўнт" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "Профіль" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:38 +msgstr "E-mail адрэсы" + +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "API-ключы" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 msgid "Owned Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +msgstr "Мае рэпазітары" + +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +#, fuzzy msgid "Watched Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:41 +msgstr "Стварыць рэпазітары" + +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 -#, fuzzy msgid "Show Permissions" -msgstr "Скапіяваць прывілеі" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +msgstr "Паказаць прывілеі" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "Убудаваны" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, python-format msgid "Confirm to reset this API key: %s" -msgstr "Пацвердзіце скіданне гэтага API-ключа: %s" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 -#, fuzzy +msgstr "Пацвердзіць скіданне гэтага API-ключа: %s" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" -msgstr "мінае" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +msgstr "Ануляваны" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, python-format msgid "Confirm to remove this API key: %s" msgstr "Пацвердзіце выдаленне гэтага API-ключа: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" msgstr "Выдаліць" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" -msgstr "Няма дадатковых API-ключоў." - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +msgstr "Дадатковыя API-ключы не пазначаныя" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "Новы API-ключ" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "Дадаць" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "Асноўны" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "Пацвердзіце выдаленне e-mail: %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "Дадатковыя адрасы e-mail не пазначаны." -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" -msgstr "Новы E-mail" +msgstr "Новы e-mail" #: kallithea/templates/admin/my_account/my_account_password.html:1 msgid "Change Your Account Password" msgstr "Змена пароля" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" -msgstr "Дзейны пароль" - -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +msgstr "Цяперашні пароль" + +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "Новы пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "Пацвердзіце новы пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" -msgstr "Зменіце аватар праз сайт" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "Цяперашні IP-адрас" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" +msgstr "Змяніць аватар можна праз" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "Выкарыстоўваецца" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" -msgstr "Аватары адключаны" - -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "Не паказаны email. Калі ласка, абновіце ваш email." - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "Цяперашні IP" +msgstr "Аватары адключаныя" #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" msgstr "Рэпазітары, дзе Вы — уладальнік" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Запісы не знойдзены." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "Імя" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Рэпазітары, за якімі Вы назіраеце" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "Мае апавяшчэнні" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "Усё" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "Каментары" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "Pull-запыты" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "Адзначыць усё як прачытаныя" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "Апавяшчэнняў няма" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "Паказаць апавяшчэнне" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "Апавяшчэнні" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "Стандартныя прывілеі" @@ -3172,179 +2662,186 @@ msgstr "Глабальныя" msgid "IP Whitelist" msgstr "Белы спіс IP" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "Ананімны доступ" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +#, fuzzy +#| msgid "Anonymous access" +msgid "Allow anonymous access" +msgstr "Ананімны доступ" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -"Абраныя прывілеі будуць усталяваны па змаўчанні для кожнага рэпазітара. " -"Улічыце, што раней усталяваныя прывілеі па змаўчанні будуць скінуты" - -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +"Выбраныя прывілеі будуць усталяваныя па змоўчанні для кожнага рэпазітара. " +"Улічыце, што раней усталяваныя прывілеі па змоўчанні будуць скінутыя" + +#: kallithea/templates/admin/permissions/permissions_globals.html:20 #, fuzzy msgid "Apply to all existing repositories" msgstr "Імпартаваць існы рэпазітар?" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 msgid "Permissions for the Default user on new repositories." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "Група рэпазітароў" + #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "Група рэпазітароў" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -"Абраныя прывілеі будуць усталяваны па змаўчанні для кожнай групы " -"рэпазітароў. Улічыце, што раней усталяваныя прывілеі па змаўчанні для " -"груп рэпазітароў будуць скінуты" - -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +"Выбраныя прывілеі будуць усталяваныя па змоўчанні для кожнай групы " +"рэпазітароў. Улічыце, што раней усталяваныя прывілеі па змоўчанні для " +"груп рэпазітароў будуць скінутыя" + +#: kallithea/templates/admin/permissions/permissions_globals.html:33 #, fuzzy msgid "Apply to all existing repository groups" msgstr "Імпартаваць існы рэпазітар?" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" -msgstr "Група карыстачоў" - -#: kallithea/templates/admin/permissions/permissions_globals.html:53 -#, fuzzy +msgstr "Група карыстальнікаў" + +#: kallithea/templates/admin/permissions/permissions_globals.html:45 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -"Абраныя прывілеі будуць усталяваны па змаўчанні для кожнай групы " -"карыстачоў. Улічыце, што раней усталяваныя прывілеі па змаўчанні для груп" -" карыстачоў будуць скінуты" - -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +"Выбраныя прывілеі будуць усталяваныя па змоўчанні для кожнай групы " +"карыстальнікаў. Улічыце, што раней усталяваныя прывілеі па змоўчанні для " +"груп карыстальнікаў будуць скінутыя" + +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy msgid "Top level repository creation" msgstr "Стварэнне рэпазітара" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:61 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:64 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" -msgstr "Стварэнне груп карыстачоў" - -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +msgstr "Стварэнне груп карыстальнікаў" + +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:75 msgid "Repository forking" msgstr "Стварэнне форка рэпазітара" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:78 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:82 msgid "Registration" msgstr "Рэгістрацыя" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:88 msgid "External auth account activation" msgstr "Актывацыя іншага ўліковага запісу" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 -#, fuzzy, python-format +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#, python-format msgid "Confirm to delete this IP address: %s" msgstr "Пацвердзіце выдаленне IP %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "Дазволены любыя IP-адрасы." -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "Новы IP-адрас" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "Групы рэпазітароў" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "Імя групы" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "Бацькоўская група" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" @@ -3353,30 +2850,29 @@ msgstr "" msgid "%s Repository Group Settings" msgstr "Налады групы рэпазітароў %s" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "Дадаць падгрупу" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "Налады" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "Дадаткова" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "Прывілеі" @@ -3401,12 +2897,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "Створана" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3418,127 +2914,140 @@ msgstr[2] "Пацвердзіце выдаленне групы %s, утрымоўвалай %s рэпазітароў" msgid "Delete this repository group" msgstr "Выдаліць гэту групу рэпазітароў" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "disabled" +msgid "Visible" +msgstr "адключана" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "Дадаць рэпазітар" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "Дадаць групу карыстальнікаў" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 -#, fuzzy msgid "User/User Group" -msgstr "групы карыстальнікаў" +msgstr "Карыстальнік/група карыстальнікаў" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 -#, fuzzy msgid "Default" -msgstr "па змаўчанні" +msgstr "Па змоўчанні" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 -#, fuzzy msgid "Revoke" -msgstr "адклікаць" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +msgstr "Адклікаць" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "Дадаць новы" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #, fuzzy msgid "Apply to children" msgstr "дастасаваць да даччыным" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "Абедзьве" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" msgstr "" "Уключыць аўтаблакоўку для групы. Гэта опцыя будзе ўжыта да ўсіх даччыных " "груп і рэпазітарам" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "Выдаліць гэту групу" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" -msgstr "Пацвердзіце выдаленне гэтай групы карыстачоў" +msgstr "Пацвердзіце выдаленне гэтай групы карыстальнікаў" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "Дахаты" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "з" +#, fuzzy, python-format +#| msgid "Repository Group: %s" +msgid "Repository group %s" +msgstr "Група рэпазітароў: %s" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "Адміністраванне груп рэпазітароў" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "Лік рэпазітароў верхняга ўзроўня" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 #, fuzzy msgid "Clone remote repository" msgstr "[створаны] рэпазітар" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Кароткае і асэнсаванае. Для разгорнутага апісання выкарыстоўвайце файл " "README." -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Апцыянальна абраць групу, у якую змясціць дадзены рэпазітар." -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "Тып стваранага рэпазітара." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Рэвізія для выгрузкі" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3571,22 +3080,22 @@ msgstr "" msgid "%s Repository Settings" msgstr "Налады рэпазітара %s" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "Дадатковыя палі" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "Кэшы" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "Выдалены" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "Статыстыка" @@ -3595,65 +3104,63 @@ msgid "Parent" msgstr "Бацькоўская група" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "Набор" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." -msgstr "Уручную зрабіць гэты рэпазітар форкам абранага са спісу." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +msgstr "Уручную зрабіць гэты рэпазітар форкам выбранага са спісу." + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" -msgstr "Доступ да публічнага часопіса" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +msgstr "Доступ да публічнага журналу" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" -msgstr "Выдаліць з агульнадаступнага часопіса" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +msgstr "Выдаліць з агульнадаступнага журналу" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" -msgstr "Дадаць у публічны часопіс" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +msgstr "Дадаць у публічны журнал" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" "Усе выконваемыя з гэтым рэпазітаром дзеянні будуць адлюстроўвацца ў " -"публічным часопісе." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +"публічным журнал." + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "Уключыць блакаванне" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "Пацвердзіце разблакаванне рэпазітара." + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "Разблакаваць рэпазітар" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "Пацвердзіце здыманне блакавання з рэпазітара." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" -msgstr "Разблакаваць рэпазітар" +#, python-format +msgid "Locked by %s on %s" +msgstr "Заблакавана %s %s" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "Пацвердзіце блакаванне рэпазітара." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Lock Repository" msgstr "Заблакаваць рэпазітар" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "Рэпазітар не заблакаваны" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3661,33 +3168,33 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Пацвердзіце выдаленне гэтага рэпазітара: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "Выдаліць гэты рэпазітар" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "Дадзены рэпазітар мае %s копію" msgstr[1] "Дадзены рэпазітар мае %s копіі" -msgstr[2] "Дадзены рэпазітар мае %s дзід" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +msgstr[2] "Дадзены рэпазітар мае %s копій" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" -msgstr "Адлучыць fork'і" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +msgstr "Адлучыць форкі" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" -msgstr "Выдаліць fork'і" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +msgstr "Выдаліць форкі" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3698,110 +3205,107 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "Скінуць кэш рэпазітара" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "Пацвердзіце скід кэша." - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." -msgstr "Ручны скід кэша рэпазітара. Пры першым доступе кэш адновіцца." - -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +msgstr "Ручное скіданне кэша рэпазітара. Пры першым доступе кэш адновіцца." + +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 msgid "List of Cached Values" msgstr "Спіс кэшаваных значэнняў" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "Прэфікс" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Ключ" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "Актыўны" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Пацвердзіце выдаленне гэтага поля: %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "Ключ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "Імя поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "Увядзіце кароткае імя поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "Апісанне поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "Увядзіце апісанне поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." -msgstr "Дадатковыя палі адключаны." - -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +msgstr "Дадатковыя палі адключаныя." + +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 +msgid "Private Repository" +msgstr "Прыватны рэпазітар" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 #, fuzzy -msgid "Private Repository" -msgstr "прыватны рэпазітар" - -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 -#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "[форкнуты] рэпазітар" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" -msgstr "Рэпазітар %s створаны" - -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 -#, fuzzy +msgstr "URL аддаленага рэпазітара" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" -msgstr "[занесены змены з выдаленага рэпазітара] у рэпазітар" - -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -#, fuzzy -msgid "Confirm to pull changes from remote repository." -msgstr "Пацвердзіце спампоўку змен." +msgstr "Занесці змены з аддаленага рэпазітара" #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "Пацвердзіце спампоўку змен з аддаленага рэпазітара." + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 -#, fuzzy +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" -msgstr "прыватны рэпазітар" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +msgstr "Пастаяннае ШВ рэпазітара" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "Што гэта?" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3811,37 +3315,39 @@ msgid "" "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 -#, fuzzy +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" -msgstr "[створаны] рэпазітар" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 -#, fuzzy +msgstr "Аддалены рэпазітар" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" -msgstr "Рэпазітар" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +msgstr "URL рэпазітара" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -"Рэвізія па змаўчанні, з якой будзе вырабляцца выгрузка файлаў пры " -"спампоўцы" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +"Рэвізія па змоўчанні, з якой будзе рабіцца выгрузка файлаў пры спампоўцы" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "Змяніць уладальніка рэпазітара." -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "" @@ -3851,13 +3357,13 @@ msgstr "Скід статыстыкі" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 msgid "Confirm to remove current statistics." -msgstr "Пацвердзіце скід статыстыкі." +msgstr "Пацвердзіце скіданне статыстыкі." #: kallithea/templates/admin/repos/repos.html:5 msgid "Repositories Administration" msgstr "Адміністраванне рэпазітароў" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "Стан" @@ -3878,7 +3384,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "Хукі" @@ -3890,280 +3396,270 @@ msgstr "Паўнатэкставы пошук" msgid "System Info" msgstr "Інфармацыя пра сістэму" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "Адаслаць тэставае паведамленне на" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "Адправіць" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "Брэндынг сайта" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "Прывітанне для HTTP-аўтэнтыфікацыі" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "Захаваць налады" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "Карыстальніцкія хукі" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom Hooks" -msgstr "Карыстацкія хуки" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "Не атрымалася выдаліць хук" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "Опцыі перасканіравання" -#: kallithea/templates/admin/settings/settings_mapping.html:11 -#, fuzzy +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" -msgstr "Пошук па рэпазітарах" - -#: kallithea/templates/admin/settings/settings_mapping.html:13 +msgstr "Сцерці запісы пра выдаленыя рэпазітары" + +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "Скінуць кэш для ўсіх рэпазітароў" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "Скінуць кэш для ўсіх рэпазітароў." -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "Install Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/templates/admin/settings/settings_mapping.html:28 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "Опцыі стварэння індэксу" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 msgid "Build from scratch" msgstr "Зборка з нуля" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "Перабудаваць індэкс" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "Праверка абнаўленняў..." + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:4 -#, fuzzy -msgid "Check for updates" -msgstr "праверыць наяўнасць абнаўленняў" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" +msgstr "Версія Kallithea" #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" -msgstr "Платформа" +msgid "Check for updates" +msgstr "Праверыць наяўнасць абнаўленняў" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" -msgstr "Версія Git" +msgid "Kallithea configuration file" +msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:10 -msgid "Upgrade info endpoint" +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "Платформа" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "Версія Git" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "Праверка абнаўленняў..." - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Вэб" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "Запытваць SSL для аперацый з VCS" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "Паказваць памер рэпазітара пасля адпраўкі" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" -msgstr "Лагіраваць карыстацкія каманды адпраўкі" - -#: kallithea/templates/admin/settings/settings_vcs.html:32 +msgstr "Лагаваць карыстацкія каманды адпраўкі" + +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" -msgstr "Лагіраваць карыстацкія каманды атрымання" - -#: kallithea/templates/admin/settings/settings_vcs.html:36 +msgstr "Лагаваць карыстацкія каманды атрымання" + +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "Абнаўляць рэпазітар пасля адпраўкі (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "Пашырэнні Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 msgid "Enable largefiles extension" msgstr "Уключыць падтрымку вялікіх файлаў" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 msgid "Enable hgsubversion extension" msgstr "Уключыць падтрымку hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 msgid "Location of repositories" msgstr "Месцазнаходжанне рэпазітароў" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." msgstr "" "Націсніце для разблакавання. Змены набудуць моц пасля перазагрузкі " "Kallithea." -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "Галоўнае" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "Выкарыстоўваць дадатковыя палі ў рэпазітарах" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "Дазваляе захоўваць дадатковыя палі ў рэпазітарах." -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "Адлюстроўваць версію Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." msgstr "Паказвае або хавае нумар версіі Kallithea ў ніжняй частцы старонкі." -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "Выкарыстоўваць Gravatars у Kallithea" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4180,95 +3676,103 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "URL для кланавання" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "Элементы панэлі" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Памер рэпазітара" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +#, fuzzy msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." msgstr "" "Колькасць элементаў, што паказваюцца на галоўнай старонцы панэлі " "кіравання перад паказам нумарацыі старонак." +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "Абразкі" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "Паказваць абразкі публічных рэпазітароў" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Show private repository icon on repositories" msgstr "Паказваць абразкі прыватных рэпазітароў" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show public/private icons next to repository names." msgstr "Паказваць абразкі публічных рэпазітароў." -#: kallithea/templates/admin/settings/settings_visual.html:92 -#, fuzzy +#: kallithea/templates/admin/settings/settings_visual.html:89 msgid "Meta Tagging" -msgstr "Метатэгіраванне" - -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +msgstr "Метатэгаванне" + +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" -msgstr "Дадаць групу карыстачоў" +msgstr "Дадаць групу карыстальнікаў" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "Групы карыстальнікаў" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "Дадаць групу карыстальнікаў" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "Кароткае дадатковае апісанне для гэтай групы карыстальнікаў." @@ -4278,9 +3782,8 @@ msgid "%s user group settings" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 -#, fuzzy msgid "Show Members" -msgstr "удзельнікі" +msgstr "Паказаць удзельнікаў" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:1 #, python-format @@ -4288,54 +3791,54 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "Удзельнікі" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" -msgstr "Пацвердзіце выдаленне наступнай групы карыстачоў: %s" +msgstr "Пацвердзіце выдаленне наступнай групы карыстальнікаў: %s" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:21 msgid "Delete this user group" msgstr "Выдаліць гэтую групу карыстальнікаў" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Няма ўдзельнікаў" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Абраныя ўдзельнікі групы" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Даступныя ўдзельнікі" #: kallithea/templates/admin/user_groups/user_groups.html:5 msgid "User Groups Administration" -msgstr "Адміністраванне груп карыстачоў" +msgstr "Адміністраванне груп карыстальнікаў" #: kallithea/templates/admin/users/user_add.html:5 msgid "Add user" -msgstr "Дадаць карыстача" +msgstr "Дадаць карыстальніка" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" -msgstr "Карыстачы" +msgstr "Карыстальнікі" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" -msgstr "Дадаць карыстача" - -#: kallithea/templates/admin/users/user_add.html:50 +msgstr "Дадаць карыстальніка" + +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "Пацверджанне пароля" @@ -4354,12 +3857,12 @@ msgid "User: %s" msgstr "Карыстальнік: %s" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "Апошні ўваход" @@ -4368,411 +3871,395 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" -msgstr "Пацвердзіце выдаленне карыстача %s" +msgstr "Пацвердзіце выдаленне карыстальніка %s" #: kallithea/templates/admin/users/user_edit_advanced.html:23 msgid "Delete this user" msgstr "Выдаліць гэтага карыстальніка" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "Не паказаны email. Калі ласка, абнавіце email карыстальніка." - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "Пацвердзіце новы пароль" #: kallithea/templates/admin/users/users.html:5 msgid "Users Administration" -msgstr "Адміністраванне карыстачоў" - -#: kallithea/templates/admin/users/users.html:56 +msgstr "Адміністраванне карыстальнікаў" + +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "Асобнік сервера: %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "Падтрымка" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "Рэпазітар Mercurial" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "Git рэпазітар" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "Стварыць форк" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "Агульныя звесткі" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "Гісторыя змен" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Файлы" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "Пераключыцца на" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 -msgid "Options" -msgstr "Опцыі" - -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 -msgid "Compare Fork" -msgstr "Параўнаць форк" - -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 -msgid "Compare" -msgstr "Параўнаць" - -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 -#: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 -msgid "Search" -msgstr "Пошук" - -#: kallithea/templates/base/base.html:163 -msgid "Unlock" -msgstr "Разблакаваць" - -#: kallithea/templates/base/base.html:165 -msgid "Lock" -msgstr "Заблакаваць" - -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "Назіраць" - -#: kallithea/templates/base/base.html:174 -msgid "Unfollow" -msgstr "Не назіраць" - -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" -msgstr "Форк" - -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 -msgid "Create Pull Request" -msgstr "Стварыць Pull запыт" - -#: kallithea/templates/base/base.html:183 +#: kallithea/templates/base/base.html:135 #, python-format msgid "Show Pull Requests for %s" msgstr "Паказаць pull-запыты для %s" -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "Pull-запыты" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 +msgid "Options" +msgstr "Опцыі" + +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 +msgid "Compare Fork" +msgstr "Параўнаць форк" + +#: kallithea/templates/base/base.html:158 +msgid "Compare" +msgstr "Параўнаць" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:67 +msgid "Search" +msgstr "Пошук" + +#: kallithea/templates/base/base.html:164 +msgid "Unlock" +msgstr "Разблакаваць" + +#: kallithea/templates/base/base.html:166 +msgid "Lock" +msgstr "Заблакаваць" + +#: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "Назіраць" + +#: kallithea/templates/base/base.html:175 +msgid "Unfollow" +msgstr "Не назіраць" + +#: kallithea/templates/base/base.html:178 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "Форк" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 +msgid "Create Pull Request" +msgstr "Стварыць pull-запыт" + +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "Пераключыцца на" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "Супадзенняў не знойдзена" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "Паказаць апошнюю актыўнасць" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" -msgstr "Агульнадаступны часопіс" - -#: kallithea/templates/base/base.html:233 +msgstr "Агульнадаступны журнал" + +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "Паказаць публічныя запісы" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "Gist" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "Усе публічныя Gist-запісы" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "Мае публічныя Gist-запісы" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "Мае прыватныя Gist-запісы" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "Пошук па рэпазітарах" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" -msgstr "Мае Pull-запыты" - -#: kallithea/templates/base/base.html:289 +msgstr "Мае pull-запыты" + +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "Не аўтарызаваны" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "Аўтарызавацца" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" -msgstr "Забыліся пароль?" - -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:379 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" +msgstr "Забыліся на пароль?" + +#: kallithea/templates/base/base.html:383 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Няма акаўнта?" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" -msgstr "Выйсце" - -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "Супадзенняў не знойдзена" +msgstr "Выйсці" #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" -msgstr "Гарачыя клавішы" +msgid "Parent rev." +msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 -#, fuzzy +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 msgid "Inherit defaults" -msgstr "Значэнні па змаўчанні" - -#: kallithea/templates/base/default_perms_box.html:19 +msgstr "Ужываць значэнні па змоўчанні" + +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "Стварыць рэпазітары" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "Опцыя дазваляе карыстальніку ствараць рэпазітары" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "Опцыя дазваляе карыстачу ствараць рэпазітары" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" -msgstr "Ствараць групы карыстачоў" - -#: kallithea/templates/base/default_perms_box.html:45 +msgstr "Ствараць групы карыстальнікаў" + +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" -msgstr "Опцыя дазваляе карыстачу ствараць групы карыстачоў" - -#: kallithea/templates/base/default_perms_box.html:52 +msgstr "Опцыя дазваляе карыстальніку ствараць групы карыстальнікаў" + +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "Ствараць fork ад рэпазітароў" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" -"Абярыце гэту опцыю каб дазволіць дадзенаму карыстачу ствараць fork'і " +"Абярыце гэту опцыю каб дазволіць дадзенаму карыстальніку ствараць форкі " "рэпазітароў" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "Паказаць" #: kallithea/templates/base/perms_summary.html:22 msgid "No permissions defined yet" -msgstr "Прывілеі яшчэ не прызначаны" +msgstr "Прывілеі яшчэ не прызначаныя" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "Прывілей" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "Змяніць прывілеі" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:28 +msgid "Retry" +msgstr "" + +#: kallithea/templates/base/root.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." +msgstr "Адпраўка..." + +#: kallithea/templates/base/root.html:30 +#, fuzzy +#| msgid "Enable downloads" +msgid "Unable to post" +msgstr "Уключыць спампоўку" + +#: kallithea/templates/base/root.html:31 msgid "Add Another Comment" msgstr "Дадаць яшчэ адзін каментар" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:32 msgid "Stop following this repository" msgstr "Адмяніць назіранне за рэпазітаром" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:33 msgid "Start following this repository" msgstr "Назіраць за рэпазітаром" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:34 msgid "Group" msgstr "Група" -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "удзельнікі" - -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:35 msgid "Loading ..." msgstr "Загрузка..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:36 msgid "loading ..." msgstr "загрузка..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:37 msgid "Search truncated" msgstr "Пошук усечаны" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:38 msgid "No matching files" msgstr "Няма супадзенняў" -#: kallithea/templates/base/root.html:31 -#, fuzzy +#: kallithea/templates/base/root.html:39 msgid "Open New Pull Request from {0}" -msgstr "Каментар у pull-запыце" - -#: kallithea/templates/base/root.html:32 +msgstr "Стварыць новы pull-запыт з {0}" + +#: kallithea/templates/base/root.html:40 msgid "Open New Pull Request for {0} → {1}" -msgstr "" - -#: kallithea/templates/base/root.html:33 -#, fuzzy +msgstr "Стварыць новы pull-запыт для {0} → {1}" + +#: kallithea/templates/base/root.html:41 msgid "Show Selected Changesets {0} → {1}" -msgstr "Паказаць абраныя наборы змен: __S → __E" - -#: kallithea/templates/base/root.html:34 +msgstr "Паказаць выбраныя наборы змен: {0} → {1}" + +#: kallithea/templates/base/root.html:42 msgid "Selection Link" msgstr "Спасылка выбару" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 msgid "Collapse Diff" msgstr "Згарнуць параўнанне" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:44 msgid "Expand Diff" -msgstr "Расчыніць параўнанне" - -#: kallithea/templates/base/root.html:37 +msgstr "Разгарнуць параўнанне" + +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "Няма рэвізій" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 msgid "Failed to revoke permission" msgstr "Не атрымалася адклікаць прывілеі" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:48 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "Пацвердзіце выдаленне прывілею для {0}: {1} ?" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "уключана" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "адключана" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "Выбраць набор змен" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" -msgstr "Абраць набор змен" - -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "Закладкі %s" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Аўтар" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Рэвізія" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "Галінкі %s" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +msgstr "Выбраць набор змен" + +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "Па ўзрастанні" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "Па змяншэнні" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "Запісы не знойдзеныя." + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "Памылка дадзеных." + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "Загрузка..." + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "Логі змен %s" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4780,81 +4267,31 @@ msgstr[0] "Паказана %d з %d рэвізій" msgstr[1] "Паказаны %d з %d рэвізій" msgstr[2] "Паказаны %d з %d рэвізій" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "Ачысціць выбар" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 msgid "Go to tip of repository" msgstr "Перайсці на верхавіну рэпазітара" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "Параўнаць fork з %s" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "Параўнаць форк з бацькоўскім рэпазітаром (%s)" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" -msgstr "Адфільтраваць галінку:" - -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, fuzzy, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" -"Статут набору змен: %s?\n" -"Клікніце, каб перайсці да адпаведнага pull-request'у #%s" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "Статут набору змен: %s" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "Каментары адсутнічаюць" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "Закладка %s" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "Пазнака %s" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "Галінка %s" - -#: kallithea/templates/changelog/changelog.html:309 +msgstr "Адфільтраваць галіну:" + +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "Змен яшчэ няма" @@ -4870,7 +4307,7 @@ msgstr "Зменена" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "Дададзена" @@ -4884,220 +4321,228 @@ msgstr "Дададзена" msgid "Affected %s files" msgstr "Закранае %s файлаў" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "Узрост" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "Спасылкі" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "Дадаць ці загрузіць файлы праз Kallithea" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "Дадаць новы файл" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -#, fuzzy -msgid "Push new repository" -msgstr "Адправіць новы рэпазітар" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" -msgstr "Існы рэпазітар?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" +"Статус набору змен: %s ад %s\n" +"Клікніце, каб адкрыць адпаведны pull-запыт %s" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "Статус набору змен: %s ад %s" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "Разгарнуць паведамленне" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%d comment" +#| msgid_plural "%d comments" +msgid "%s comments" +msgstr "%d каментар" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "Закладка %s" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "Тэг %s" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "Галіна %s" #: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "%s Змены" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" -msgstr "Статут змен" - -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +msgstr "Статус змен" + +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "Адлюстраваць у фармаце diff" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" -msgstr "Ужыць рознаснае выпраўленне (Patch diff)" - -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +msgstr "Patch diff" + +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" -msgstr "Запампаваць diff" - -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +msgstr "Спампаваць diff" + +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 #, fuzzy msgid "Merge" msgstr "звесці" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "Перанесена з:" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 -#, fuzzy +#: kallithea/templates/changeset/changeset.html:108 msgid "Replaced by:" -msgstr "Створана" - -#: kallithea/templates/changeset/changeset.html:149 -#, fuzzy +msgstr "Заменена:" + +#: kallithea/templates/changeset/changeset.html:122 msgid "Preceded by:" -msgstr "Створана" - -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +msgstr "Замяняе:" + +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s файл зменены" -msgstr[1] "%s файлаў зменена" -msgstr[2] "%s файла зменена" - -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +msgstr[1] "%s файлы зменена" +msgstr[2] "%s файлаў зменена" + +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s файл зменены: %s даданне, %s выдаленне" -msgstr[1] "%s файла зменена: %s даданні, %s выдаленні" +msgstr[1] "%s файлы зменена: %s даданні, %s выдаленні" msgstr[2] "%s файлаў зменена: %s даданняў, %s выдаленняў" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "Паказаць поўны diff" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 +#: kallithea/templates/changeset/changeset_file_comment.html:20 #, fuzzy -msgid "No revisions" -msgstr "няма рэвізій" +#| msgid "Comment" +msgid "comment" +msgstr "Каментаваць" #: kallithea/templates/changeset/changeset_file_comment.html:21 -#, fuzzy msgid "on pull request" -msgstr "Каментар у pull-запыце" +msgstr "у pull-запыце" #: kallithea/templates/changeset/changeset_file_comment.html:22 msgid "No title" msgstr "Няма загалоўка" #: kallithea/templates/changeset/changeset_file_comment.html:24 -#, fuzzy msgid "on this changeset" -msgstr "Няма змен" +msgstr "на змене" #: kallithea/templates/changeset/changeset_file_comment.html:30 msgid "Delete comment?" msgstr "Выдаліць каментар?" -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#, fuzzy +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 msgid "Status change" -msgstr "Апошнія змены" - -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "Каментар да радка {1}." - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "Парсінг каментароў выкананы з выкарыстаннем сінтаксісу %s з падтрымкай %s." - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" -"Выкарыстоўвайце @імя_карыстача ў тэксце, каб адправіць абвестку пэўнаму " -"карыстачу" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "Папярэдні прагляд каментара" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "Ужыванне..." - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +msgstr "Змена статусу" + +#: kallithea/templates/changeset/changeset_file_comment.html:87 +#, fuzzy +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" +"Выкарыстоўвайце @імя_карыстальніка ў тэксце, каб адправіць паведамленне " +"пэўнаму карыстальніку" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "Змяніць статус рэвізіі" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "Без змен" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +msgid "Finish pull request" +msgstr "Завяршыць pull-запыт" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "Закрыць" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "Каментаваць" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "Прадпрагляд" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "Вам неабходна аўтарызавацца, каб пакідаць каментары." -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" -msgstr "Аўтарызавацца цяпер" - -#: kallithea/templates/changeset/changeset_file_comment.html:94 +msgstr "Аўтарызавацца зараз" + +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "Схаваць" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d каментар" -msgstr[1] "%d каментара" +msgstr[1] "%d каментары" msgstr[2] "%d каментароў" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, python-format msgid "%d inline" msgid_plural "%d inline" -msgstr[0] "%d да радка" -msgstr[1] "%d да радкоў" -msgstr[2] "%d да радкоў" - -#: kallithea/templates/changeset/changeset_file_comment.html:108 +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5105,104 +4550,110 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -#, fuzzy -msgid "Use @username inside this text to notify another user." -msgstr "" -"Выкарыстоўвайце @імя_карыстача ў тэксце, каб адправіць абвестку пэўнаму " -"карыстачу" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "Змяніць статус рэвізіі" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "Без змен" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "Зачыніць" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "%s Змены" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "Статус набору змен: %s" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "Закранутыя файлы" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "файл выдалены" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Без змен" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "Выдалены" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "Пераназваны" + +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Невядомая рэвізія %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Безназоўны" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "файл выдалены" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "Паказаць поўны diff для гэтага файла" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "Паказаць поўны diff для гэтага файла" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "Паказаць каментары ў радках" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "Выдалены" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "Пераназваны" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "Няма змен" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "Продак" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "Агульны продак" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "Паказаць merge diff" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "Агульны продак" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "адстае на" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, python-format msgid "%s changesets" msgstr "%s змен" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "ад" @@ -5213,130 +4664,188 @@ msgid "%s Compare" msgstr "%s Параўнаць" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "Параўнаць рэвізіі" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "Паказаць %s commit" -msgstr[1] "Паказаць %s commit'а" +msgstr[1] "Паказаць %s commit'ы" msgstr[2] "Паказаць %s commit'аў" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "Паказаць поўны diff" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "Публічны рэпазітар" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "Змен яшчэ не было" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "Падпісацца на стужку RSS %s" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "Падпісацца на стужку Atom %s" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "Ствараецца" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s пакінуў каментар да набору змен %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Comment from %s on %s changeset %s" +msgid "Comment on Changeset \"%s\"" msgstr "Каментар ад %s да набору змен %s %s" -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "Стан набору змен зменены на" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "Гэта аўтаматычнае апавяшчэнне. Не адказвайце на гэтае паведамленне." - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "Струмень змен" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Галіна" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Змена статусу" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "Гэты pull-запыт быў зачынены і не можа быць абноўлены." + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "Добры дзень, %s" -#: kallithea/templates/email_templates/password_reset.html:6 -#, fuzzy +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." -msgstr "Мы атрымалі запыт на стварэнне новага пароля для вашага акаўнта." - -#: kallithea/templates/email_templates/password_reset.html:7 +msgstr "Мы атрымалі запыт на скіданне пароля для вашага акаўнта." + +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention on Pull Request %s \"%s\" by %s" msgstr "%s згадаў Вас у каментары да pull-запыту %s \"%s\"" -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s requested your review of %s pull request \"%s\"" +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" msgstr "%s запытаў рэцэнзаванне pull-запыту %s \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Pull request %s" +msgid "Pull request" +msgstr "Pull-запыт %s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" +msgstr "" + #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "Каментар зачыніў pull-запыт са статусам" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "Каментар пакінуты са статусам" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "Падрабязней пра карыстача" +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%s згадаў Вас у каментары да pull-запыту %s \"%s\"" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Pull-запыт %s ад %s#%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[каментар] у pull-запыце для" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Імя групы" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5354,7 +4863,7 @@ msgid "%s File Diff" msgstr "Параўнанне файла %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "%s Файлы" @@ -5364,72 +4873,73 @@ msgstr "%s Файлы" msgid "%s Files Add" msgstr "%s Файлаў дададзена" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "Дадаць новы файл" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Размяшчэнне" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "Увядзіце імя файла..." -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "ці" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "Адаслаць файл" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "Стварыць новы файл" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "Рэжым новага файла" +msgid "New file type" +msgstr "Тып новага файла" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 msgid "Commit Changes" -msgstr "Ужыць змены" - -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "Папярэдняя рэвізія" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "Наступная рэвізія" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "Адсочваць дадзеную галінку" - -#: kallithea/templates/files/files_browser.html:44 +msgstr "Захаваць змены" + +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "Загружаецца спіс файлаў..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Памер" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "Апошняя версія" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "Апошняя змена" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "Аўтар апошняй рэвізіі" @@ -5439,7 +4949,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "Выдаліць файл" @@ -5452,24 +4962,20 @@ msgstr "" msgid "Edit file" msgstr "Рэдагаваць файл" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Зыходны код" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "Рэдагаванне файла" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5478,51 +4984,60 @@ msgstr[0] "%s аўтар" msgstr[1] "%s аўтараў" msgstr[2] "%s аўтара" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "Паказаць ўсю гісторыю" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "Паказаць ўсю гісторыю" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "Паказаць аўтараў" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "Выдаленая галіна: %s" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "Рэдагаванне бінарных файлаў забароненае" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" +msgstr "Рэдагаванне файлаў дазволенае толькі ў HEAD-рэвізіі дадзенай галіны" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "Рэдагаванне бінарных файлаў забаронена" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "Рэдагаванне файлаў дазволена толькі ў HEAD-рэвізіі дадзенай галінкі" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "Бінарны файл (%s)" +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "Файл занадта вялікі для адлюстравання." + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "Паказаць поўныя анатацыі." + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" -msgstr "Файл занадта вялікай для адлюстравання" +msgid "Show as raw." +msgstr "Паказаць сырым." #: kallithea/templates/files/files_ypjax.html:5 msgid "annotation" @@ -5542,12 +5057,12 @@ msgid "%s Followers" msgstr "%s Назіральнікі" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "Назіральнікі" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "Назіраць за рэпазітаром" @@ -5556,37 +5071,37 @@ msgstr "Назіраць за рэпазітаром" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "Імя форка" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" "Рэвізія па змаўчанні, з якой будзе вырабляцца выгрузка файлаў пры " "спампоўцы." -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Прыватны" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Скапіяваць прывілеі" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "Скапіяваць прывілеі з форкнутага рэпазітара" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "Абнаўляць пасля кланавання" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "Спампоўваць зыходнікі пасля стварэння клона" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5596,40 +5111,40 @@ msgid "%s Forks" msgstr "Форкі %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "Адгалінаванні" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "Форкнута" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" -msgstr "Форкі яшчэ не створаны" - -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "Стужка часопіса ATOM" +msgstr "Форкі яшчэ не створаныя" #: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "Стужка часопіса Atom" + +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "Стужка часопіса RSS" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "Мае рэпазітары" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "Запісы адсутнічаюць" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" -msgstr "Агульная стужка часопіса ATOM" - -#: kallithea/templates/journal/public_journal.html:14 +msgstr "Агульная стужка часопіса Atom" + +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "Агульная стужка часопіса RSS" @@ -5638,31 +5153,36 @@ msgstr "Агульная стужка часопіса RSS" msgid "New Pull Request" msgstr "Новы pull-запыт" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "Загаловак" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "Напісаць кароткае пісанне па гэтым запыце" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "Струмень змен" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "Першапачатковы рэпазітар" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "Рэвізія" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "Рэпазітар прызначэння" @@ -5671,9 +5191,12 @@ msgid "No entries" msgstr "Запісы отсуствуют" #: kallithea/templates/pullrequests/pullrequest_data.html:14 -#, fuzzy msgid "Vote" -msgstr "адклікаць" +msgstr "Галасаваць" + +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "Узрост" #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" @@ -5698,7 +5221,7 @@ msgstr "(няма загалоўка)" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "Зачынена" @@ -5711,164 +5234,163 @@ msgid "Confirm to delete this pull reque msgstr "Пацвердзіце выдаленне гэтага pull-request'а" #: kallithea/templates/pullrequests/pullrequest_data.html:70 -#, fuzzy, python-format +#, python-format msgid "Confirm again to delete this pull request with %s comments" -msgstr "Пацвердзіце выдаленне гэтага pull-request'а" +msgstr "Пацвердзіце выдаленне гэтага pull-запыту з %s каментарамі" #: kallithea/templates/pullrequests/pullrequest_show.html:6 -#, fuzzy, python-format +#, python-format msgid "%s Pull Request %s" -msgstr "%s Pull-запыт #%s" +msgstr "%s зull-запыт %s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 -#, fuzzy, python-format +#, python-format msgid "Pull request %s from %s#%s" -msgstr "Pull-запыты №%s ад %s#%s" - -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +msgstr "Pull-запыт %s ад %s#%s" + +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "Яшчэ не разгледжаны" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "%d рэцэнзент" -msgstr[1] "%d рэцэнзента" -msgstr[2] "%d рэцэнзентаў" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "Запыт на занясенне змен быў разгледжаны ўсімі рэцэнзентамі" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -msgid "There are no reviewers" -msgstr "Няма рэцэнзентаў" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "на" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "Цэль" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "Прыняць змены" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "Абнавіць" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "Рэгістрацыя" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "Рэцэнзенты pull-запытаў" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "Захаваць змены" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "Адмяніць змены" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#, fuzzy +#| msgid "reviewer" +msgid "Reviewers" +msgstr "рэцэнзент" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 msgid "Remove reviewer" msgstr "Выдаліць рэцэнзента" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 msgid "Potential Reviewers" msgstr "Патэнцыйныя рэцэнзенты" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "Захаваць змены" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" -msgstr "Адмяніць змены" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "Агульны продак" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" -msgstr "%s Запыты на занясенне змен" +msgstr "%s pull-запыты" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 -#, fuzzy, python-format -#| msgid "Pull Requests from %s'" +#, python-format msgid "Pull Requests from '%s'" -msgstr "Pull-запыты ад %s" +msgstr "Pull-запыты ад '%s'" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, python-format msgid "Pull Requests to '%s'" -msgstr "Pull-запыты для %s" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +msgstr "Pull-запыты да '%s'" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "Стварыць новы pull-запыт" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "Паказаць pull-запыты да %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "Паказаць pull-запыты ад %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Рэцэнзенты pull-запытаў" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" @@ -5882,31 +5404,31 @@ msgstr "" msgid "Search in All Repositories" msgstr "Пошук па ўсіх рэпазітарах" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "Фраза для пошуку" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "Крытэр пошуку" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" -msgstr "Змесціва файлаў" - -#: kallithea/templates/search/search.html:66 +msgstr "Змест файлаў" + +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "Паведамленні камітаў" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "Імя файла" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" -msgstr "Недастаткова мае рацыю" +msgstr "Недастаткова правоў" #: kallithea/templates/summary/statistics.html:4 #, python-format @@ -5914,80 +5436,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" -msgstr "ATOM стужка рэпазітара %s" +msgstr "Atom стужка рэпазітара %s" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "RSS стужка рэпазітара %s" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "Уключана" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "Атрыманая статыстыка: " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "файлы" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "Паказаць яшчэ" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "commit'ы" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "файлы дададзены" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "файлы зменены" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "файлы выдалены" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "commit" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "файл выдалены" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "файл зменены" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "файл выдалены" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "%s агульныя звесткі" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "Рэпазітар заблакаваны %s" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "Рэпазітар разблакаваны" @@ -5995,86 +5517,294 @@ msgstr "Рэпазітар разблакаваны" msgid "Fork of" msgstr "Форк ад" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "Кланаваць з" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "Спасылка для кланавання" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "Паводле ID" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" -msgstr "Паказаць па імі" - -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "Паказаць па ID" - -#: kallithea/templates/summary/summary.html:92 +msgstr "Паводле імя" + +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "Папулярныя файлы" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" -msgstr "Запампаваць" - -#: kallithea/templates/summary/summary.html:112 +msgstr "Спампаваць" + +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "Спамповак яшчэ няма" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" -msgstr "Спампоўка адключана ў гэтым рэпазітары" - -#: kallithea/templates/summary/summary.html:120 +msgstr "Спампоўванне адключанае ў гэтым рэпазітары" + +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" -msgstr "Запампаваць у zip" - -#: kallithea/templates/summary/summary.html:125 +msgstr "Спампаваць у zip" + +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "Адзначце для спампоўкі архіва з даччынымі рэпазітарамі" -#: kallithea/templates/summary/summary.html:125 -#, fuzzy +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" -msgstr "з даччынымі рэпазітарамі" - -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Памер рэпазітара" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +msgstr "З даччынымі рэпазітарамі" + +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "Стужка навін" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 msgid "Latest Changes" msgstr "Апошнія змены" +#: kallithea/templates/summary/summary.html:177 +msgid "Quick Start" +msgstr "Хуткі старт" + #: kallithea/templates/summary/summary.html:188 -msgid "Quick Start" -msgstr "Хуткі старт" - -#: kallithea/templates/summary/summary.html:202 +msgid "Add or upload files directly via Kallithea" +msgstr "Дадаць ці загрузіць файлы праз Kallithea" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "Адправіць новы рэпазітар" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "Існы рэпазітар?" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" -msgstr "Запампаваць %s як %s" - -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s Пазнак" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "Параўнаць тэгі" +msgstr "Спампаваць %s як %s" + +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "Індэксы адсутнічаюць. Калі ласка, запусціце індэксатар Whoosh" + +#~ msgid "IP %s not allowed" +#~ msgstr "IP %s заблакаваны" + +#~ msgid "%(user)s commented on changeset %(age)s" +#~ msgstr "%(user)s пакінуў каментар да набору змен %(age)s" + +#~ msgid "%(user)s sent message %(age)s" +#~ msgstr "%(user)s адправіў паведамленне %(age)s" + +#~ msgid "%(user)s mentioned you %(age)s" +#~ msgstr "%(user)s згадаў вас %(age)s" + +#~ msgid "%(user)s registered in Kallithea %(age)s" +#~ msgstr "%(user)s зарэгістраваўся ў Kallithea %(age)s" + +#~ msgid "%(user)s opened new pull request %(age)s" +#~ msgstr "%(user)s адкрыў новы pull-запыт %(age)s" + +#~ msgid "%(user)s commented on pull request %(age)s" +#~ msgstr "%(user)s пакінуў каментар да pull-запыту %(age)s" + +#~ msgid "%(user)s commented on changeset at %(when)s" +#~ msgstr "%(user)s пакінуў каментар да набору змен %(when)s" + +#~ msgid "%(user)s sent message at %(when)s" +#~ msgstr "%(user)s адправіў паведамленне %(when)s" + +#~ msgid "%(user)s mentioned you at %(when)s" +#~ msgstr "%(user)s згадаў вас %(when)s" + +#~ msgid "%(user)s registered in Kallithea at %(when)s" +#~ msgstr "%(user)s зарэгістраваўся ў Kallithea %(when)s" + +#~ msgid "%(user)s opened new pull request at %(when)s" +#~ msgstr "%(user)s адкрыў новы pull-запыт %(when)s" + +#~ msgid "%(user)s commented on pull request at %(when)s" +#~ msgstr "%(user)s пакінуў каментар да pull-запыту %(when)s" + +#, fuzzy +#~| msgid "Repository group" +#~ msgid "Repository Group" +#~ msgstr "Група рэпазітароў" + +#~ msgid "My Notifications" +#~ msgstr "Мае апавяшчэнні" + +#~ msgid "All" +#~ msgstr "Усе" + +#~ msgid "Comments" +#~ msgstr "Каментары" + +#~ msgid "Mark All Read" +#~ msgstr "Адзначыць усе як прачытаныя" + +#, fuzzy +#~| msgid "Mark All Read" +#~ msgid "Mark as read" +#~ msgstr "Адзначыць усе як прачытаныя" + +#~ msgid "No notifications here yet" +#~ msgstr "Апавяшчэнняў няма" + +#~ msgid "Show Notification" +#~ msgstr "Паказаць апавяшчэнне" + +#~ msgid "Notifications" +#~ msgstr "Апавяшчэнні" + +#~ msgid "Home" +#~ msgstr "Дамоў" + +#~ msgid "with" +#~ msgstr "з" + +#~ msgid "members" +#~ msgstr "удзельнікі" + +#~ msgid "Changeset has comments" +#~ msgstr "Каментары адсутнічаюць" + +#~ msgid "Author" +#~ msgstr "Аўтар" + +#~ msgid "Refs" +#~ msgstr "Спасылкі" + +#~ msgid "Commenting on line." +#~ msgstr "Каментар да радка." + +#, fuzzy +#~| msgid "on pull request" +#~ msgid "Pull request from" +#~ msgstr "у pull-запыце" + +#, fuzzy +#~| msgid "Date" +#~ msgid "at" +#~ msgstr "Дата" + +#~ msgid "Previous revision" +#~ msgstr "Папярэдняя рэвізія" + +#~ msgid "Next revision" +#~ msgstr "Наступная рэвізія" + +#~ msgid "Follow current branch" +#~ msgstr "Адсочваць дадзеную галіну" + +#~ msgid "Still not reviewed by" +#~ msgstr "Яшчэ не разгледжаны" + +#~ msgid "%d reviewer" +#~ msgid_plural "%d reviewers" +#~ msgstr[0] "%d рэцэнзент" +#~ msgstr[1] "%d рэцэнзенты" +#~ msgstr[2] "%d рэцэнзентаў" + +#~ msgid "Pull request was reviewed by all reviewers" +#~ msgstr "Запыт на занясенне змен быў разгледжаны ўсімі рэцэнзентамі" + +#~ msgid "There are no reviewers" +#~ msgstr "Няма рэцэнзентаў" + +#~ msgid "Pull Request Reviewers" +#~ msgstr "Рэцэнзенты pull-запытаў" + +#~ msgid "Dashboard" +#~ msgstr "Панэль кіравання" + +#~ msgid "Group Name" +#~ msgstr "Імя групы" + +#~ msgid "Remember me" +#~ msgstr "Запомніць" + +#~ msgid "Change your avatar at" +#~ msgstr "Змяніць аватар можна праз" + +#~ msgid "Using" +#~ msgstr "Выкарыстоўваецца" + +#~ msgid "Missing email, please update your user email address." +#~ msgstr "Няма email адрэсы, калі ласка, абнавіце ваш email." + +#~ msgid "Rescan option" +#~ msgstr "Опцыі перасканіравання" + +#~ msgid "Web" +#~ msgstr "Вэб" + +#~ msgid "Require SSL for vcs operations" +#~ msgstr "Запытваць SSL для аперацый з VCS" + +#~ msgid "Use Gravatars in Kallithea" +#~ msgstr "Выкарыстоўваць Gravatars у Kallithea" + +#~ msgid "Dashboard items" +#~ msgstr "Элементы панэлі" + +#~ msgid "" +#~ "Number of items displayed in the main page dashboard before pagination " +#~ "is shown." +#~ msgstr "" +#~ "Колькасць элементаў, што паказваюцца на галоўнай старонцы панэлі " +#~ "кіравання перад паказам нумарацыі старонак." + +#~ msgid "quick filter..." +#~ msgstr "фільтр..." + +#~ msgid "Missing email, please update this user email address." +#~ msgstr "Не паказаны email. Калі ласка, абнавіце email карыстальніка." + +#~ msgid "Keyboard shortcuts" +#~ msgstr "Гарачыя клавішы" + +#~ msgid "Forgot password ?" +#~ msgstr "Забыліся на пароль?" + +#~ msgid "Ancestor" +#~ msgstr "Продак" + +#~ msgid "Comment from %s on %s changeset %s" +#~ msgstr "Каментар ад %s да набору змен %s %s" + +#~ msgid "The changeset status was changed to" +#~ msgstr "Статус набору змен зменены на" + +#~ msgid "This is an automatic notification. Don't reply to this mail." +#~ msgstr "" +#~ "Гэта аўтаматычнае апавяшчэнне. Не адказвайце на гэтае паведамленне." + +#~ msgid "%s mentioned you on %s pull request \"%s\"" +#~ msgstr "%s згадаў Вас у каментары да pull-запыту %s \"%s\"" + +#~ msgid "%s requested your review of %s pull request \"%s\"" +#~ msgstr "%s запытаў рэцэнзаванне pull-запыту %s \"%s\"" + +#~ msgid "The comment closed the pull request with status" +#~ msgstr "Каментар зачыніў pull-запыт са статусам" + +#~ msgid "The comment was made with status" +#~ msgstr "Каментар пакінуты са статусам" + +#~ msgid "View this user here" +#~ msgstr "Падрабязней пра карыстальніка" + +#~ msgid "Repository Size" +#~ msgstr "Памер рэпазітара" #~ msgid "No comments." #~ msgstr "Няма каментароў." @@ -6101,19 +5831,16 @@ msgstr "Параўнаць тэгі" #~ msgstr "Рэпазітар %s" #~ msgid "You can't edit this user" -#~ msgstr "Вы не можаце рэдагаваць дадзенага карыстача" +#~ msgstr "Вы не можаце рэдагаваць дадзенага карыстальніка" #~ msgid "No Files" #~ msgstr "Файлаў няма" -#~ msgid "" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "Імя \"%(username)s\" адхілена" #~ msgid "invalid user name" -#~ msgstr "няслушнае імя карыстача" +#~ msgstr "няслушнае імя карыстальніка" #~ msgid "Your account is disabled" #~ msgstr "Ваш акаўнт выключаны" @@ -6121,12 +5848,6 @@ msgstr "Параўнаць тэгі" #~ msgid "invalid clone URL" #~ msgstr "няслушны URL для кланавання" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "Рэвізіі %(revs)s ужо ўключаны ў pull-request ці маюць усталяваны статус" - #~ msgid "Defaults" #~ msgstr "Значэнні па змаўчанні" @@ -6142,15 +5863,6 @@ msgstr "Параўнаць тэгі" #~ msgid "reset" #~ msgstr "cкінуць" -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - #~ msgid "delete" #~ msgstr "выдаліць" @@ -6164,10 +5876,10 @@ msgstr "Параўнаць тэгі" #~ msgstr "Перазапісаць існыя налады" #~ msgid "Default IP Whitelist for All Users" -#~ msgstr "Белы спіс IP для ўсіх карыстачоў" +#~ msgstr "Белы спіс IP для ўсіх карыстальнікаў" #~ msgid "Default User Permissions Overview" -#~ msgstr "Агляд мае рацыю карыстачоў па змаўчанні" +#~ msgstr "Агляд мае рацыю карыстальнікаў па змаўчанні" #~ msgid "none" #~ msgstr "нічога" @@ -6181,12 +5893,6 @@ msgstr "Параўнаць тэгі" #~ msgid "admin" #~ msgstr "адміністратар" -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - #~ msgid "Optional URL from which repository should be cloned." #~ msgstr "Апцыянальны URL, з якога патрабуецца скланаваць рэпазітар." @@ -6196,9 +5902,6 @@ msgstr "Параўнаць тэгі" #~ msgid "Pull Changes from Remote Location" #~ msgstr "Атрымаць змены з выдаленага боку" -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - #~ msgid "Non-changeable id" #~ msgstr "Нязменлівы id" @@ -6208,69 +5911,21 @@ msgstr "Параўнаць тэгі" #~ msgid "new value" #~ msgstr "новае значэнне" -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - #~ msgid "SMTP server" #~ msgstr "SMTP-сервер" -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - #~ msgid "Destroy old data" #~ msgstr "Знішчыць усе дадзеныя" #~ msgid "Default permissions" #~ msgstr "Стандартныя прывілеі" -#~ msgid "Inherit from defaults" -#~ msgstr "" - #~ msgid "show" #~ msgstr "паказа́ць" -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "Змена статусу" -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - #~ msgid "revision" #~ msgstr "рэвізія" @@ -6289,9 +5944,6 @@ msgstr "Параўнаць тэгі" #~ msgid "owner" #~ msgstr "уладальнік" -#~ msgid "reviewer" -#~ msgstr "рэцэнзент" - #~ msgid "Your new password" #~ msgstr "Ваш новы пароль" @@ -6305,11 +5957,216 @@ msgstr "Параўнаць тэгі" #~ msgstr "Паказаць абраны набор змен: __S" #~ msgid "You can generate it by clicking following URL" -#~ msgstr "Вы можаце нанова згенераваць яго, пяройдучы па наступнай спасылцы" - -#~ msgid "Please ignore this email if you did not request a new password ." #~ msgstr "" +#~ "Вы можаце нанова згенераваць яго, пяройдучы па наступнай спасылцы" #~ msgid "Created by" #~ msgstr "Створана" +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Зачынены, заменены %s." + +#~ msgid "Closing." +#~ msgstr "Зачынены." + +#~ msgid "Changeset not found" +#~ msgstr "Набор змен не знойдзены" + +#~ msgid "Repository no access" +#~ msgstr "Рэпазітар - няма доступу" + +#~ msgid "Repository read access" +#~ msgstr "Рэпазітар - доступ на чытанне" + +#~ msgid "Repository write access" +#~ msgstr "Рэпазітар - доступ на запіс" + +#~ msgid "Repository admin access" +#~ msgstr "Рэпазітар - адміністраванне" + +#~ msgid "Repository Group no access" +#~ msgstr "Група Рэпазітароў - няма доступу" + +#~ msgid "Repository Group read access" +#~ msgstr "Група Рэпазітароў - доступ на чытанне" + +#~ msgid "Repository Group write access" +#~ msgstr "Група Рэпазітароў - доступ на запіс" + +#~ msgid "Repository Group admin access" +#~ msgstr "Група Рэпазітароў - адміністраванне" + +#~ msgid "Repository creation disabled" +#~ msgstr "Стварэнне рэпазітароў адключанае" + +#~ msgid "Repository creation enabled" +#~ msgstr "Стварэнне рэпазітароў уключанае" + +#~ msgid "Repository forking disabled" +#~ msgstr "Магчымасць ствараць форк рэпазітара адключаная" + +#~ msgid "Repository forking enabled" +#~ msgstr "Магчымасць ствараць форк рэпазітара ўключаная" + +#~ msgid "Register disabled" +#~ msgstr "Рэгістрацыя адключаная" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Рэгістрацыя новага карыстальніка ў Kallithea з ручной актывацыяй" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "" +#~ "Рэгістрацыя новага карыстальніка ў Kallithea з аўтаматычнай актывацыяй" + +#~ msgid "Not Reviewed" +#~ msgstr "Не прагледжана" + +#~ msgid "Rejected" +#~ msgstr "Адхілена" + +#~ msgid "Under Review" +#~ msgstr "На разглядзе" + +#~ msgid "Repository group no access" +#~ msgstr "Група Рэпазітароў - няма доступу" + +#~ msgid "Repository group read access" +#~ msgstr "Група рэпазітароў - доступ на чытанне" + +#~ msgid "Repository group write access" +#~ msgstr "Група рэпазітароў - доступ на запіс" + +#~ msgid "Repository group admin access" +#~ msgstr "Група рэпазітароў - адміністраванне" + +#~ msgid "User group no access" +#~ msgstr "Група карыстальнікаў - няма доступу" + +#~ msgid "User group read access" +#~ msgstr "Група карыстальнікаў - доступ на чытанне" + +#~ msgid "User group write access" +#~ msgstr "Група карыстальнікаў - доступ на запіс" + +#~ msgid "User group admin access" +#~ msgstr "Група карыстальнікаў - адміністраванне" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Стварэнне груп рэпазітароў адключанае" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Стварэнне груп рэпазітароў уключанае" + +#~ msgid "User Group creation disabled" +#~ msgstr "Стварэнне груп карыстальнікаў адключанае" + +#~ msgid "User Group creation enabled" +#~ msgstr "Стварэнне груп карыстальнікаў уключанае" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Рэгістрацыя карыстальніка з ручной актывацыяй уліковага запісу" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Рэгістрацыя карыстальніка з аўтаматычнай актывацыяй" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "%(user)s просіць вас разгледзець pull request %(pr_nice_id)s: " +#~ "%(pr_title)s" + +#~ msgid "repositories" +#~ msgstr "рэпазітары" + +#~ msgid "No repositories found." +#~ msgstr "Рэпазітары не знойдзеныя." + +#~ msgid "There are no branches yet" +#~ msgstr "Галіны яшчэ не створаныя" + +#~ msgid "There are no tags yet" +#~ msgstr "Пазнакі адсутнічаюць" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Закладак яшчэ няма" + +#~ msgid "enabled" +#~ msgstr "уключана" + +#~ msgid "%s Bookmarks" +#~ msgstr "Закладкі %s" + +#~ msgid "Compare Bookmarks" +#~ msgstr "Параўнаць закладкі" + +#~ msgid "%s Branches" +#~ msgstr "%s Галіны" + +#~ msgid "Compare Branches" +#~ msgstr "Параўнаць галіны" + +#~ msgid "Editing file" +#~ msgstr "Рэдагаванне файла" + +#~ msgid "Update" +#~ msgstr "Абнавіць" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Захаваць абнаўленні як новы pull-запыт" + +#~ msgid "%s Tags" +#~ msgstr "%s Тэгаў" + +#~ msgid "Compare Tags" +#~ msgstr "Параўнаць тэгі" + +#~ msgid "" +#~ "Changing status on a changeset associated with a closed pull request " +#~ "is not allowed" +#~ msgstr "" +#~ "Нельга рэдагаваць статус змен, злучаных з зачыненымі pull-request'ами" + +#~ msgid "You have successfully registered into Kallithea" +#~ msgstr "Рэгістрацыя ў Kallithea прайшла паспяхова" + +#~ msgid "This pull request can be updated with changes on %s:" +#~ msgstr "Гэты pull-запыт можа быць абноўлены з %s:" + +#~ msgid "Confirm to invalidate repository cache." +#~ msgstr "Пацвердзіце скід кэша." + +#~ msgid "" +#~ "Changeset status: %s\n" +#~ "Click to open associated pull request %s" +#~ msgstr "" +#~ "Статут набору змен: %s?\n" +#~ "Клікніце, каб перайсці да адпаведнага pull-request'у #%s" + +#~ msgid "Commenting on line {1}." +#~ msgstr "Каментар да радка {1}." + +#~ msgid "Comments parsed using %s syntax with %s support." +#~ msgstr "" +#~ "Парсінг каментароў выкананы з выкарыстаннем сінтаксісу %s з падтрымкай " +#~ "%s." + +#~ msgid "Use @username inside this text to notify another user" +#~ msgstr "" +#~ "Выкарыстоўвайце @імя_карыстача ў тэксце, каб адправіць абвестку " +#~ "пэўнаму карыстачу" + +#~ msgid "Comment preview" +#~ msgstr "Папярэдні прагляд каментара" + +#~ msgid "Preview" +#~ msgstr "Прадпрагляд" + +#~ msgid "Use @username inside this text to notify another user." +#~ msgstr "" +#~ "Выкарыстоўвайце @імя_карыстача ў тэксце, каб адправіць абвестку " +#~ "пэўнаму карыстачу" + +#~ msgid "New file mode" +#~ msgstr "Рэжым новага файла" + +#~ msgid "File is too big to display" +#~ msgstr "Файл занадта вялікай для адлюстравання" diff --git a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/cs/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/cs/LC_MESSAGES/kallithea.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" "PO-Revision-Date: 2015-11-12 08:51+0000\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Czech " -"\n" +"Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,443 +19,457 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Weblate 2.5-dev\n" -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(zavřeno)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +#, fuzzy +msgid "No permission to change status" +msgstr "Změny" + +#: kallithea/controllers/changeset.py:214 +#, fuzzy, python-format +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 msgid "Such revision does not exist for this repository" msgstr "Taková revize neexistuje" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Prázdný repozitář" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 #, fuzzy msgid "No response" msgstr "Neznámá revize %s" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Nemáte oprávnění k zobrazení této stránky" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#, python-format +msgid "%s %s feed" +msgstr "" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 #, python-format msgid "Changes on %s repository" msgstr "Změny na repozitáři %s" -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Klikněte pro přidání nového souboru" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "Zatím nejsou žádné soubory. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:317 +#: kallithea/controllers/files.py:312 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:328 +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "Žádné změny" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "Přidaný soubor přes Kallithea" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "Žádný obsah" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "Stahování vypnuto" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "Neznámá revize %s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "Prázdný repozitář" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Změny" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Větve" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Tagy" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "Skupiny" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repozitáře" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Větev" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "Záložka" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "Špatná captcha" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "Úspěšně aktualizované heslo" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" msgstr "%s (zavřené)" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "" - -#: kallithea/controllers/pullrequests.py:363 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 +msgid "Error occurred while creating pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:352 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 -msgid "Error occurred while creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 +#: kallithea/controllers/pullrequests.py:375 +msgid "New pull request iteration created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:432 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:445 +msgid "Successfully deleted pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:524 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:557 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:514 -msgid "Pull request updated" -msgstr "" - -#: kallithea/controllers/pullrequests.py:529 -msgid "Successfully deleted pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:595 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:597 -msgid "This pull request has been closed and can not be updated." -msgstr "" - -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 -#, python-format -msgid "Note: Branch %s has another head: %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +"Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "" #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Došlo k chybě při vyhledávání." -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "" @@ -467,149 +481,151 @@ msgstr "" msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" -msgstr "" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 minut" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "5 minut" +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "1 hodina" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" -msgstr "1 hodina" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "1 den" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 -msgid "1 day" -msgstr "1 den" - -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 měsíc" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "Došlo k chybě při vytváření gist" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "" +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "" + #: kallithea/controllers/admin/gists.py:233 -msgid "Unmodified" -msgstr "" - -#: kallithea/controllers/admin/gists.py:262 -msgid "Successfully updated gist content" -msgstr "" - -#: kallithea/controllers/admin/gists.py:267 -msgid "Successfully updated gist data" -msgstr "" - -#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "Došlo k chybě při aktualizaci hesla uživatele" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "Došlo k chybě při ukládání e-mailové adresy" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "" +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "" + #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -617,621 +633,619 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "Error occurred during gist creation" +msgid "An error occurred during creation of field: %r" +msgstr "Došlo k chybě při vytváření gist" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "" +#: kallithea/controllers/admin/repos.py:446 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:450 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:466 +msgid "Nothing" +msgstr "Nic" + +#: kallithea/controllers/admin/repos.py:468 +#, python-format +msgid "Marked repository %s as fork of %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:475 +msgid "An error occurred during this operation" +msgstr "" + #: kallithea/controllers/admin/repos.py:491 -msgid "Updated repository visibility in public journal" -msgstr "" - -#: kallithea/controllers/admin/repos.py:495 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:512 -msgid "Nothing" -msgstr "Nic" - -#: kallithea/controllers/admin/repos.py:514 -#, python-format -msgid "Marked repository %s as fork of %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:521 -msgid "An error occurred during this operation" -msgstr "" - -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 msgid "Repository has been locked" msgstr "Repozitář byl uzamčen" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" msgstr "Repozitář byl odemčen" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" +msgstr "" + #: kallithea/controllers/admin/settings.py:174 -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" - -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 -msgid "Error occurred while updating application settings" -msgstr "" - -#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, fuzzy, python-format #| msgid "Watched Repositories" msgid "Invalidated %s repositories" msgstr "Repozitáře" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +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 "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "" - -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" - -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 -#, python-format -msgid "Deleted branch: %s" -msgstr "" - #: kallithea/lib/helpers.py:612 #, python-format +msgid "Deleted branch: %s" +msgstr "" + +#: kallithea/lib/helpers.py:614 +#, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, fuzzy, python-format #| msgid "Set changeset status" msgid "Changeset %s not found" msgstr "Změny" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1239,7 +1253,7 @@ msgid "" "repositories" msgstr "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1247,7 +1261,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1255,7 +1269,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1263,7 +1277,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1271,7 +1285,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1279,7 +1293,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1287,1120 +1301,613 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 #, fuzzy msgid "Only admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 #, fuzzy -#| msgid "Non-admins can can fork repositories" msgid "Non-admins can fork repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2238 -#, fuzzy +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2241 -#, fuzzy +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2266 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:309 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "" - -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" + +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 -msgid "You can't remove this user since it is crucial for the entire application" -msgstr "" - -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" + +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" - -#: kallithea/model/user.py:273 +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:126 +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:133 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:152 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 msgid "Invalid username or password" msgstr "" +#: kallithea/model/validators.py:312 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:330 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + #: kallithea/model/validators.py:331 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:345 -#, python-format -msgid "Repository name %(repo)s is not allowed" -msgstr "" - -#: kallithea/model/validators.py:347 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - -#: kallithea/model/validators.py:348 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 #, fuzzy msgid "Invalid repository URL" msgstr "Prázdný repozitář" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" - -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 -msgid "Add Repository Group" -msgstr "" - +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 #: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "" @@ -2408,147 +1915,130 @@ msgstr "" msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" msgstr "" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 -msgid "Send Password Reset Email" -msgstr "" - #: kallithea/templates/password_reset.html:47 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 -#, fuzzy, python-format +#: kallithea/templates/journal/journal.html:13 +#, python-format msgid "%s Entry" msgid_plural "%s Entries" msgstr[0] "" @@ -2556,30 +2046,16 @@ msgstr[1] "" msgstr[2] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2587,7 +2063,7 @@ msgstr "" msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "" @@ -2596,109 +2072,109 @@ msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 #, fuzzy msgid "Repository Defaults" msgstr "Repozitáře" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2707,45 +2183,45 @@ msgstr "" msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 msgid "Never" msgstr "" @@ -2754,7 +2230,8 @@ msgid "Update Gist" msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "" @@ -2777,16 +2254,16 @@ msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "" @@ -2795,45 +2272,45 @@ msgstr "" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "" @@ -2843,184 +2320,199 @@ msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 #, fuzzy msgid "Owned Repositories" msgstr "Repozitáře" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "Repozitáře" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "" @@ -3028,61 +2520,60 @@ msgstr "" msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 #, fuzzy msgid "Repositories You Own" msgstr "Umístění repozitářů" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 @@ -3090,45 +2581,9 @@ msgstr "" msgid "Repositories You are Watching" msgstr "Umístění repozitářů" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "" @@ -3142,168 +2597,174 @@ msgstr "" msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:20 #, fuzzy msgid "Apply to all existing repositories" msgstr "Chyba při vytváření repozitáře %s" +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:33 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 msgid "Top level repository creation" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:61 +msgid "Repository creation with group write access" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 -msgid "Repository creation with group write access" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:75 +msgid "Repository forking" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:78 +msgid "Enable this to allow non-admins to fork repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 +msgid "Registration" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:88 -msgid "Repository forking" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:92 -msgid "Enable this to allow non-admins to fork repositories." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:97 -msgid "Registration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:105 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 -#, fuzzy, python-format +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" @@ -3312,30 +2773,29 @@ msgstr "" msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "Nastavení" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "Pokročilé" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "" @@ -3360,12 +2820,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3377,16 +2837,34 @@ msgstr[2] "" msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "Neznámá revize %s" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3394,103 +2872,96 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 -#, fuzzy +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository Defaults" +msgid "Repository group %s" +msgstr "Repozitáře" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 #, fuzzy msgid "Clone remote repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3519,26 +2990,26 @@ msgid "" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, fuzzy, python-format +#, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "" @@ -3547,66 +3018,64 @@ msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 msgid "Confirm to unlock repository." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 #, fuzzy msgid "Unlock Repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 #, fuzzy msgid "Confirm to lock repository." msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 #, fuzzy msgid "Lock Repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3614,34 +3083,34 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 #, fuzzy msgid "Delete this Repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 -#, fuzzy, python-format +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3652,110 +3121,112 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Go to tip of repository" +msgid "Fork of repository" +msgstr "Prázdný repozitář" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "Změny na repozitáři %s" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3765,35 +3236,40 @@ msgid "" "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "Prázdný repozitář" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Repozitáře" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3810,7 +3286,7 @@ msgstr "" msgid "Repositories Administration" msgstr "Umístění repozitářů" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3831,7 +3307,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "" @@ -3843,278 +3319,268 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 #, fuzzy msgid "Save Settings" msgstr "Nastavení" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom Hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. " -"Current hooks will be updated to the latest version." +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 #, fuzzy msgid "Location of repositories" msgstr "Chyba při vytváření repozitáře %s" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4131,93 +3597,101 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repositories" +msgid "Repository page size" +msgstr "Repozitáře" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 #, fuzzy msgid "Meta Tagging" msgstr "Nastavení" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4236,13 +3710,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4251,15 +3725,15 @@ msgstr "" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" @@ -4273,17 +3747,17 @@ msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "" @@ -4302,12 +3776,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4316,7 +3790,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4325,24 +3799,16 @@ msgstr "" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "" @@ -4350,223 +3816,220 @@ msgstr "" msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "" - #: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" -msgstr "" - #: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 #, fuzzy msgid "Inherit defaults" msgstr "Repozitáře" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "" @@ -4575,150 +4038,142 @@ msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -#, fuzzy -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "" - -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "" - -#: kallithea/templates/base/root.html:27 -msgid "Loading ..." -msgstr "" - #: kallithea/templates/base/root.html:28 -msgid "loading ..." +msgid "Retry" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +msgid "Unable to post" msgstr "" #: kallithea/templates/base/root.html:31 -#, fuzzy -msgid "Open New Pull Request from {0}" -msgstr "Změna stavu-> %s" +msgid "Add Another Comment" +msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" +#, fuzzy +msgid "Open New Pull Request from {0}" +msgstr "Změna stavu-> %s" #: kallithea/templates/base/root.html:40 -msgid "disabled" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +#, fuzzy +msgid "No revisions" +msgstr "Neznámá revize %s" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4726,80 +4181,32 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 #, fuzzy msgid "Go to tip of repository" msgstr "Prázdný repozitář" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "" @@ -4815,7 +4222,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "" @@ -4829,39 +4236,59 @@ msgstr "" msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -#, fuzzy -msgid "Push new repository" -msgstr "Prázdný repozitář" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, fuzzy, python-format +msgid "Changeset status: %s by %s" +msgstr "Změny" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, python-format +msgid "%s comments" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" msgstr "" #: kallithea/templates/changeset/changeset.html:8 @@ -4869,60 +4296,50 @@ msgstr "" msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 msgid "Merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4930,9 +4347,9 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4940,18 +4357,17 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -#, fuzzy -msgid "No revisions" -msgstr "Neznámá revize %s" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +msgid "comment" +msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy @@ -4968,61 +4384,61 @@ msgid "on this changeset" msgstr "Žádné změny" #: kallithea/templates/changeset/changeset_file_comment.html:30 -#, fuzzy msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 #, fuzzy msgid "Status change" msgstr "Změna stavu-> %s" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#, fuzzy +msgid "Set changeset status" +msgstr "Změny" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +#, fuzzy +msgid "No change" +msgstr "Žádné změny" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "Změna stavu-> %s" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +#, fuzzy +msgid "Close" +msgstr "(zavřeno)" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -5030,15 +4446,15 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:107 -#, fuzzy, python-format +#: kallithea/templates/changeset/changeset_file_comment.html:154 +#, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5046,104 +4462,100 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -#, fuzzy -msgid "Set changeset status" -msgstr "Změny" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -#, fuzzy -msgid "No change" -msgstr "Žádné změny" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -#, fuzzy -msgid "Close" -msgstr "(zavřeno)" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Neznámá revize %s" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 -#, fuzzy, python-format +#: kallithea/templates/compare/compare_cs.html:55 +#, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "" @@ -5154,20 +4566,20 @@ msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5175,107 +4587,159 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Comment on Changeset \"%s\"" +msgstr "Změny" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changesets" +msgid "Changeset on" +msgstr "Změny" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Větev" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Změna stavu-> %s" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "Repozitář byl uzamčen" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request" +msgstr "Změna stavu-> %s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "on pull request" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Změna stavu-> %s" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5294,7 +4758,7 @@ msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "" @@ -5304,73 +4768,74 @@ msgstr "" msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" +msgid "New file type" msgstr "" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 #, fuzzy msgid "Commit Changes" msgstr "Žádné změny" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "" @@ -5380,7 +4845,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5393,24 +4858,20 @@ msgstr "" msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5419,50 +4880,58 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "" +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" +msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 @@ -5483,12 +4952,12 @@ msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "" @@ -5497,35 +4966,35 @@ msgstr "" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5535,40 +5004,40 @@ msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "" @@ -5577,31 +5046,36 @@ msgstr "" msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "" @@ -5613,6 +5087,10 @@ msgstr "" msgid "Vote" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5636,7 +5114,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "" @@ -5649,7 +5127,7 @@ msgid "Confirm to delete this pull reque msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:70 -#, fuzzy, python-format +#, python-format msgid "Confirm again to delete this pull request with %s comments" msgstr "" @@ -5663,109 +5141,96 @@ msgstr "" msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -#, fuzzy -msgid "There are no reviewers" -msgstr "Zatím nejsou žádné soubory. %s" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 -#, fuzzy -msgid "Remove reviewer" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:250 -msgid "Type name of reviewer to add" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:258 -#, fuzzy -msgid "Potential Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:261 -msgid "Click to add the repository owner as reviewer:" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:284 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 #, fuzzy msgid "Cancel Changes" msgstr "Žádné změny" -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:234 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:240 +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:243 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5773,7 +5238,6 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -#| msgid "Open New Pull Request from {0}" msgid "Pull Requests from '%s'" msgstr "Změna stavu-> %s" @@ -5782,35 +5246,39 @@ msgstr "Změna stavu-> %s" msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" @@ -5824,29 +5292,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "" @@ -5856,80 +5324,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "" @@ -5937,113 +5405,91 @@ msgstr "" msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 #, fuzzy msgid "Latest Changes" msgstr "Změna stavu-> %s" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:177 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +#, fuzzy +msgid "Push new repository" +msgstr "Prázdný repozitář" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" - -#~ msgid "increase diff context to %(num)s lines" -#~ msgstr "" - -#~ msgid "No comments." -#~ msgstr "" - -#~ msgid "public journal" -#~ msgstr "" - -#~ msgid "journal" -#~ msgstr "" - -#~ msgid "forever" -#~ msgstr "" - -#~ msgid "unmodified" -#~ msgstr "" - -#~ msgid "Cannot delete %s it still contains attached forks" -#~ msgstr "" - -#~ msgid "Locked repository" -#~ msgstr "" - -#~ msgid "Unlocked repository" -#~ msgstr "" +#, fuzzy +#~| msgid "Repository URL" +#~ msgid "Repository Group" +#~ msgstr "Repozitáře" + +#, fuzzy +#~ msgid "There are no reviewers" +#~ msgstr "Zatím nejsou žádné soubory. %s" #~ msgid "Unlocked" #~ msgstr "Odemčeno" @@ -6051,336 +5497,5 @@ msgstr "" #~ msgid "Locked" #~ msgstr "Zamčeno" -#~ msgid "Repository has been %s" -#~ msgstr "" - -#~ msgid "You can't edit this user" -#~ msgstr "" - -#~ msgid "compare view" -#~ msgstr "" - -#~ msgid "fork name %s" -#~ msgstr "" - -#~ msgid "Pull request #%s" -#~ msgstr "" - -#~ msgid "No Files" -#~ msgstr "" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -#~ msgstr "" - -#~ msgid "You can't remove this user since it's crucial for entire application" -#~ msgstr "" - -#~ msgid "Username \"%(username)s\" is forbidden" -#~ msgstr "" - -#~ msgid "invalid password" -#~ msgstr "" - -#~ msgid "invalid user name" -#~ msgstr "" - -#~ msgid "Your account is disabled" -#~ msgstr "" - -#~ msgid "Repository name %(repo)s is disallowed" -#~ msgstr "" - -#~ msgid "invalid clone URL" -#~ msgstr "" - -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "This email address is already taken" -#~ msgstr "" - -#~ msgid "email \"%(email)s\" does not exist." -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "" - -#~ msgid "Defaults" -#~ msgstr "" - -#~ msgid "never" -#~ msgstr "" - -#~ msgid "My Emails" -#~ msgstr "" - -#~ msgid "Watched" -#~ msgstr "" - -#~ msgid "My Permissions" -#~ msgstr "" - -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "Confirm to reset this api key: %s" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "Confirm to remove this api key: %s" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - -#~ msgid "delete" -#~ msgstr "" - -#~ msgid "current IP" -#~ msgstr "" - -#~ msgid "Permissions Administration" -#~ msgstr "" - -#~ msgid "Overview" -#~ msgstr "" - -#~ msgid "Overwrite existing settings" -#~ msgstr "" - -#~ msgid "Repository creation" -#~ msgstr "" - -#~ msgid "Default IP Whitelist for All Users" -#~ msgstr "" - -#~ msgid "Confirm to delete this ip: %s" -#~ msgstr "" - -#~ msgid "Default User Permissions Overview" -#~ msgstr "" - -#~ msgid "none" -#~ msgstr "" - -#~ msgid "read" -#~ msgstr "" - -#~ msgid "write" -#~ msgstr "" - -#~ msgid "admin" -#~ msgstr "" - -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "default" -#~ msgstr "" - -#~ msgid "revoke" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - -#~ msgid "apply to children" -#~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - -#~ msgid "Optional URL from which repository should be cloned." -#~ msgstr "" - -#~ msgid "private repository" -#~ msgstr "" - -#~ msgid "Remote URL" -#~ msgstr "" - -#~ msgid "Pull Changes from Remote Location" -#~ msgstr "" - -#~ msgid "Confirm to pull changes from remote side." -#~ msgstr "" - -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - -#~ msgid "Non-changeable id" -#~ msgstr "" - -#~ msgid "edit" -#~ msgstr "" - -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - -#~ msgid "Destroy old data" -#~ msgstr "" - -#~ msgid "check for updates" -#~ msgstr "" - -#~ msgid "Meta-Tagging" -#~ msgstr "" - -#~ msgid "Default permissions" -#~ msgstr "" - -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "Push new repo" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "merge" -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - -#~ msgid "Comment from pull request" -#~ msgstr "" - -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - -#~ msgid "Mimetype" -#~ msgstr "" - #~ msgid "My Repos" #~ msgstr "Prázdný repozitář" - -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "%s Pull Request #%s" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - -#~ msgid "owner" -#~ msgstr "" - -#~ msgid "reviewer" -#~ msgstr "" - -#~ msgid "with subrepos" -#~ msgstr "" - -#~ msgid "Your password reset link was sent" -#~ msgstr "" - -#~ msgid "Your new password" -#~ msgstr "" - -#~ msgid "Your new Kallithea password:%s" -#~ msgstr "" - -#~ msgid "Open New Pull Request for Selected Changesets" -#~ msgstr "" - -#~ msgid "Show Selected Changesets __S → __E" -#~ msgstr "" - -#~ msgid "Show Selected Changeset __S" -#~ msgstr "" - -#~ msgid "We received a request to create a new password for your account." -#~ msgstr "" - -#~ msgid "You can generate it by clicking following URL" -#~ msgstr "" - -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - -#~ msgid "Created by" -#~ msgstr "" - -#~ msgid "You can only delete files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "You can only edit files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "Changeset not found" -#~ msgstr "" - -#~ msgid "Pull Requests from %s'" -#~ msgstr "" - diff --git a/kallithea/i18n/da/LC_MESSAGES/kallithea.po b/kallithea/i18n/da/LC_MESSAGES/kallithea.po new file mode 100644 --- /dev/null +++ b/kallithea/i18n/da/LC_MESSAGES/kallithea.po @@ -0,0 +1,5490 @@ +# Translations template for Kallithea. +# Copyright (C) 2017 Various authors, licensing as GPLv3 +# This file is distributed under the same license as the Kallithea project. +# FIRST AUTHOR , 2017. +# +msgid "" +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-03-14 01:03+0000\n" +"Last-Translator: Allan Nordhøy \n" +"Language-Team: Danish \n" +"Language: da\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" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +msgid "There are no changesets yet" +msgstr "Der er ingen changesets endnu" + +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/base/perms_summary.html:14 +msgid "None" +msgstr "Ingen" + +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +msgid "(closed)" +msgstr "(lukket)" + +#: kallithea/controllers/changeset.py:83 +msgid "Show whitespace" +msgstr "Vis mellemrum" + +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 +#: kallithea/templates/files/diff_2way.html:55 +msgid "Ignore whitespace" +msgstr "Ignorer mellemrum" + +#: kallithea/controllers/changeset.py:163 +#, python-format +msgid "Increase diff context to %(num)s lines" +msgstr "Øg diff konteksten med %(num)s linjer" + +#: kallithea/controllers/changeset.py:203 +#, fuzzy +#| msgid "No permission to change pull request status" +msgid "No permission to change status" +msgstr "Ingen tilladelse til ændring af status for pull-forespørgsel" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 +msgid "Such revision does not exist for this repository" +msgstr "En sådan revision findes ikke for dette repository" + +#: kallithea/controllers/compare.py:66 +#, python-format +msgid "Could not find other repository %s" +msgstr "Kunne ikke finde andet repository %s" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "Kan ikke sammenligne repositories af forskellige typer" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "Kan ikke vise en tom diff" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "Ingen forfader fundet for merge diff" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "Flere merge forfædre fundet for merge sammenligning" + +#: kallithea/controllers/compare.py:266 +msgid "Cannot compare repositories without using common ancestor" +msgstr "Kan ikke sammenligne repositories uden en fælles forfader" + +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "Intet svar" + +#: kallithea/controllers/error.py:71 +msgid "Unknown error" +msgstr "Ukendt fejl" + +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" +"Forespørgslen kunne ikke forstås af serveren på grund af fejlformet " +"syntaks." + +#: kallithea/controllers/error.py:87 +msgid "Unauthorized access to resource" +msgstr "Uautoriseret adgang til ressource" + +#: kallithea/controllers/error.py:89 +msgid "You don't have permission to view this page" +msgstr "Du har ikke tilladelse til at se denne side" + +#: kallithea/controllers/error.py:91 +msgid "The resource could not be found" +msgstr "Kunne ikke finde ressourcen" + +#: kallithea/controllers/error.py:93 +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." +msgstr "" +"Serveren stødte på en uventet tilstand, som forhindrede den i at opfylde " +"anmodningen." + +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "%s committed den %s" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "Changesettet var for stor og blev afskåret..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#, python-format +msgid "%s %s feed" +msgstr "Feed for %s %s" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" +msgstr "Ændringer på repository %s" + +#: kallithea/controllers/files.py:92 +msgid "Click here to add new file" +msgstr "Klik her for at tilføje en ny fil" + +#: kallithea/controllers/files.py:93 +#, python-format +msgid "There are no files yet. %s" +msgstr "Der er ingen filer endnu. %s" + +#: kallithea/controllers/files.py:194 +#, 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 +#, 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 +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 +#, python-format +msgid "Deleted file %s via Kallithea" +msgstr "Slettet fil %s via Kallithea" + +#: kallithea/controllers/files.py:345 +#, 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 +msgid "Error occurred during commit" +msgstr "Fejl opstået under commit" + +#: kallithea/controllers/files.py:372 +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 +#, python-format +msgid "Edited file %s via Kallithea" +msgstr "Redigeret fil %s via Kallithea" + +#: kallithea/controllers/files.py:402 +msgid "No changes" +msgstr "Ingen ændringer" + +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#, python-format +msgid "Successfully committed to %s" +msgstr "Successfuldt committed til %s" + +#: kallithea/controllers/files.py:438 +msgid "Added file via Kallithea" +msgstr "Tilføjet fil via Kallithea" + +#: kallithea/controllers/files.py:459 +msgid "No content" +msgstr "Intet indhold" + +#: kallithea/controllers/files.py:463 +msgid "No filename" +msgstr "Intet filnavn" + +#: kallithea/controllers/files.py:488 +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 +msgid "Downloads disabled" +msgstr "Downloads er deaktiveret" + +#: kallithea/controllers/files.py:531 +#, python-format +msgid "Unknown revision %s" +msgstr "Ukendt revision %s" + +#: kallithea/controllers/files.py:533 +msgid "Empty repository" +msgstr "Tomt repository" + +#: kallithea/controllers/files.py:535 +msgid "Unknown archive type" +msgstr "Ukendt arkivtype" + +#: kallithea/controllers/files.py:756 +#: kallithea/templates/changeset/changeset_range.html:9 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 +#, fuzzy +msgid "Changesets" +msgstr "Changesets" + +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 +#, fuzzy +msgid "Branches" +msgstr "Branches" + +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +msgid "Tags" +msgstr "Tags" + +#: kallithea/controllers/forks.py:174 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Der opstod en fejl under repository forking %s" + +#: kallithea/controllers/home.py:78 +msgid "Groups" +msgstr "Grupper" + +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repos/repo_add.html:12 +#: kallithea/templates/admin/repos/repo_add.html:16 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/users/user_edit_advanced.html:6 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +#, fuzzy +msgid "Repositories" +msgstr "Repositories" + +#: kallithea/controllers/home.py:121 +#: kallithea/templates/files/files_add.html:32 +#: kallithea/templates/files/files_delete.html:23 +#: kallithea/templates/files/files_edit.html:32 +#, fuzzy +msgid "Branch" +msgstr "Branch" + +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Lukkede Branches" + +#: kallithea/controllers/home.py:133 +msgid "Tag" +msgstr "Tag" + +#: kallithea/controllers/home.py:139 +msgid "Bookmark" +msgstr "Bogmærke" + +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/templates/journal/public_journal.html:4 +#: kallithea/templates/journal/public_journal.html:18 +msgid "Public Journal" +msgstr "Offentlig journal" + +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +msgid "Journal" +msgstr "Journal" + +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +msgid "Bad captcha" +msgstr "Dårlig captcha" + +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "Du har succesfuldt registreret med %s" + +#: kallithea/controllers/login.py:189 +msgid "A password reset confirmation code has been sent" +msgstr "En bekræftelseskode til ændring af adgangskode er sendt" + +#: kallithea/controllers/login.py:238 +msgid "Invalid password reset token" +msgstr "Ugyldig token for ændring af adgangskode" + +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 +msgid "Successfully updated password" +msgstr "Successfuld ændring af adgangskode" + +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "Ugyldig reviewer \"%s\" angivet" + +#: kallithea/controllers/pullrequests.py:133 +#, python-format +msgid "%s (closed)" +msgstr "%s (lukket)" + +#: kallithea/controllers/pullrequests.py:160 +#: kallithea/templates/changeset/changeset.html:12 +#, fuzzy +msgid "Changeset" +msgstr "Changeset" + +#: kallithea/controllers/pullrequests.py:181 +msgid "Special" +msgstr "Speciel" + +#: kallithea/controllers/pullrequests.py:182 +msgid "Peer branches" +msgstr "" + +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +msgid "Bookmarks" +msgstr "Bogmærker" + +#: kallithea/controllers/pullrequests.py:320 +#, python-format +msgid "Error creating pull request: %s" +msgstr "Fejl ved oprettelse af pull-forespørgsel: %s" + +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 +msgid "Error occurred while creating pull request" +msgstr "Der opstod en fejl under oprettelse af pull-forespørgsel" + +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "Åbnede ny pull-forespørgsel med success" + +#: kallithea/controllers/pullrequests.py:375 +msgid "New pull request iteration created" +msgstr "Ny pull-forespørgsel iteration oprettet" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "I mellemtiden er de følgende reviewers tilføjet: %s" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "I mellemtiden er de følgende reviewers fjernet: %s" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Ingen beskrivelse" + +#: kallithea/controllers/pullrequests.py:432 +msgid "Pull request updated" +msgstr "Pull-forespørgsel opdateret" + +#: kallithea/controllers/pullrequests.py:445 +msgid "Successfully deleted pull request" +msgstr "Slettede pull-forespørgsel med success" + +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "Revision %s er ikke fundet i %s" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" +"Fejl: Changesets ikke fundet, ved visning af pull-forespørgsel fra %s." + +#: kallithea/controllers/pullrequests.py:522 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "Denne pull-forespørgsel er allerede merged til %s." + +#: kallithea/controllers/pullrequests.py:524 +msgid "This pull request has been closed and can not be updated." +msgstr "Denne pull-forespørgsel er lukket og kan ikke opdateres." + +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "Følgende yderligere ændringer er tilgængelige på %s:" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" +"Ingen yderligere changesets fundet ved iteration på denne pull-" +"forespørgsel." + +#: kallithea/controllers/pullrequests.py:557 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "Bemærk: Branch %s har et andet head: %s." + +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "Git pull-forespørgsler supportere ej iteration endnu." + +#: kallithea/controllers/pullrequests.py:566 +#, python-format +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "" +"Fejl: Nogle changesets kunne ikke findes ved visning af pull-forespørgsel " +"fra %s." + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" +"Diff'en kunne ikke vises - pull-forespørgslens revisions kunne ikke " +"findes." + +#: kallithea/controllers/search.py:136 +msgid "Invalid search query. Try quoting it." +msgstr "Ugyldig søgning. Prøv at citere det." + +#: kallithea/controllers/search.py:140 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 +msgid "An error occurred during search operation." +msgstr "Der opstod en fejl under søgning." + +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 +msgid "No data ready yet" +msgstr "Ingen data er klar endnu" + +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 +msgid "Statistics are disabled for this repository" +msgstr "Statistik er slået fra for dette repository" + +#: kallithea/controllers/admin/auth_settings.py:135 +msgid "Auth settings updated successfully" +msgstr "Auth-indstillinger opdateret successfuldt" + +#: kallithea/controllers/admin/auth_settings.py:146 +msgid "error occurred during update of auth settings" +msgstr "Der opstod en fejl under opdatering af auth-indstillinger" + +#: kallithea/controllers/admin/defaults.py:75 +msgid "Default settings updated successfully" +msgstr "Standard-indstillinger opdateret successfuldt" + +#: kallithea/controllers/admin/defaults.py:90 +msgid "Error occurred during update of defaults" +msgstr "Der opstod en fejl under opdatering af standarder" + +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "For evigt" + +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 minutter" + +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "1 time" + +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "1 dag" + +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 +msgid "1 month" +msgstr "1 måned" + +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 +msgid "Lifetime" +msgstr "Levetid" + +#: kallithea/controllers/admin/gists.py:140 +msgid "Error occurred during gist creation" +msgstr "Der opstod en fejl under oprettelse af gist" + +#: kallithea/controllers/admin/gists.py:156 +#, python-format +msgid "Deleted gist %s" +msgstr "Slettet gist %s" + +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "Uændret" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "Opdateret gist-indhold successfuldt" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "Opdateret gist-data successfuldt" + +#: kallithea/controllers/admin/gists.py:233 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "Der opstod en fejl under opdatering af gist %s" + +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 +msgid "You can't edit this user since it's crucial for entire application" +msgstr "" +"Du kan ikke redigere denne bruger, da den er afgørende for hele " +"applikationen" + +#: kallithea/controllers/admin/my_account.py:117 +msgid "Your account was updated successfully" +msgstr "Din konto er blevet opdateret successfuldt" + +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "Der opstod en fejl under opdatering af bruger %s" + +#: kallithea/controllers/admin/my_account.py:166 +msgid "Error occurred during update of user password" +msgstr "Der opstod en fejl under opdatering af bruger adgangskode" + +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 +#, python-format +msgid "Added email %s to user" +msgstr "Tilføjet email %s til bruger" + +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 +msgid "An error occurred during email saving" +msgstr "Der opstod en fejl under tilføjelse af email" + +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 +msgid "Removed email from user" +msgstr "Fjernet email fra brugeren" + +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "API-nøgle oprettet successfuldt" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "API-nøgle nulstillet successfuldt" + +#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/users.py:285 +msgid "API key successfully deleted" +msgstr "API-nøgle slettet successfuldt" + +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "Read" +msgstr "Læs" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "Write" +msgstr "Skriv" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 +#: kallithea/templates/base/perms_summary.html:17 +msgid "Admin" +msgstr "Admin" + +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "Deaktiveret" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Tilladt med manuel kontoaktivering" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Tilladt med automatisk kontoaktivering" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "Manuel aktivering af ekstern konto" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "Automatisk aktivering af ekstern konto" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 +msgid "Enabled" +msgstr "Aktiveret" + +#: kallithea/controllers/admin/permissions.py:125 +msgid "Global permissions updated successfully" +msgstr "Globale tilladelser opdateret" + +#: kallithea/controllers/admin/permissions.py:140 +msgid "Error occurred during update of permissions" +msgstr "Der opstod en fejl under opdatering af tilladelser" + +#: kallithea/controllers/admin/repo_groups.py:174 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "Der opstod en fejl under oprettelse af repository-gruppen %s" + +#: kallithea/controllers/admin/repo_groups.py:179 +#, python-format +msgid "Created repository group %s" +msgstr "Oprettet repository-gruppen %s" + +#: kallithea/controllers/admin/repo_groups.py:226 +#, python-format +msgid "Updated repository group %s" +msgstr "Opdateret repository-gruppen %s" + +#: kallithea/controllers/admin/repo_groups.py:242 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "Der opstod en fejl under opdatering af repository-gruppen %s" + +#: kallithea/controllers/admin/repo_groups.py:252 +#, python-format +msgid "This group contains %s repositories and cannot be deleted" +msgstr "Denne gruppe indeholder %s repositories og kan ikke slettes" + +#: kallithea/controllers/admin/repo_groups.py:259 +#, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "Denne gruppe indeholder %s undergrupper og kan ikke slettes" + +#: kallithea/controllers/admin/repo_groups.py:265 +#, python-format +msgid "Removed repository group %s" +msgstr "Fjernet repository-gruppen %s" + +#: kallithea/controllers/admin/repo_groups.py:270 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "Der opstod en fejl under sletning af repository-gruppen %s" + +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 +msgid "Cannot revoke permission for yourself as admin" +msgstr "Kan ikke tilbagekalde tilladelse for én selv som admin" + +#: kallithea/controllers/admin/repo_groups.py:369 +msgid "Repository group permissions updated" +msgstr "Repository-gruppe tilladelser opdateret" + +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 +msgid "An error occurred during revoking of permission" +msgstr "Der opstod en fejl under tilbagekaldelse af tilladelse" + +#: kallithea/controllers/admin/repos.py:137 +#, python-format +msgid "Error creating repository %s" +msgstr "Fejl ved oprettelse af repository %s" + +#: kallithea/controllers/admin/repos.py:195 +#, python-format +msgid "Created repository %s from %s" +msgstr "Oprettet repository %s fra %s" + +#: kallithea/controllers/admin/repos.py:204 +#, python-format +msgid "Forked repository %s as %s" +msgstr "Forked repository %s som %s" + +#: kallithea/controllers/admin/repos.py:207 +#, python-format +msgid "Created repository %s" +msgstr "Oprettet repository %s" + +#: kallithea/controllers/admin/repos.py:236 +#, python-format +msgid "Repository %s updated successfully" +msgstr "Repository %s opdateret" + +#: kallithea/controllers/admin/repos.py:256 +#, python-format +msgid "Error occurred during update of repository %s" +msgstr "Der opstod en fejl under opdatering af repository %s" + +#: kallithea/controllers/admin/repos.py:274 +#, python-format +msgid "Detached %s forks" +msgstr "Fraskilt %s forks" + +#: kallithea/controllers/admin/repos.py:277 +#, python-format +msgid "Deleted %s forks" +msgstr "Slettet %s forks" + +#: kallithea/controllers/admin/repos.py:282 +#, python-format +msgid "Deleted repository %s" +msgstr "Slettet repository %s" + +#: kallithea/controllers/admin/repos.py:285 +#, python-format +msgid "Cannot delete repository %s which still has forks" +msgstr "Kan ikke slette repository %s, da den stadig har forks" + +#: kallithea/controllers/admin/repos.py:290 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "Der opstod en fejl under sletning af %s" + +#: kallithea/controllers/admin/repos.py:330 +msgid "Repository permissions updated" +msgstr "Repository tilladelser opdateret" + +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "Feltvaliderings fejl: %s" + +#: kallithea/controllers/admin/repos.py:390 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "Der opstod en fejl under oprettelse af felt: %r" + +#: kallithea/controllers/admin/repos.py:401 +msgid "An error occurred during removal of field" +msgstr "Der opstod en fejl under fjernelse af feltet" + +#: kallithea/controllers/admin/repos.py:415 +msgid "-- Not a fork --" +msgstr "-- Ikke en fork --" + +#: kallithea/controllers/admin/repos.py:446 +msgid "Updated repository visibility in public journal" +msgstr "Opdateret repository's synlighed i den offentlige journal" + +#: kallithea/controllers/admin/repos.py:450 +msgid "An error occurred during setting this repository in public journal" +msgstr "" +"Der opstod en fejl under indstilling af dette repository, i den " +"offentlige journal" + +#: kallithea/controllers/admin/repos.py:466 +msgid "Nothing" +msgstr "Intet" + +#: kallithea/controllers/admin/repos.py:468 +#, python-format +msgid "Marked repository %s as fork of %s" +msgstr "Mærket repository %s som fork af %s" + +#: kallithea/controllers/admin/repos.py:475 +msgid "An error occurred during this operation" +msgstr "Der opstod en fejl under denne operation" + +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 +msgid "Repository has been locked" +msgstr "Repository er blevet låst" + +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 +msgid "Repository has been unlocked" +msgstr "Repository er blevet låst op" + +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 +msgid "An error occurred during unlocking" +msgstr "Der opstod en fejl ved oplåsning" + +#: kallithea/controllers/admin/repos.py:528 +msgid "Cache invalidation successful" +msgstr "Ugyldiggørelse af cache er succesfuld" + +#: kallithea/controllers/admin/repos.py:532 +msgid "An error occurred during cache invalidation" +msgstr "Der opstod en fejl under cache ugyldiggørelse" + +#: kallithea/controllers/admin/repos.py:545 +#, fuzzy +msgid "Pulled from remote location" +msgstr "Pulled fra remote placering" + +#: kallithea/controllers/admin/repos.py:548 +msgid "An error occurred during pull from remote location" +msgstr "Der opstod en fejl under pull fra remote placering" + +#: kallithea/controllers/admin/repos.py:579 +msgid "An error occurred during deletion of repository stats" +msgstr "Der opstod en fejl under sletning af repository statistik" + +#: kallithea/controllers/admin/settings.py:135 +msgid "Updated VCS settings" +msgstr "Opdateret VCS-indstillinger" + +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" +"Ude af stand til at aktivere hgsubversion understøttelse. \"hgsubversion" +"\" biblioteket mangler" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" +msgstr "Der opstod en fejl ved opdatering af applikationsindstillinger" + +#: kallithea/controllers/admin/settings.py:174 +#, 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 +#, python-format +msgid "Invalidated %s repositories" +msgstr "Ugyldiggjort %s repositories" + +#: kallithea/controllers/admin/settings.py:230 +msgid "Updated application settings" +msgstr "Opdateret applikationsindstillinger" + +#: kallithea/controllers/admin/settings.py:283 +msgid "Updated visualisation settings" +msgstr "Opdateret visualiseringsindstillinger" + +#: kallithea/controllers/admin/settings.py:288 +msgid "Error occurred during updating visualisation settings" +msgstr "Der opstod en fejl under opdatering af visualiseringsindstillinger" + +#: kallithea/controllers/admin/settings.py:312 +msgid "Please enter email address" +msgstr "Indtast email-adresse" + +#: kallithea/controllers/admin/settings.py:327 +msgid "Send email task created" +msgstr "Send email-opgave oprettet" + +#: kallithea/controllers/admin/settings.py:355 +#, fuzzy +#| msgid "No data ready yet" +msgid "Hook already exists" +msgstr "Ingen data er klar endnu" + +#: 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 "Added new hook" +msgstr "Tilføjet nyt hook" + +#: kallithea/controllers/admin/settings.py:376 +msgid "Updated hooks" +msgstr "Opdateret hooks" + +#: kallithea/controllers/admin/settings.py:380 +msgid "Error occurred during hook creation" +msgstr "Der opstod en fejl under oprettelse af et hook" + +#: kallithea/controllers/admin/settings.py:404 +msgid "Whoosh reindex task scheduled" +msgstr "Whoosh reindex-opgave skeduleret" + +#: kallithea/controllers/admin/user_groups.py:143 +#, python-format +msgid "Created user group %s" +msgstr "Oprettet brugergruppe %s" + +#: kallithea/controllers/admin/user_groups.py:156 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "Der opstod en fejl under oprettelse af brugergruppe %s" + +#: kallithea/controllers/admin/user_groups.py:184 +#, python-format +msgid "Updated user group %s" +msgstr "Opdateret brugergruppe %s" + +#: kallithea/controllers/admin/user_groups.py:206 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "Der opstod en fejl under opdatering af brugergruppe %s" + +#: kallithea/controllers/admin/user_groups.py:217 +msgid "Successfully deleted user group" +msgstr "Brugergruppe slettet succesfuldt" + +#: kallithea/controllers/admin/user_groups.py:222 +msgid "An error occurred during deletion of user group" +msgstr "Der opstod en fejl under sletning af brugergruppe" + +#: kallithea/controllers/admin/user_groups.py:278 +msgid "Target group cannot be the same" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:284 +msgid "User group permissions updated" +msgstr "Brugergrupper-tilladelser opdateret" + +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 +msgid "Updated permissions" +msgstr "Tilladelser opdateret" + +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 +msgid "An error occurred during permissions saving" +msgstr "Der opstod en fejl under gemning af tilladelser" + +#: kallithea/controllers/admin/users.py:123 +#, python-format +msgid "Created user %s" +msgstr "Bruger %s oprettet" + +#: kallithea/controllers/admin/users.py:138 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "Der opstod en fejl under oprettelse af bruger %s" + +#: kallithea/controllers/admin/users.py:162 +msgid "User updated successfully" +msgstr "Bruger opdateret" + +#: kallithea/controllers/admin/users.py:190 +msgid "Successfully deleted user" +msgstr "Slettet bruger" + +#: kallithea/controllers/admin/users.py:195 +msgid "An error occurred during deletion of user" +msgstr "Der opstod en fejl under sletning af bruger %s" + +#: kallithea/controllers/admin/users.py:203 +msgid "The default user cannot be edited" +msgstr "Standardbrugeren kan ikke redigeres" + +#: kallithea/controllers/admin/users.py:412 +#, python-format +msgid "Added IP address %s to user whitelist" +msgstr "Tilføjet IP-adresse %s til bruger-whitelist" + +#: kallithea/controllers/admin/users.py:418 +msgid "An error occurred while adding IP address" +msgstr "Der opstod en fejl under tilføjelse af IP-adresse" + +#: kallithea/controllers/admin/users.py:430 +msgid "Removed IP address from user whitelist" +msgstr "Fjernet IP-adresse fra bruger-whitelist" + +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "Du skal være registreret bruger for at kunne udføre denne handling" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "Du skal være logget ind for at se denne side" + +#: kallithea/lib/base.py:444 +msgid "Invalid API key" +msgstr "Ugyldig API-nøgle" + +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "CSRF-token lækage opdaget, alle form-tokens er invalideret" + +#: kallithea/lib/base.py:583 +msgid "Repository not found in the filesystem" +msgstr "Repository ikke fundet i filsystemet" + +#: kallithea/lib/base.py:608 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "Changeset for %s %s ikke fundet i %s" + +#: kallithea/lib/diffs.py:193 +msgid "Binary file" +msgstr "Binær fil" + +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" +"Changeset var for stor, og blev afskåret, brug diff menu for at få vist " +"denne diff" + +#: kallithea/lib/diffs.py:223 +msgid "No changes detected" +msgstr "Ingen ændringer fundet" + +#: kallithea/lib/helpers.py:612 +#, python-format +msgid "Deleted branch: %s" +msgstr "Slettet branch: %s" + +#: kallithea/lib/helpers.py:614 +#, python-format +msgid "Created tag: %s" +msgstr "Oprettet tag: %s" + +#: kallithea/lib/helpers.py:625 +#, python-format +msgid "Changeset %s not found" +msgstr "Changeset %s ikke fundet" + +#: kallithea/lib/helpers.py:674 +#, python-format +msgid "Show all combined changesets %s->%s" +msgstr "Vis alle kombineret changesets %s->%s" + +#: kallithea/lib/helpers.py:680 +msgid "Compare view" +msgstr "Sammenlign visning" + +#: kallithea/lib/helpers.py:699 +msgid "and" +msgstr "og" + +#: kallithea/lib/helpers.py:700 +#, python-format +msgid "%s more" +msgstr "%s flere" + +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 +msgid "revisions" +msgstr "revisioner" + +#: kallithea/lib/helpers.py:725 +#, python-format +msgid "Fork name %s" +msgstr "Fork-navn %s" + +#: kallithea/lib/helpers.py:746 +#, python-format +msgid "Pull request %s" +msgstr "Pull-forespørgsel %s" + +#: kallithea/lib/helpers.py:756 +msgid "[deleted] repository" +msgstr "[slettet] repository" + +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +msgid "[created] repository" +msgstr "[oprettet] repository" + +#: kallithea/lib/helpers.py:760 +msgid "[created] repository as fork" +msgstr "[oprettet] repository som fork" + +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +msgid "[forked] repository" +msgstr "[forked] repository" + +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +msgid "[updated] repository" +msgstr "[opdateret] repository" + +#: kallithea/lib/helpers.py:766 +msgid "[downloaded] archive from repository" +msgstr "[hentet] arkiv fra repository" + +#: kallithea/lib/helpers.py:768 +msgid "[delete] repository" +msgstr "[slettet] repository" + +#: kallithea/lib/helpers.py:776 +msgid "[created] user" +msgstr "[oprettet] bruger" + +#: kallithea/lib/helpers.py:778 +msgid "[updated] user" +msgstr "[opdateret] bruger" + +#: kallithea/lib/helpers.py:780 +msgid "[created] user group" +msgstr "[oprettet] brugergruppe" + +#: kallithea/lib/helpers.py:782 +msgid "[updated] user group" +msgstr "[opdateret] brugergruppe" + +#: kallithea/lib/helpers.py:784 +msgid "[commented] on revision in repository" +msgstr "[kommenterede] på revision i repository" + +#: kallithea/lib/helpers.py:786 +msgid "[commented] on pull request for" +msgstr "[kommenterede] på pull-forespørgsel for" + +#: kallithea/lib/helpers.py:788 +msgid "[closed] pull request for" +msgstr "[lukket] pull-forespørgsel for" + +#: kallithea/lib/helpers.py:790 +msgid "[pushed] into" +msgstr "[pushed] ind i" + +#: kallithea/lib/helpers.py:792 +msgid "[committed via Kallithea] into repository" +msgstr "[committed via kallithea] ind i repository" + +#: kallithea/lib/helpers.py:794 +msgid "[pulled from remote] into repository" +msgstr "[pulled fra remote] ind i repository" + +#: kallithea/lib/helpers.py:796 +msgid "[pulled] from" +msgstr "[pulled] fra" + +#: kallithea/lib/helpers.py:798 +msgid "[started following] repository" +msgstr "[begyndt at følge] repository" + +#: kallithea/lib/helpers.py:800 +msgid "[stopped following] repository" +msgstr "[stoppet at følge] repository" + +#: kallithea/lib/helpers.py:928 +#, python-format +msgid " and %s more" +msgstr " og %s flere" + +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 +msgid "No files" +msgstr "Ingen filer" + +#: kallithea/lib/helpers.py:957 +msgid "new file" +msgstr "ny fil" + +#: kallithea/lib/helpers.py:960 +msgid "mod" +msgstr "mod" + +#: kallithea/lib/helpers.py:963 +msgid "del" +msgstr "del" + +#: kallithea/lib/helpers.py:966 +msgid "rename" +msgstr "omdøb" + +#: kallithea/lib/helpers.py:971 +msgid "chmod" +msgstr "chmod" + +#: kallithea/lib/helpers.py:1264 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" +"%s repository er ikke knyttet til db, måske var det skabt eller omdøbt " +"fra filsystemet, kør applikationen igen for at scanne repositories" + +#: kallithea/lib/utils2.py:333 +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:334 +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:335 +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:336 +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:337 +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:338 +#, python-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:354 +#, python-format +msgid "in %s" +msgstr "i %s" + +#: kallithea/lib/utils2.py:356 +#, python-format +msgid "%s ago" +msgstr "%s siden" + +#: kallithea/lib/utils2.py:358 +#, python-format +msgid "in %s and %s" +msgstr "i %s og %s" + +#: kallithea/lib/utils2.py:361 +#, python-format +msgid "%s and %s ago" +msgstr "%s og %s siden" + +#: kallithea/lib/utils2.py:364 +msgid "just now" +msgstr "lige nu" + +#: kallithea/model/comment.py:68 +#, python-format +msgid "on line %s" +msgstr "på linje %s" + +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +msgid "[Mention]" +msgstr "[Omtale]" + +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "top-niveau" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "Kallithea Administrator" + +#: kallithea/model/db.py:1705 +msgid "Default user has no access to new repositories" +msgstr "Standard-bruger har ikke adgang til nye repositories" + +#: kallithea/model/db.py:1706 +msgid "Default user has read access to new repositories" +msgstr "Standard-bruger har læse-adgang til nye repositories" + +#: kallithea/model/db.py:1707 +msgid "Default user has write access to new repositories" +msgstr "Standard-bruger har skrive-adgang til nye repositories" + +#: kallithea/model/db.py:1708 +msgid "Default user has admin access to new repositories" +msgstr "Standard-bruger har admin-adgang til nye repositories" + +#: kallithea/model/db.py:1710 +msgid "Default user has no access to new repository groups" +msgstr "Standard-bruger har ikke adgang til nye repository-grupper" + +#: kallithea/model/db.py:1711 +msgid "Default user has read access to new repository groups" +msgstr "Standard-bruger har læse-adgang til nye repository-grupper" + +#: kallithea/model/db.py:1712 +msgid "Default user has write access to new repository groups" +msgstr "Standard-bruger har skrive-adgang til nye repository-grupper" + +#: kallithea/model/db.py:1713 +msgid "Default user has admin access to new repository groups" +msgstr "Standard-bruger har admin-adgang til nye repository-grupper" + +#: kallithea/model/db.py:1715 +msgid "Default user has no access to new user groups" +msgstr "Standard-bruger har ikke adgang til nye brugergrupper" + +#: kallithea/model/db.py:1716 +msgid "Default user has read access to new user groups" +msgstr "Standard-bruger har læse-adgang til nye brugergrupper" + +#: kallithea/model/db.py:1717 +msgid "Default user has write access to new user groups" +msgstr "Standard-bruger har skrive-adgang til nye brugergrupper" + +#: kallithea/model/db.py:1718 +msgid "Default user has admin access to new user groups" +msgstr "Standard-bruger har admin-adgang til nye brugergrupper" + +#: kallithea/model/db.py:1720 +msgid "Only admins can create repository groups" +msgstr "Kun administratorer kan oprette repository-grupper" + +#: kallithea/model/db.py:1721 +msgid "Non-admins can create repository groups" +msgstr "Ikke-administratorer kan oprette repository-grupper" + +#: kallithea/model/db.py:1723 +msgid "Only admins can create user groups" +msgstr "Kun administratorer kan oprette brugergrupper" + +#: kallithea/model/db.py:1724 +msgid "Non-admins can create user groups" +msgstr "Ikke-administratorer kan oprette brugergrupper" + +#: kallithea/model/db.py:1726 +msgid "Only admins can create top level repositories" +msgstr "Kun administratorer kan oprette top-niveau repositories" + +#: kallithea/model/db.py:1727 +msgid "Non-admins can create top level repositories" +msgstr "Ikke-administratorer kan oprette top-niveau repositories" + +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" +"Repository oprettelse aktiveret med skriveadgang til en repository-gruppe" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" +"Repository oprettelse deaktiveret med skriveadgang til en repository-" +"gruppe" + +#: kallithea/model/db.py:1732 +msgid "Only admins can fork repositories" +msgstr "Kun admins kan fork repositories" + +#: kallithea/model/db.py:1733 +msgid "Non-admins can fork repositories" +msgstr "Ikke-administratorer kan forke repositories" + +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "Registrering deaktiveret" + +#: kallithea/model/db.py:1736 +msgid "User registration with manual account activation" +msgstr "Brugerregistrering med manuel kontoaktivering" + +#: kallithea/model/db.py:1737 +msgid "User registration with automatic account activation" +msgstr "Brugerregistrering med automatisk kontoaktivering" + +#: kallithea/model/db.py:2263 +msgid "Not reviewed" +msgstr "Ikke gennemgået" + +#: kallithea/model/db.py:2264 +msgid "Under review" +msgstr "Under gennemgang" + +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "Ikke godkendt" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "Godkendt" + +#: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "Indtast venligst et login" + +#: kallithea/model/forms.py:59 +#, python-format +msgid "Enter a value %(min)i characters long or more" +msgstr "Indtast en værdi med mindst %(min)i tegn" + +#: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "Skriv venligst et kodeord" + +#: kallithea/model/forms.py:68 +#, python-format +msgid "Enter %(min)i characters or more" +msgstr "Indtast %(min)i tegn eller flere" + +#: kallithea/model/forms.py:170 +msgid "Name must not contain only digits" +msgstr "Navn må ikke kun indeholde cifre" + +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" +"[Kommentar] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" på " +"%(branch)s" + +#: kallithea/model/notification.py:168 +#, python-format +msgid "New user %(new_username)s registered" +msgstr "Ny bruger %(new_username)s registreret" + +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" +"[Gennemgang] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" fra " +"%(pr_source_branch)s af %(pr_owner_username)s" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" +"[Kommentar] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" fra " +"%(pr_source_branch)s af %(pr_owner_username)s" + +#: kallithea/model/notification.py:184 +msgid "Closing" +msgstr "Lukning" + +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" +"%(user)s vil have dig til at gennemgå pull-forespørgsel %(pr_nice_id)s: " +"%(pr_title)s" + +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "Kan ikke oprette en tom pull-forespørgsel" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 +msgid "latest tip" +msgstr "" + +#: kallithea/model/user.py:189 +msgid "New user registration" +msgstr "" + +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" + +#: kallithea/model/user.py:258 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:263 +#, python-format +msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 +#, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:364 +msgid "Password reset link" +msgstr "" + +#: kallithea/model/user.py:413 +msgid "Password reset notification" +msgstr "" + +#: kallithea/model/user.py:414 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" + +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 +msgid "Value cannot be an empty list" +msgstr "" + +#: kallithea/model/validators.py:74 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:76 +#, python-format +msgid "Username \"%(username)s\" cannot be used" +msgstr "" + +#: kallithea/model/validators.py:78 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 +msgid "The input is not valid" +msgstr "" + +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:133 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:134 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:136 +msgid "" +"user group name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "" + +#: kallithea/model/validators.py:176 +msgid "Cannot assign this group as parent" +msgstr "" + +#: kallithea/model/validators.py:177 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:179 +#, python-format +msgid "Repository with name \"%(group_name)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:235 +msgid "Invalid characters (non-ascii) in password" +msgstr "" + +#: kallithea/model/validators.py:250 +msgid "Invalid old password" +msgstr "" + +#: kallithea/model/validators.py:266 +msgid "Passwords do not match" +msgstr "" + +#: kallithea/model/validators.py:281 +msgid "Invalid username or password" +msgstr "" + +#: kallithea/model/validators.py:312 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:330 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + +#: kallithea/model/validators.py:331 +#, python-format +msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" +msgstr "" + +#: kallithea/model/validators.py:333 +#, python-format +msgid "Repository group with name \"%(repo)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:419 +msgid "Invalid repository URL" +msgstr "" + +#: kallithea/model/validators.py:420 +msgid "" +"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " +"svn+https URL" +msgstr "" + +#: kallithea/model/validators.py:445 +msgid "Fork has to be the same type as parent" +msgstr "" + +#: kallithea/model/validators.py:460 +msgid "You don't have permissions to create repository in this group" +msgstr "" + +#: kallithea/model/validators.py:462 +msgid "no permission to create repository in root location" +msgstr "" + +#: kallithea/model/validators.py:512 +msgid "You don't have permissions to create a group in this location" +msgstr "" + +#: kallithea/model/validators.py:552 +msgid "This username or user group name is not valid" +msgstr "" + +#: kallithea/model/validators.py:645 +msgid "This is not a valid path" +msgstr "" + +#: kallithea/model/validators.py:662 +msgid "This email address is already in use" +msgstr "" + +#: kallithea/model/validators.py:682 +#, python-format +msgid "Email address \"%(email)s\" not found" +msgstr "" + +#: kallithea/model/validators.py:719 +msgid "" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" + +#: kallithea/model/validators.py:731 +msgid "Please enter a valid IPv4 or IPv6 address" +msgstr "" + +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: kallithea/model/validators.py:779 +msgid "Filename cannot be inside a directory" +msgstr "" + +#: kallithea/model/validators.py:795 +#, python-format +msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" +msgstr "" + +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 +msgid "About" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 +msgid "Add Repository" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 +msgid "You have admin right to this group, and can edit it" +msgstr "" + +#: kallithea/templates/index_base.html:37 +msgid "Edit Repository Group" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 +msgid "Description" +msgstr "" + +#: kallithea/templates/index_base.html:60 +msgid "Last Change" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 +msgid "Tip" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 +msgid "Owner" +msgstr "" + +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 +msgid "Log In" +msgstr "" + +#: kallithea/templates/login.html:17 +#, python-format +msgid "Log In to %s" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:5 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 +msgid "Username" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 +msgid "Password" +msgstr "" + +#: kallithea/templates/login.html:44 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 +msgid "Forgot your password ?" +msgstr "" + +#: kallithea/templates/login.html:55 +msgid "Don't have an account ?" +msgstr "" + +#: kallithea/templates/login.html:62 +msgid "Sign In" +msgstr "" + +#: kallithea/templates/password_reset.html:5 +msgid "Password Reset" +msgstr "" + +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 +#, python-format +msgid "Reset Your Password to %s" +msgstr "" + +#: kallithea/templates/password_reset.html:23 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:18 +msgid "Reset Your Password" +msgstr "" + +#: kallithea/templates/password_reset.html:30 +msgid "Email Address" +msgstr "" + +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 +msgid "Captcha" +msgstr "" + +#: kallithea/templates/password_reset.html:47 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 +msgid "" +"A password reset link will be sent to the specified email address if it " +"is registered in the system." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:23 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:24 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:29 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:36 +msgid "New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:43 +msgid "Confirm New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:51 +msgid "Confirm" +msgstr "" + +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 +msgid "Sign Up" +msgstr "" + +#: kallithea/templates/register.html:22 +#, python-format +msgid "Sign Up to %s" +msgstr "" + +#: kallithea/templates/register.html:45 +msgid "Re-enter password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 +msgid "First Name" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 +msgid "Last Name" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:39 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 +msgid "Email" +msgstr "" + +#: kallithea/templates/register.html:85 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:87 +msgid "Please wait for an administrator to activate your account." +msgstr "" + +#: kallithea/templates/admin/admin.html:5 +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:55 +msgid "Admin Journal" +msgstr "" + +#: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +msgid "journal filter..." +msgstr "" + +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:12 +msgid "Filter" +msgstr "" + +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/journal/journal.html:13 +#, python-format +msgid "%s Entry" +msgid_plural "%s Entries" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/admin/admin_log.html:6 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +msgid "Action" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:8 +msgid "Date" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:9 +msgid "From IP" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:61 +msgid "No actions yet" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:5 +msgid "Authentication Settings" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:61 +msgid "Authentication" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:27 +msgid "Authentication Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:29 +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:32 +msgid "" +"Comma-separated list of plugins; Kallithea will try user authentication " +"in plugin order" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:36 +msgid "Available built-in plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:53 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +msgid "Save" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:5 +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:62 +msgid "Repository Defaults" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +msgid "Type" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +msgid "Enable downloads" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:5 +#: kallithea/templates/admin/gists/edit.html:18 +msgid "Edit Gist" +msgstr "" + +#: 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." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +msgid "Gist description ..." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +msgid "Gist lifetime" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +msgid "Expires" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +msgid "Never" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:145 +msgid "Update Gist" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 +msgid "Cancel" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:6 +#: kallithea/templates/admin/gists/index.html:16 +#, python-format +msgid "Private Gists for User %s" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:8 +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:10 +#: kallithea/templates/admin/gists/index.html:20 +msgid "Public Gists" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:312 +msgid "Create New Gist" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 +msgid "Created" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:66 +msgid "There are no gists yet" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:5 +#: kallithea/templates/admin/gists/new.html:18 +msgid "New Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +msgid "Create Private Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:54 +msgid "Create Public Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +msgid "Reset" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:5 +#: kallithea/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:10 +msgid "URL" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:37 +msgid "Private Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:30 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/pullrequests/pullrequest_data.html:20 +msgid "Delete" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:54 +msgid "Confirm to delete this Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +msgid "Show as Raw" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:69 +msgid "created" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:82 +msgid "Show as raw" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:5 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:397 +msgid "My Account" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:25 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:26 +msgid "Email Addresses" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:28 +#: kallithea/templates/admin/users/user_edit.html:31 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:29 +msgid "Owned Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +msgid "Watched Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/permissions/permissions.html:30 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "Show Permissions" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +msgid "Built-in" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#, python-format +msgid "Confirm to reset this API key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +msgid "Expired" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#, python-format +msgid "Confirm to remove this API key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +msgid "Remove" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +msgid "No additional API keys specified" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +msgid "New API key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +msgid "Add" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +msgid "Primary" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#, python-format +msgid "Confirm to delete this email: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +msgid "No additional emails specified." +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +msgid "New email address" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:1 +msgid "Change Your Account Password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:8 +msgid "Current password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +msgid "New password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:22 +msgid "Confirm new password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +msgid "Avatars are disabled" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_repos.html:1 +msgid "Repositories You Own" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_watched.html:1 +msgid "Repositories You are Watching" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:5 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/base/base.html:60 +msgid "Default Permissions" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 +msgid "Global" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +msgid "Anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 +#, python-format +msgid "" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +msgid "" +"All default permissions on each repository will be reset to chosen " +"permission, note that all custom default permission on repositories will " +"be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:20 +msgid "Apply to all existing repositories" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +msgid "" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:33 +msgid "Apply to all existing repository groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +msgid "Permissions for the Default user on new repository groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 +msgid "User group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +msgid "" +"All default permissions on each user group will be reset to chosen " +"permission, note that all custom default permission on user groups will " +"be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:46 +msgid "Apply to all existing user groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:53 +msgid "Top level repository creation" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:61 +msgid "Repository creation with group write access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:64 +msgid "" +"With this, write permission to a repository group allows creating " +"repositories inside that group. Without this, group write permissions " +"mean nothing." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:68 +msgid "User group creation" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:71 +msgid "Enable this to allow non-admins to create user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:75 +msgid "Repository forking" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:78 +msgid "Enable this to allow non-admins to fork repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 +msgid "Registration" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:88 +msgid "External auth account activation" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#, python-format +msgid "Confirm to delete this IP address: %s" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +msgid "All IP addresses are allowed." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +msgid "New IP address" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +msgid "Group name" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +msgid "Group parent" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +msgid "Copy parent group permissions" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +msgid "Copy permission set from parent repository group." +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 +#, python-format +msgid "%s Repository Group Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 +msgid "Add Child Group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:25 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 +msgid "Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:33 +msgid "Advanced" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 +msgid "Permissions" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:1 +#, python-format +msgid "Repository Group: %s" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:6 +msgid "Top level repositories" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:7 +msgid "Total repositories" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:8 +msgid "Children groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 +#: kallithea/templates/admin/users/user_edit_advanced.html:8 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 +msgid "Created on" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 +#: kallithea/templates/data_table/_dt_elements.html:121 +#, python-format +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:25 +msgid "Delete this repository group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +msgid "Add repos" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +msgid "User/User Group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +msgid "Default" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +msgid "Revoke" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +msgid "Add new" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +msgid "Apply to children" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 +msgid "Both" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +msgid "" +"Set or revoke permission to all children of that group, including non-" +"private repositories and other groups if selected." +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +msgid "Confirm to delete this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_show.html:4 +#, python-format +msgid "Repository group %s" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:5 +msgid "Repository Groups Administration" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +msgid "Number of Top-level Repositories" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:12 +msgid "Clone remote repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:16 +msgid "" +"Optional: URL of a remote repository. If set, the repository will be " +"created as a clone from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +msgid "Optionally select a group to put this repository into." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:45 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +msgid "Landing revision" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:52 +msgid "" +"Default revision for files page, downloads, full text search index and " +"readme generation" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:9 +#, python-format +msgid "%s Creating Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:13 +msgid "Creating repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:27 +#, python-format +msgid "" +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:39 +msgid "" +"We're sorry but error occurred during this operation. Please check your " +"Kallithea server logs, or contact administrator." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:8 +#, python-format +msgid "%s Repository Settings" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:34 +msgid "Extra Fields" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:37 +msgid "Caches" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:40 +msgid "Remote" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 +msgid "Statistics" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +msgid "Parent" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 +msgid "Set" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +msgid "Manually set this repository as a fork of another from the list." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +msgid "Public Journal Visibility" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +msgid "Remove from public journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +msgid "Add to Public Journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +msgid "" +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +msgid "Change Locking" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +msgid "Lock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +msgid "Repository is not locked" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +msgid "" +"Force locking on the repository. Works only when anonymous access is " +"disabled. Triggering a pull locks the repository. The user who is " +"pulling locks the repository; only the user who pulled and locked it can " +"unlock it by doing a push." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +msgid "Delete this Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +msgid "Detach forks" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +msgid "Delete forks" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +msgid "" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:4 +msgid "Invalidate Repository Cache" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 +msgid "" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +msgid "Prefix" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +msgid "Key" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +msgid "Active" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +msgid "Label" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 +#, python-format +msgid "Confirm to delete this field: %s" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 +msgid "New field key" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 +msgid "New field label" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 +msgid "Enter short label" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 +msgid "New field description" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 +msgid "Enter description of a field" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 +msgid "Extra fields are disabled." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 +msgid "Private Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +msgid "Fork of repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 +msgid "Remote repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 +msgid "Pull Changes from Remote Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 +msgid "This repository does not have a remote repository URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +msgid "Permanent Repository ID" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +msgid "What is that?" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 +msgid "URL by id" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "" +"In case this repository is renamed or moved into another group the " +"repository URL changes.\n" +" Using the above permanent URL guarantees " +"that this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any " +"other cases that you need to hardcode the URL into a 3rd party service." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +msgid "Remote repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "" +"Optional: URL of a remote repository. If set, the repository can be " +"pulled from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 +msgid "Default revision for files page, downloads, whoosh and readme" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +msgid "Change owner of this repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +msgid "Processed progress" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:10 +msgid "Reset Statistics" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:10 +msgid "Confirm to remove current statistics." +msgstr "" + +#: kallithea/templates/admin/repos/repos.html:5 +msgid "Repositories Administration" +msgstr "" + +#: kallithea/templates/admin/repos/repos.html:43 +msgid "State" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:5 +msgid "Settings Administration" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:27 +msgid "VCS" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 +msgid "Visual" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +msgid "Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 +msgid "System Info" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:4 +msgid "Send test email to" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:12 +msgid "Send" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:4 +msgid "Site branding" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:12 +msgid "HTTP authentication realm" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +msgid "" +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +msgid "ReCaptcha public key" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:35 +msgid "Public key for reCaptcha system." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:40 +msgid "ReCaptcha private key" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:43 +msgid "" +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +msgid "Save Settings" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:3 +msgid "Built-in Mercurial Hooks (Read-Only)" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 +msgid "" +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:60 +msgid "Failed to remove hook" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +msgid "Delete records of missing repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:12 +msgid "" +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:17 +msgid "Invalidate cache for all repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:20 +msgid "Check this to reload data and clear cache keys for all repositories." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:25 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 +msgid "Overwrite existing Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 +msgid "Rescan Repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:4 +msgid "Index build option" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:12 +msgid "" +"This option completely reindexeses all of the repositories for proper " +"fulltext search capabilities." +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:18 +msgid "Reindex" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +msgid "Check for updates" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:8 +msgid "Kallithea configuration file" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:9 +msgid "Python version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +msgid "Note: please make sure this server can access this URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:23 +msgid "Python Packages" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:9 +msgid "Show repository size after push" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:15 +msgid "Log user push commands" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:21 +msgid "Log user pull commands" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:27 +msgid "Update repository after push (hg update)" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:33 +msgid "Mercurial extensions" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:38 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +msgid "Enable hgsubversion extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:47 +msgid "" +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:59 +msgid "Location of repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:64 +msgid "" +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 +msgid "" +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:4 +msgid "General" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:9 +msgid "Use repository extra fields" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:12 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:17 +msgid "Show Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:20 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +msgid "" +"Gravatar URL allows you to use another avatar server application.\n" +" The following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " +"variables are available:\n" +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +msgid "Repository page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +msgid "" +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 +msgid "" +"Number of items displayed in the admin pages grids before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:70 +msgid "Icons" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:75 +msgid "Show public repository icon on repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:84 +msgid "Show public/private icons next to repository names." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:89 +msgid "Meta Tagging" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:94 +msgid "" +"Parses meta tags from the repository description field and turns them " +"into colored tags." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:5 +msgid "Add user group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +msgid "Add User Group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 +msgid "Short, optional description for this user group." +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#, python-format +msgid "%s user group settings" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 +msgid "Show Members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:1 +#, python-format +msgid "User Group: %s" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +msgid "Members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 +#: kallithea/templates/data_table/_dt_elements.html:102 +#, python-format +msgid "Confirm to delete this user group: %s" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:21 +msgid "Delete this user group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 +msgid "No members yet" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 +msgid "Chosen group members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 +msgid "Available members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_groups.html:5 +msgid "User Groups Administration" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:5 +msgid "Add user" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +msgid "Users" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:23 +msgid "Add User" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:41 +msgid "Password confirmation" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:5 +#, python-format +msgid "%s user settings" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "Emails" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:1 +#, python-format +msgid "User: %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:7 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +msgid "Source of Record" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:41 +msgid "Last Login" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:10 +msgid "Member of User Groups" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:21 +#: kallithea/templates/data_table/_dt_elements.html:90 +#, python-format +msgid "Confirm to delete this user: %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:23 +msgid "Delete this user" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#, python-format +msgid "Inherited from %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:39 +msgid "Name in Source of Record" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:53 +msgid "New password confirmation" +msgstr "" + +#: kallithea/templates/admin/users/users.html:5 +msgid "Users Administration" +msgstr "" + +#: kallithea/templates/admin/users/users.html:44 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:16 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: kallithea/templates/base/base.html:28 +msgid "Support" +msgstr "" + +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 +msgid "Mercurial repository" +msgstr "" + +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 +msgid "Git repository" +msgstr "" + +#: kallithea/templates/base/base.html:115 +msgid "Create Fork" +msgstr "" + +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 +msgid "Summary" +msgstr "" + +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 +msgid "Changelog" +msgstr "" + +#: kallithea/templates/base/base.html:133 +#: kallithea/templates/files/files.html:11 +msgid "Files" +msgstr "" + +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 +msgid "Options" +msgstr "" + +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 +msgid "Compare Fork" +msgstr "" + +#: kallithea/templates/base/base.html:158 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:67 +msgid "Search" +msgstr "" + +#: kallithea/templates/base/base.html:164 +msgid "Unlock" +msgstr "" + +#: kallithea/templates/base/base.html:166 +msgid "Lock" +msgstr "" + +#: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:178 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 +msgid "Create Pull Request" +msgstr "" + +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:308 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:309 +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:313 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:315 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:316 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:321 +msgid "Search in repositories" +msgstr "" + +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:360 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:369 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:400 +msgid "Log Out" +msgstr "" + +#: kallithea/templates/base/base.html:524 +msgid "Parent rev." +msgstr "" + +#: kallithea/templates/base/base.html:533 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 +msgid "Inherit defaults" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:15 +#, python-format +msgid "" +"Select to inherit global settings, IP whitelist and permissions from the " +"%s." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:23 +msgid "Create repositories" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:33 +msgid "Create user groups" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:37 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:43 +msgid "Fork repositories" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:47 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:13 +#: kallithea/templates/changelog/changelog.html:41 +msgid "Show" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:22 +msgid "No permissions defined yet" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:30 +#: kallithea/templates/base/perms_summary.html:55 +msgid "Permission" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:32 +#: kallithea/templates/base/perms_summary.html:57 +msgid "Edit Permission" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:92 +msgid "No permission defined" +msgstr "" + +#: kallithea/templates/base/root.html:28 +msgid "Retry" +msgstr "" + +#: kallithea/templates/base/root.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." +msgstr "" + +#: kallithea/templates/base/root.html:30 +msgid "Unable to post" +msgstr "" + +#: kallithea/templates/base/root.html:31 +msgid "Add Another Comment" +msgstr "" + +#: kallithea/templates/base/root.html:32 +msgid "Stop following this repository" +msgstr "" + +#: kallithea/templates/base/root.html:33 +msgid "Start following this repository" +msgstr "" + +#: kallithea/templates/base/root.html:34 +msgid "Group" +msgstr "" + +#: kallithea/templates/base/root.html:35 +msgid "Loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:36 +msgid "loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:37 +msgid "Search truncated" +msgstr "" + +#: kallithea/templates/base/root.html:38 +msgid "No matching files" +msgstr "" + +#: kallithea/templates/base/root.html:39 +msgid "Open New Pull Request from {0}" +msgstr "" + +#: kallithea/templates/base/root.html:40 +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +msgid "Show Selected Changesets {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:52 +msgid "Specify changeset" +msgstr "" + +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 +#, python-format +msgid "%s Changelog" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:23 +#, python-format +msgid "showing %d out of %d revision" +msgid_plural "showing %d out of %d revisions" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changelog/changelog.html:47 +msgid "Clear selection" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:54 +msgid "Go to tip of repository" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 +#, python-format +msgid "Compare fork with %s" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:61 +#, python-format +msgid "Compare fork with parent repository (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:65 +#: kallithea/templates/files/files.html:29 +msgid "Branch filter:" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:221 +msgid "There are no changes yet" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:4 +#: kallithea/templates/changeset/changeset.html:77 +msgid "Removed" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:5 +#: kallithea/templates/changeset/changeset.html:78 +msgid "Changed" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:6 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:38 +msgid "Added" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:8 +#: kallithea/templates/changelog/changelog_details.html:9 +#: kallithea/templates/changelog/changelog_details.html:10 +#: kallithea/templates/changeset/changeset.html:81 +#: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 +#, python-format +msgid "Affected %s files" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%s committed on %s" +msgid "%s comments" +msgstr "%s committed den %s" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:8 +#, python-format +msgid "%s Changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:34 +msgid "Changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 +msgid "Raw diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:46 +msgid "Patch diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 +msgid "Download diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 +msgid "Merge" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:96 +msgid "Grafted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:102 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:108 +msgid "Replaced by:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:122 +msgid "Preceded by:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 +#, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#, fuzzy +#| msgid "%s committed on %s" +msgid "comment" +msgstr "%s committed den %s" + +#: kallithea/templates/changeset/changeset_file_comment.html:21 +msgid "on pull request" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:22 +msgid "No title" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:24 +msgid "on this changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:30 +msgid "Delete comment?" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 +msgid "Status change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +msgid "Finish pull request" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 +msgid "Comment" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:137 +msgid "You need to be logged in to comment." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:137 +msgid "Login now" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:141 +msgid "Hide" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:153 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:154 +#, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:155 +#, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_range.html:5 +#, python-format +msgid "%s Changesets" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +msgid "Files affected" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, python-format +msgid "Unknown operation: %r" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:43 +msgid "Show full diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 +msgid "Show full side-by-side diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:72 +msgid "Show inline comments" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:5 +msgid "No changesets" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:54 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#, python-format +msgid "%s changesets" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:56 +msgid "behind" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:6 +#: kallithea/templates/compare/compare_diff.html:8 +#, python-format +msgid "%s Compare" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:41 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:39 +msgid "Swap" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:48 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 +#, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/compare/compare_diff.html:95 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:23 +msgid "Public repository" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:29 +msgid "Repository creation in progress..." +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:42 +msgid "No changesets yet" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:76 +msgid "Creating" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +msgid "Changeset on" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +msgid "branch" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +msgid "Status change:" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:33 +msgid "The pull request has been closed." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:9 +#, python-format +msgid "Hello %s" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:16 +msgid "We have received a request to reset the password for your account." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 +msgid "To set a new password, click the following link" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:33 +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:44 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Pull request %s" +msgid "Pull request" +msgstr "Pull-forespørgsel %s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" +msgstr "" + +#: kallithea/templates/files/diff_2way.html:15 +#, python-format +msgid "%s File side-by-side diff" +msgstr "" + +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 +msgid "File diff" +msgstr "" + +#: kallithea/templates/files/file_diff.html:4 +#, python-format +msgid "%s File Diff" +msgstr "" + +#: kallithea/templates/files/files.html:4 +#: kallithea/templates/files/files.html:77 +#, python-format +msgid "%s Files" +msgstr "" + +#: kallithea/templates/files/files_add.html:4 +#, python-format +msgid "%s Files Add" +msgstr "" + +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 +#: kallithea/templates/files/files_ypjax.html:3 +msgid "Location" +msgstr "" + +#: kallithea/templates/files/files_add.html:41 +msgid "Enter filename..." +msgstr "" + +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +msgid "or" +msgstr "" + +#: kallithea/templates/files/files_add.html:43 +msgid "Upload File" +msgstr "" + +#: kallithea/templates/files/files_add.html:47 +msgid "Create New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:53 +msgid "New file type" +msgstr "" + +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +msgid "Commit Changes" +msgstr "" + +#: kallithea/templates/files/files_browser.html:37 +msgid "Search File List" +msgstr "" + +#: kallithea/templates/files/files_browser.html:42 +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 +msgid "Last Committer" +msgstr "" + +#: kallithea/templates/files/files_delete.html:4 +#, python-format +msgid "%s Files Delete" +msgstr "" + +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:30 +msgid "Delete file" +msgstr "" + +#: kallithea/templates/files/files_edit.html:4 +#, python-format +msgid "%s File Edit" +msgstr "" + +#: kallithea/templates/files/files_edit.html:21 +msgid "Edit file" +msgstr "" + +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 +msgid "Source" +msgstr "" + +#: kallithea/templates/files/files_history_box.html:2 +#, python-format +msgid "%s author" +msgid_plural "%s authors" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/files/files_source.html:6 +msgid "Diff to Revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:7 +msgid "Show at Revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + +#: kallithea/templates/files/files_source.html:10 +msgid "Show Authors" +msgstr "" + +#: kallithea/templates/files/files_source.html:26 +msgid "Show Source" +msgstr "" + +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:41 +msgid "Deleting files allowed only when on branch head revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:58 +#, python-format +msgid "Binary file (%s)" +msgstr "" + +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + +#: kallithea/templates/files/files_source.html:73 +msgid "Show as raw." +msgstr "" + +#: kallithea/templates/files/files_ypjax.html:5 +msgid "annotation" +msgstr "" + +#: kallithea/templates/files/files_ypjax.html:23 +msgid "Go Back" +msgstr "" + +#: kallithea/templates/files/files_ypjax.html:24 +msgid "No files at given path" +msgstr "" + +#: kallithea/templates/followers/followers.html:5 +#, python-format +msgid "%s Followers" +msgstr "" + +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 +msgid "Followers" +msgstr "" + +#: kallithea/templates/followers/followers_data.html:9 +msgid "Started following -" +msgstr "" + +#: kallithea/templates/forks/fork.html:5 +#, python-format +msgid "Fork repository %s" +msgstr "" + +#: kallithea/templates/forks/fork.html:25 +msgid "Fork name" +msgstr "" + +#: kallithea/templates/forks/fork.html:53 +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" + +#: kallithea/templates/forks/fork.html:58 +msgid "Private" +msgstr "" + +#: kallithea/templates/forks/fork.html:66 +msgid "Copy permissions" +msgstr "" + +#: kallithea/templates/forks/fork.html:69 +msgid "Copy permissions from forked repository" +msgstr "" + +#: kallithea/templates/forks/fork.html:75 +msgid "Update after clone" +msgstr "" + +#: kallithea/templates/forks/fork.html:78 +msgid "Checkout source after making a clone" +msgstr "" + +#: kallithea/templates/forks/fork.html:85 +msgid "Fork this Repository" +msgstr "" + +#: kallithea/templates/forks/forks.html:5 +#, python-format +msgid "%s Forks" +msgstr "" + +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 +msgid "Forks" +msgstr "" + +#: kallithea/templates/forks/forks_data.html:14 +msgid "Forked" +msgstr "" + +#: kallithea/templates/forks/forks_data.html:24 +msgid "There are no forks yet" +msgstr "" + +#: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +msgid "RSS journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:34 +msgid "My Repositories" +msgstr "" + +#: kallithea/templates/journal/journal_data.html:42 +msgid "No entries yet" +msgstr "" + +#: kallithea/templates/journal/public_journal.html:10 +msgid "ATOM public journal feed" +msgstr "" + +#: kallithea/templates/journal/public_journal.html:11 +msgid "RSS public journal feed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:8 +msgid "New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:26 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 +msgid "Title" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:28 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 +msgid "Write a short description on this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:40 +msgid "Changeset flow" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:46 +msgid "Origin repository" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:62 +msgid "Destination repository" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +msgid "No entries" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:14 +msgid "Vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:28 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:30 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:35 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:37 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 +msgid "Closed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:67 +msgid "Delete Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:68 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:70 +#, python-format +msgid "Confirm again to delete this pull request with %s comments" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 +#, python-format +msgid "%s Pull Request %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, python-format +msgid "Pull request %s from %s#%s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Summarize the changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 +msgid "Pull request status calculated from votes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:81 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:86 +msgid "on" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:95 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +msgid "Pull changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:234 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:240 +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:243 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:268 +msgid "Pull Request Content" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 +#, python-format +msgid "%s Pull Requests" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, python-format +msgid "Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 +#, python-format +msgid "Pull Requests to '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 +msgid "Open New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 +#, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 +#, python-format +msgid "Show Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 +msgid "Pull Requests Created by Me" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 +msgid "Pull Requests I Participate In" +msgstr "" + +#: kallithea/templates/search/search.html:6 +#, python-format +msgid "%s Search" +msgstr "" + +#: kallithea/templates/search/search.html:8 +#: kallithea/templates/search/search.html:16 +msgid "Search in All Repositories" +msgstr "" + +#: kallithea/templates/search/search.html:47 +msgid "Search term" +msgstr "" + +#: kallithea/templates/search/search.html:54 +msgid "Search in" +msgstr "" + +#: kallithea/templates/search/search.html:56 +msgid "File contents" +msgstr "" + +#: kallithea/templates/search/search.html:57 +msgid "Commit messages" +msgstr "" + +#: kallithea/templates/search/search.html:58 +msgid "File names" +msgstr "" + +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +msgid "Permission denied" +msgstr "" + +#: kallithea/templates/summary/statistics.html:4 +#, python-format +msgid "%s Statistics" +msgstr "" + +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:36 +#, python-format +msgid "%s ATOM feed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:37 +#, python-format +msgid "%s RSS feed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 +msgid "Enable" +msgstr "" + +#: kallithea/templates/summary/statistics.html:38 +msgid "Stats gathered: " +msgstr "" + +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 +msgid "files" +msgstr "" + +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 +msgid "Show more" +msgstr "" + +#: kallithea/templates/summary/statistics.html:405 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:406 +msgid "files added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:407 +msgid "files changed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:408 +msgid "files removed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:410 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:411 +msgid "file added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:412 +msgid "file changed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:413 +msgid "file removed" +msgstr "" + +#: kallithea/templates/summary/summary.html:5 +#, python-format +msgid "%s Summary" +msgstr "" + +#: kallithea/templates/summary/summary.html:14 +#, python-format +msgid "Repository locked by %s" +msgstr "" + +#: kallithea/templates/summary/summary.html:16 +msgid "Repository unlocked" +msgstr "" + +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "" + +#: kallithea/templates/summary/summary.html:27 +msgid "Clone from" +msgstr "" + +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:73 +msgid "Show by Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:84 +msgid "Trending files" +msgstr "" + +#: kallithea/templates/summary/summary.html:98 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:101 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:103 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:109 +msgid "Download as zip" +msgstr "" + +#: kallithea/templates/summary/summary.html:113 +msgid "Check this to download archive with subrepos" +msgstr "" + +#: kallithea/templates/summary/summary.html:115 +msgid "With subrepos" +msgstr "" + +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 +msgid "Feed" +msgstr "" + +#: kallithea/templates/summary/summary.html:175 +msgid "Latest Changes" +msgstr "" + +#: kallithea/templates/summary/summary.html:177 +msgid "Quick Start" +msgstr "" + +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 +#, python-format +msgid "Readme file from revision %s:%s" +msgstr "" + +#: kallithea/templates/summary/summary.html:298 +#, python-format +msgid "Download %s as %s" +msgstr "" + +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "Der er intet indekseret til at søge i. Kør whoosh indexer" + +#~ msgid "IP %s not allowed" +#~ msgstr "IP-adresse %s er ikke tilladt" + +#~ msgid "%(user)s commented on changeset %(age)s" +#~ msgstr "%(user)s kommenterede på changeset %(age)s" + +#~ msgid "%(user)s sent message %(age)s" +#~ msgstr "%(user)s sendte besked %(age)s" + +#~ msgid "%(user)s mentioned you %(age)s" +#~ msgstr "%(user)s har nævnt dig %(age)s" + +#~ msgid "%(user)s registered in Kallithea %(age)s" +#~ msgstr "%(user)s er registreret i Kallithea %(age)s" + +#~ msgid "%(user)s opened new pull request %(age)s" +#~ msgstr "%(user)s har åbnet en ny pull-forespørgsel %(age)s" + +#~ msgid "%(user)s commented on pull request %(age)s" +#~ msgstr "%(user)s kommenterede på pull-forespørgsel %(age)s" + +#~ msgid "%(user)s commented on changeset at %(when)s" +#~ msgstr "%(user)s kommenterede på changeset %(when)s" + +#~ msgid "%(user)s sent message at %(when)s" +#~ msgstr "%(user)s sendte en besked %(when)s" + +#~ msgid "%(user)s mentioned you at %(when)s" +#~ msgstr "%(user)s har nævnt dig %(when)s" + +#~ msgid "%(user)s registered in Kallithea at %(when)s" +#~ msgstr "%(user)s er registreret i Kallithea %(when)s" + +#~ msgid "%(user)s opened new pull request at %(when)s" +#~ msgstr "%(user)s åbnede en ny pull-forespørgsel %(when)s" + +#~ msgid "%(user)s commented on pull request at %(when)s" +#~ msgstr "%(user)s kommenterede på en pull-forespørgsel %(when)s" diff --git a/kallithea/i18n/de/LC_MESSAGES/kallithea.po b/kallithea/i18n/de/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/de/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/de/LC_MESSAGES/kallithea.po @@ -7,103 +7,130 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" -"PO-Revision-Date: 2018-12-04 20:10+0000\n" -"Last-Translator: ssantos \n" -"Language-Team: German \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 \n" +"Language-Team: German \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.4-dev\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +"X-Generator: Weblate 3.5.1\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "Es gibt noch keine Änderungssätze" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Keine" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(geschlossen)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "Zeige unsichtbare Zeichen" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignoriere unsichtbare Zeichen" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Erhöhe diff-Kontext auf %(num)s Zeilen" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +#, fuzzy +#| msgid "No permission to change pull request status" +msgid "No permission to change status" +msgstr "Keine Berechtigung zum Ändern des Status des Pull Requests" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 msgid "Such revision does not exist for this repository" msgstr "Die angegebene Version existiert nicht in diesem Repository" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" -"Eine Änderung des Status eines Änderungssatzes, der mit einem geschlossen" -" Pull-Request assoziert ist, ist nicht erlaubt" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Änderungssätze auswählen" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Gehe zum Tip des Repositorys" + +#: kallithea/controllers/compare.py:72 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "" +"Ohne einen gemeinsamen Vorfahren ist ein Vergleich der Repositories nicht " +"möglich" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "Kann leeren diff nicht anzeigen" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "Es konnte kein Vorfahre für den merge diff gefunden werden" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "Es wurden mehrere merge Vorfahren für den merge Vergleich gefunden" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" -"Ohne einen gemeinsamen Vorfahren ist ein Vergleich der Repositories nicht" -" möglich" +"Ohne einen gemeinsamen Vorfahren ist ein Vergleich der Repositories nicht " +"möglich" + +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "Keine Rückmeldung" #: kallithea/controllers/error.py:71 -msgid "No response" -msgstr "Keine Rückmeldung" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Unbekannter Fehler" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." msgstr "" "Die Anfrage konnte wegen ungültiger Syntax vom Server nicht ausgewertet " "werden." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Unauthorisierter Zugang zur Ressource" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Du hast keine Rechte, um diese Seite zu betrachten" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Die Ressource konnte nicht gefunden werden" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -111,371 +138,366 @@ msgstr "" "Aufgrund einer unerwarteten Gegebenheit konnte der Server diese Anfrage " "nicht vollenden." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Änderungen im %s Repository" - -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "%s %s Feed" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten..." - -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:63 #, python-format msgid "%s committed on %s" msgstr "%s committed am %s" -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "Der Änderungssatz war zu groß und wurde abgeschnitten..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#, python-format +msgid "%s %s feed" +msgstr "%s %s Feed" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" +msgstr "Änderungen im %s Repository" + +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Hier klicken, um eine neue Datei hinzuzufügen" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "Es gibt hier noch keine Dateien. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "%s auf %s" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, 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:317 +#: kallithea/controllers/files.py:312 #, fuzzy -#| msgid "You can only delete files with revision being a valid branch " msgid "You can only delete files with revision being a valid branch" -msgstr "Du kannst nur Dateien löschen, deren Revision ein gültiger Branch ist " - -#: kallithea/controllers/files.py:328 +msgstr "" +"Dateien können nur gelöscht werden, deren Revision ein gültiger Branch ist" + +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Datei %s via Kallithea gelöscht" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "Datei %s erfolgreich gelöscht" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "Während des Commits trat ein Fehler auf" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 #, fuzzy -#| msgid "You can only edit files with revision being a valid branch " msgid "You can only edit files with revision being a valid branch" -msgstr "Du kannst nur Dateien bearbeiten, deren Revision ein gültiger Branch ist " - -#: kallithea/controllers/files.py:391 +msgstr "" +"Dateien können nur editiert werden, deren Revision ein gültiger Branch ist" + +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "Datei %s via Kallithea editiert" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "Keine Änderungen" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "Der Commit zu %s war erfolgreich" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "Datei via Kallithea hinzugefügt" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "Kein Inhalt" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "Kein Dateiname" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 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:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "Downloads gesperrt" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "Unbekannte Revision %s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "Leeres Repository" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "Unbekannter Archivtyp" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Änderungssätze" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Entwicklungszweige" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Tags" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "Während des Forkens des Repositorys trat ein Fehler auf: %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "Gruppen" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repositories" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Zweig" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Geschlossene Branches" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "Marke" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "Lesezeichen" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Öffentliches Logbuch" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Logbuch" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "Falsches Captcha" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "Sie haben sich erfolgreich bei Kallithea registriert" - -#: kallithea/controllers/login.py:197 -#, fuzzy -#| msgid "Your password reset link was sent" +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "Sie haben sich erfolgreich bei %s registriert" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" -msgstr "Ihr Passwort Zurücksetzen link wurde versendet" - -#: kallithea/controllers/login.py:246 -#, fuzzy -#| msgid "Password reset link" +msgstr "Ihr Link um das Passwort zurückzusetzen wurde versendet" + +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" -msgstr "Link zum Zurücksetzen des Passworts" - -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +msgstr "Ungültiges Token zum Zurücksetzen des Passworts." + +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "Erfolgreich Kennwort geändert" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "Ungültigen Begutachter \"%s\" angegeben" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" msgstr "%s (geschlossen)" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Änderungssatz" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" msgstr "Spezial" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "Branches anderer" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "Lesezeichen" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "Fehler beim Erstellen des Pull-Requests: %s" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "Keine Beschreibung" - -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "Ungültigen Begutachter \"%s\" angegeben" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 msgid "Error occurred while creating pull request" msgstr "Während des Erstellens des Pull Requests trat ein Fehler auf" -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "Fehlende Changesets seit letztem Pull Request:" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Neue Changesets in %s %s seit dem letzten Pull Request:" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" -"Eltern-Commit hat sich nicht verändert - zeige Diff seit voriger Version:" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" -"Dieser Pull Request basiert auf einer anderen %s Revision. Daher ist kein" -" Simple Diff verfügbar." - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Keine Änderungen seit der letzten Version gefunden in %s %s." - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Geschlossen, ersetzt durch %s." - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "Es wurde erfolgreich ein neuer Pullrequest eröffnet" + +#: kallithea/controllers/pullrequests.py:375 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" msgstr "Pull Request Update erstellt" -#: kallithea/controllers/pullrequests.py:514 +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "Es wurden inzwischen folgende Begutachter hinzugefügt: %s" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "Es wurden inzwischen folgende Begutachter entfernt: %s" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Keine Beschreibung" + +#: kallithea/controllers/pullrequests.py:432 msgid "Pull request updated" msgstr "Pull Request aktualisiert" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "Erfolgreich Pull-Request gelöscht" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "Die Revision %s konnte in %s nicht gefunden werden" + +#: kallithea/controllers/pullrequests.py:508 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." msgstr "Dieser Pull Request wurde bereits in %s integriert." -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" "Dieser Pull Request wurde geschlossen und kann daher nicht aktualisiert " "werden." -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "Dieser Pull Request kann mit Änderungen in %s aktualisiert werden:" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:543 +#, fuzzy, python-format +#| msgid "The following changes are available on %s:" +msgid "The following additional changes are available on %s:" +msgstr "Die folgenden Änderungen sind verfügbar unter %s:" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." -#: kallithea/controllers/pullrequests.py:627 +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Hinweis: Branch %s hat einen anderen Head: %s." -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." +#: kallithea/controllers/pullrequests.py:564 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." msgstr "Git Pull Request unterstützen bisher keine Updates." -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "Keine Berechtigung zum Ändern des Status des Pull Requests" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "Schließen." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/pullrequests.py:566 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "Keine Changesets gefunden, um den Pull Request zu aktualisieren." + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" +"Der diff kann nicht angezeigt werden. Die Pull Request Revisionen konnten " +"nicht gefunden werden." + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." -msgstr "Ungültige Suchanfrage. Versuchen sie es in Anführungzeichen zu setzen." +msgstr "" +"Ungültige Suchanfrage. Versuchen sie es in Anführungzeichen zu setzen." #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Es gibt keinen durchsuchbaren Index. Bitte den Whoosh Indizierer ausführen" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Während der Suchoperation trat ein Fehler auf." -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "Es stehen noch keine Daten zur Verfügung" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "Statistiken sind deaktiviert für dieses Repository" @@ -487,151 +509,153 @@ msgstr "Anmeldeeinstellungen erfolgreich geändert" msgid "error occurred during update of auth settings" msgstr "Fehler bei der Änderung der Anmeldeeinstellungen aufgetreten" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Standardeinstellungen erfolgreich geupdated" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Ein Fehler trat beim updaten der Standardeinstellungen auf" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "Immer" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" -msgstr "Immer" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 Minuten" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "5 Minuten" - -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 Stunde" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 Tag" -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 Monat" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Lebenszeit" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "Ein fehler trat auf bei der Erstellung des gist" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "gist %s gelöscht" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:196 msgid "Unmodified" msgstr "Ungeändert" -#: kallithea/controllers/admin/gists.py:262 +#: kallithea/controllers/admin/gists.py:225 msgid "Successfully updated gist content" msgstr "Erfolgreich Kerninhalt aktualisiert" -#: kallithea/controllers/admin/gists.py:267 +#: kallithea/controllers/admin/gists.py:230 msgid "Successfully updated gist data" msgstr "Erfolgreich Kerndaten aktualisiert" -#: kallithea/controllers/admin/gists.py:270 +#: kallithea/controllers/admin/gists.py:233 #, python-format msgid "Error occurred during update of gist %s" msgstr "Fehler beim Aktualisieren der Kerndaten %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Sie können diesen Benutzer nicht editieren, da er von entscheidender " "Bedeutung für die ganze Applikation ist" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "Ihr Account wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "Fehler beim Aktualisieren der Benutzer %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "Fehler bei der Änderung des Kennworts" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "Die EMail Addresse %s wurde zum Benutzer hinzugefügt" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "Währen der Speicherung der EMail Addresse trat ein Fehler auf" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "Die EMail Addresse wurde vom Benutzer entfernt" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "API Key wurde erfolgreich erstellt" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "API-Schlüssel erfolgreich zurückgesetzt" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API-Schlüssel erfolgreich gelöscht" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Lesen" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Schreiben" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -639,281 +663,273 @@ msgstr "Schreiben" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Admin" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Deaktiviert" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Erlaubt mit manueller Kontoaktivierung" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Erlaubt mit automatischer Kontoaktivierung" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "Manuelle Aktivierung externen Kontos" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "Automatische Aktivierung externen Kontos" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "Deaktiviert" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Erlaubt mit manueller Kontoaktivierung" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Erlaubt mit automatischer Kontoaktivierung" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "Manuelle Aktivierung externen Kontos" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "Automatische Aktivierung externen Kontos" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Aktiviert" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Globale Berechtigungen erfolgreich geändert" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Fehler bei der Änderung der globalen Berechtigungen" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Fehler bei der Erstellung der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "Repositoriumsgruppe %s erstellt" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "Repositoriumsgruppe %s aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Fehler bei der Aktualisierung der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Die Gruppe enthält %s Repositorys und kann nicht gelöscht werden" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Diese Gruppe enthält %s Untergruppen und kann nicht gelöscht werden" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Repositoriumsgruppe %s entfernt" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Fehler beim Löschen der Repositoriumsgruppe %s" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "Als Administrator kann man sich keine Berechtigungen entziehen" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Berechtigungen der Repositoriumsgruppe aktualisiert" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "Fehler beim Entzug der Berechtigungen" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "Fehler beim Erstellen des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Repositorium %s von %s erstellt" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Aufgespaltenes Repositorium %s zu %s" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Repositorium erzeugt %s" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Repository %s wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Fehler bei der Aktualisierung des Repositoriums %s" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "%s Spaltung abgetrennt" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "%s Spaltung gelöscht" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Repositorium %s gelöscht" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "%s konnte nicht gelöscht werden, da es noch Forks besitzt" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Beim Löschen von %s trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Repositoriumsberechtigungen aktualisiert" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "Feldvalidierung fehlgeschlagen: %s" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Fehler während der Erzeugung des Feldes" -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "Fehler beim Entfernen des Feldes" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "-- Keine Abspaltung --" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:446 msgid "Updated repository visibility in public journal" msgstr "Sichtbarkeit des Repositorys im Öffentlichen Logbuch aktualisiert" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:450 msgid "An error occurred during setting this repository in public journal" msgstr "" "Es trat ein Fehler während der Aktualisierung der Sicherbarkeit dieses " "Repositorys im Öffentlichen Logbuch auf" -#: kallithea/controllers/admin/repos.py:512 +#: kallithea/controllers/admin/repos.py:466 msgid "Nothing" msgstr "Nichts" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:468 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Markiere Repository %s als Abzweig von Repository %s" -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:475 msgid "An error occurred during this operation" msgstr "Während dieser operation trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 msgid "Repository has been locked" msgstr "Repository wurde gesperrt" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" msgstr "Repository nicht mehr gesperrt" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "Fehler beim Entsperren" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "Cache Entfernung war erfolgreich" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "Währen der Cache Invalidierung trat ein Fehler auf" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "Von entferntem Ort übertragen" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "" "Es trat ein Fehler auf während das Repository von einem Entfernten " "Speicherort übertragen wurde" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "Während des löschens der Repository Statistiken trat ein Fehler auf" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "VCS-Einstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -921,354 +937,367 @@ msgstr "" "hgsubversion-Unterstützung konnte nicht aktiviert werden. Die " "\"hgsubversion\"-Bibliothek fehlt" -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" "Ein Fehler ist während der Aktualisierung der Applikationseinstellungen " "aufgetreten" -#: kallithea/controllers/admin/settings.py:211 +#: kallithea/controllers/admin/settings.py:174 #, 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:226 +"Die Repositories wurden erfolgreich überprüft. Hinzugefügt: %s. Entfernt: " +"%s." + +#: kallithea/controllers/admin/settings.py:189 #, fuzzy, python-format #| msgid "Invalidate Repository Cache" msgid "Invalidated %s repositories" msgstr "Ungültiger Repositorycache" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Anwendungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Visualisierungseinstellungen aktualisiert" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" "Es ist ein Fehler während der Aktualisierung der Layouteinstellung " "aufgetreten" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Bitte gebe eine E-Mailadresse an" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Task zum Versenden von E-Mails erstellt" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +#, 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 +msgid "Builtin hooks are read-only. Please use another hook name." +msgstr "" + +#: kallithea/controllers/admin/settings.py:360 msgid "Added new hook" msgstr "Neuer Hook hinzugefügt" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Die Hooks wurden aktutalisiert" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Während der Erzeugung des Hooks ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Whoosh Reindizierungs Aufgabe wurde zur Ausführung geplant" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "Nutzergruppe %s erstellt" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" -msgstr "Es ist ein Fehler während der Erstellung der Nutzergruppe %s aufgetreten" - -#: kallithea/controllers/admin/user_groups.py:201 +msgstr "" +"Es ist ein Fehler während der Erstellung der Nutzergruppe %s aufgetreten" + +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "Aktualisierte Nutzergruppe %s" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" -msgstr "Während des Updates der Benutzergruppe %s ist ein Fehler aufgetreten" - -#: kallithea/controllers/admin/user_groups.py:242 +msgstr "" +"Während des Updates der Benutzergruppe %s ist ein Fehler aufgetreten" + +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "Die Nutzergruppe wurde erfolgreich entfernt" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "Während des Löschens der Benutzergruppe ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "Zielgruppe kann nicht die gleiche Gruppe sein" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "Berechtigungen der Benutzergruppe wurden aktualisiert" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "Berechtigungen wurden aktualisiert" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" -msgstr "Es ist ein Fehler während des Speicherns der Berechtigungen aufgetreten" - -#: kallithea/controllers/admin/users.py:134 +msgstr "" +"Es ist ein Fehler während des Speicherns der Berechtigungen aufgetreten" + +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "Nutzer %s erstellt" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "Während des Erstellens des Benutzers %s ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "Der Benutzer wurde erfolgreich aktualisiert" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "Der Nutzer wurde erfolgreich gelöscht" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "Während der Löschen des Benutzers trat ein Fehler auf" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "Der Standard-Benutzer kann nicht bearbeitet werden" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Die IP-Adresse %s wurde zur Nutzerwhitelist hinzugefügt" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "Während des Speicherns der IP-Adresse ist ein Fehler aufgetreten" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "IP-Adresse wurde von der Nutzerwhitelist entfernt" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "IP-Adresse %s ist nicht erlaubt" - -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" +"Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "Sie müssen sich anmelden um diese Seite aufzurufen" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "Ungültiger API Key" -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "Es wurde ein CSRF Leck entdeckt. Alle Formular Token sind abgelaufen" - -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "Sie müssen ein Registrierter Nutzer sein um diese Aktion durchzuführen" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "Sie müssen sich anmelden um diese Seite aufzurufen" - -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" +"Es wurde ein CSRF Leck entdeckt. Alle Formular Token sind abgelaufen" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "Das Repository konnte nicht im Filesystem gefunden werden" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset for %s %s not found in %s" msgstr "Änderungssatz nicht gefunden" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "Binäre Datei" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Der Änderungssatz war zu groß und wurde abgeschnitten, benutzen sie das " "Diff Menü um die Unterschiede anzuzeigen" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "Keine Änderungen erkannt" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Deleted branch: %s" msgstr "Branch %s gelöscht" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:614 #, python-format msgid "Created tag: %s" msgstr "Tag %s erstellt" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset %s not found" msgstr "Änderungssatz nicht gefunden" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Zeige alle Kombinierten Änderungensätze %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "Vergleichsansicht" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "und" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "%s mehr" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "revisionen" -#: kallithea/lib/helpers.py:723 -#, fuzzy, python-format +#: kallithea/lib/helpers.py:725 +#, python-format msgid "Fork name %s" msgstr "Fork Name %s" -#: kallithea/lib/helpers.py:743 -#, fuzzy, python-format +#: kallithea/lib/helpers.py:746 +#, python-format msgid "Pull request %s" -msgstr "Pull Request #%s" - -#: kallithea/lib/helpers.py:753 +msgstr "Pull Request %s" + +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "[gelöscht] Repository" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "[erstellt] Repository" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "[erstellt] Repository als Fork" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "[forked] Repository" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "[aktualisiert] Repository" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "Archiv von Repository [heruntergeladen]" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "Repository [gelöscht]" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "Benutzer [erstellt]" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "Benutzer [akutalisiert]" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "Benutzergruppe [erstellt]" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "Benutzergruppe [aktualisiert]" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "Revision [kommentiert] in Repository" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "Pull Request [kommentiert] für" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "Pull Request [geschlossen] für" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "[Pushed] in" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "[via Kallithea] in Repository [committed]" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "[Pulled von Remote] in Repository" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "[Pulled] von" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "[Following gestartet] für Repository" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "[Following gestoppt] für Repository" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr " und %s weitere" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Keine Dateien" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "neue Datei" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "entf" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "umbenennen" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1279,758 +1308,348 @@ msgstr "" "es im Dateisystem erstellt oder umbenannt. Bitte starten sie die " "Applikation erneut um die Repositories neu zu Indizieren" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d Jahr" msgstr[1] "%d Jahre" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Monat" msgstr[1] "%d Monate" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d Sekunde" msgstr[1] "%d Sekunden" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "in %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "vor %s" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "in %s und %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "%s und %s her" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "jetzt gerade" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Kein Zugriff auf Repository" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Lesender Zugriff auf Repository" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Schreibdender Zugriff auf Repository" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Administrativer Zugang zum Repository" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Repository Gruppe hat Keinen Zugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Repository Gruppe hat lesenden Zugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Repository Gruppe hat schreibenden Zugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Repository Gruppe hat Administrativen Zugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 +#: kallithea/model/comment.py:68 +#, python-format +msgid "on line %s" +msgstr "in Zeile %s" + +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +msgid "[Mention]" +msgstr "[Mention]" + +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "höchste Ebene" + +#: kallithea/model/db.py:1703 msgid "Kallithea Administrator" msgstr "Kallithea Administrator" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Erstellung eines Repositorys deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Erstellung eines Repositorys aktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Forking eines Repositorys deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Forking eines Repositorys aktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Registrierung deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Registrierung neuer Benutzer in Kallithea mit manueller Aktivierung" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Registrierung neuer Benutzer in Kallithea mit Automatischer Aktivierung" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Nicht Begutachtet" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "Akzeptiert" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "Abgelehnt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "In Begutachtung" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "höchste Ebene" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Kein Zugriff für Repositorygruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Lesezugriff für Repositorygruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Schreibzugriff für Repositorygruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Administrativer Zugriff für Repositorygruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Kein Zugriff für Benutzergruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Lesezugriff für Benutzergruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Nutzergruppe Schreibzugriff" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Administrativer Zugriff für Benutzergruppe" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Erstellung von Repositorygruppen deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Erstellung von Repositorygruppen aktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Erstellung von Benutzergruppen deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Erstellung von Benutzergruppen aktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "Registrierung deaktiviert" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Benutzerregistrierung mit automatische Kontoaktivierung" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" +#: kallithea/model/db.py:1705 +msgid "Default user has no access to new repositories" +msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repositories" + +#: kallithea/model/db.py:1706 +msgid "Default user has read access to new repositories" +msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repositories" + +#: kallithea/model/db.py:1707 +msgid "Default user has write access to new repositories" +msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Repositories" + +#: kallithea/model/db.py:1708 +msgid "Default user has admin access to new repositories" +msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Repositories" + +#: kallithea/model/db.py:1710 +msgid "Default user has no access to new repository groups" +msgstr "" +"Der Standard-Benutzer hat keinen Zugriff auf neue Repository-Gruppen" + +#: kallithea/model/db.py:1711 +msgid "Default user has read access to new repository groups" +msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repository-Gruppen" + +#: kallithea/model/db.py:1712 +msgid "Default user has write access to new repository groups" +msgstr "Der Standard-Benutzer Schreibrechte auf neuen Repository-Gruppen" + +#: kallithea/model/db.py:1713 +msgid "Default user has admin access to new repository groups" +msgstr "Der Standard-Benutzer Admin-Rechte auf neuen Repository-Gruppen" + +#: kallithea/model/db.py:1715 +msgid "Default user has no access to new user groups" +msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Benutzer-Gruppen" + +#: kallithea/model/db.py:1716 +msgid "Default user has read access to new user groups" +msgstr "Der Standard-Benutzer hat Leserechte auf neuen Benutzer-Gruppen" + +#: kallithea/model/db.py:1717 +msgid "Default user has write access to new user groups" +msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Benutzer-Gruppen" + +#: kallithea/model/db.py:1718 +msgid "Default user has admin access to new user groups" +msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Benutzer-Gruppen" + +#: kallithea/model/db.py:1720 +msgid "Only admins can create repository groups" +msgstr "Nur Admins können Repository-Gruppen erstellen" + +#: kallithea/model/db.py:1721 +msgid "Non-admins can create repository groups" +msgstr "Nicht-Admins können Repository-Gruppen erstellen" + +#: kallithea/model/db.py:1723 +msgid "Only admins can create user groups" +msgstr "Nur Admins können Benutzer-Gruppen erstellen" + +#: kallithea/model/db.py:1724 +msgid "Non-admins can create user groups" +msgstr "Nicht-Admins können Benutzer-Gruppen erstellen" + +#: kallithea/model/db.py:1726 +msgid "Only admins can create top level repositories" +msgstr "Nur Admins können Repositories auf oberster Ebene erstellen" + +#: kallithea/model/db.py:1727 +msgid "Non-admins can create top level repositories" +msgstr "Nicht-Admins können Repositories oberster Ebene erstellen" + +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "aktiviert" -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" msgstr "" "Erstellung von Repositories mit Schreibzugriff für Repositorygruppe " "deaktiviert" -#: kallithea/model/comment.py:72 -#, python-format -msgid "on line %s" -msgstr "in Zeile %s" - -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 -msgid "[Mention]" -msgstr "[Mention]" - -#: kallithea/model/db.py:1668 -msgid "Default user has no access to new repositories" -msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repositories" - -#: kallithea/model/db.py:1669 -msgid "Default user has read access to new repositories" -msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repositories" - -#: kallithea/model/db.py:1670 -msgid "Default user has write access to new repositories" -msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Repositories" - -#: kallithea/model/db.py:1671 -msgid "Default user has admin access to new repositories" -msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Repositories" - -#: kallithea/model/db.py:1673 -msgid "Default user has no access to new repository groups" -msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Repository-Gruppen" - -#: kallithea/model/db.py:1674 -msgid "Default user has read access to new repository groups" -msgstr "Der Standard-Benutzer hat Leserechte auf neuen Repository-Gruppen" - -#: kallithea/model/db.py:1675 -msgid "Default user has write access to new repository groups" -msgstr "Der Standard-Benutzer Schreibrechte auf neuen Repository-Gruppen" - -#: kallithea/model/db.py:1676 -msgid "Default user has admin access to new repository groups" -msgstr "Der Standard-Benutzer Admin-Rechte auf neuen Repository-Gruppen" - -#: kallithea/model/db.py:1678 -msgid "Default user has no access to new user groups" -msgstr "Der Standard-Benutzer hat keinen Zugriff auf neue Benutzer-Gruppen" - -#: kallithea/model/db.py:1679 -msgid "Default user has read access to new user groups" -msgstr "Der Standard-Benutzer hat Leserechte auf neuen Benutzer-Gruppen" - -#: kallithea/model/db.py:1680 -msgid "Default user has write access to new user groups" -msgstr "Der Standard-Benutzer hat Schreibrechte auf neuen Benutzer-Gruppen" - -#: kallithea/model/db.py:1681 -msgid "Default user has admin access to new user groups" -msgstr "Der Standard-Benutzer hat Admin-Rechte auf neuen Benutzer-Gruppen" - -#: kallithea/model/db.py:1683 -msgid "Only admins can create repository groups" -msgstr "Nur Admins können Repository-Gruppen erstellen" - -#: kallithea/model/db.py:1684 -#, fuzzy -msgid "Non-admins can create repository groups" -msgstr "Nicht-Admins können Repository-Gruppen erstellen" - -#: kallithea/model/db.py:1686 -msgid "Only admins can create user groups" -msgstr "Nur Admins können Benutzer-Gruppen erstellen" - -#: kallithea/model/db.py:1687 -msgid "Non-admins can create user groups" -msgstr "Nicht-Admins können Benutzer-Gruppen erstellen" - -#: kallithea/model/db.py:1689 -#, fuzzy -msgid "Only admins can create top level repositories" -msgstr "Repositories oberster Ebene" - -#: kallithea/model/db.py:1690 -#, fuzzy -msgid "Non-admins can create top level repositories" -msgstr "Repositories oberster Ebene" - -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1732 msgid "Only admins can fork repositories" msgstr "Nur Admins können Repositories forken" -#: kallithea/model/db.py:1696 -#, fuzzy -#| msgid "Non-admins can can fork repositories" +#: kallithea/model/db.py:1733 msgid "Non-admins can fork repositories" -msgstr "Nicht-Admins können Repositories forken" - -#: kallithea/model/db.py:1699 -#, fuzzy +msgstr "Nicht-Admins können Repositorys forken" + +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "Registrierung deaktiviert" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" -#: kallithea/model/db.py:1700 -#, fuzzy +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" -msgstr "Benutzerregistrierung mit automatische Kontoaktivierung" - -#: kallithea/model/db.py:2238 -#, fuzzy +msgstr "Benutzerregistrierung mit automatischer Kontoaktivierung" + +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "Nicht Begutachtet" -#: kallithea/model/db.py:2241 -#, fuzzy +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "In Begutachtung" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2265 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Akzeptiert" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "Akzeptiert" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Bitte einen Benutzernamen eingeben" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Bitte einen Wert mit mindestens %(min)i Zeichen eingeben" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Bitte ein Passwort eingeben" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Bitte mindestens %(min)i Zeichen eingeben" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "Name darf nicht nur Ziffern enthalten" -#: kallithea/model/notification.py:255 -#, fuzzy, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" - -#: kallithea/model/notification.py:256 -#, fuzzy, python-format -msgid "%(user)s sent message %(age)s" -msgstr "%(user)s hat am %(when)s eine Nachricht gesendet" - -#: kallithea/model/notification.py:257 -#, fuzzy, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "%(user)s hat Sie am %(when)s erwähnt" - -#: kallithea/model/notification.py:258 -#, fuzzy, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "%(user)s hat sich am %(when)s bei Kallithea registriert" - -#: kallithea/model/notification.py:259 -#, fuzzy, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "%(user)s hat am %(when)s einen neuen Pull Request eröffnet" - -#: kallithea/model/notification.py:260 +#: kallithea/model/notification.py:165 #, fuzzy, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "%(user)s hat am %(when)s eine Nachricht gesendet" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "%(user)s hat Sie am %(when)s erwähnt" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "%(user)s hat sich am %(when)s bei Kallithea registriert" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "%(user)s hat am %(when)s einen neuen Pull Request eröffnet" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" - -#: kallithea/model/notification.py:303 -#, fuzzy, python-format -#| msgid "" " -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" -"Kommentar für %(repo_name)s Changeset %(short_id)s in %(branch)s erstellt" -" von %(comment_username)s" - -#: kallithea/model/notification.py:306 +#| msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" +"Kommentar für %(repo_name)s Changeset %(short_id)s in %(branch)s erstellt " +"von %(comment_username)s" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "Neuer Benutzer %(new_username)s registriert" -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -#| msgid "" " -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" -"Review Request für %(repo_name)s Pull Request #%(pr_id)s von %(ref)s " -"erstellt von %(pr_username)s" - -#: kallithea/model/notification.py:309 -#, fuzzy, python-format -#| msgid "" "[Comment from %(comment_username)s] %(repo_name)s pull request " -#| "%(pr_nice_id)s from %(ref)s" -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" -"Kommentar von %(comment_username)s für %(repo_name)s Pull Request " -"#%(pr_id)s von %(ref)s" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "Schließen" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 +#, fuzzy, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" +"%(user)s möchte ein Review des Pull Request #%(pr_id)s: %(pr_title)s" + +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Fehler beim Erstellen des Pull-Requests: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Fehlende Changesets seit letztem Pull Request:" + +#: kallithea/model/pull_request.py:348 #, fuzzy, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "%(user)s möchte ein Review des Pull Request #%(pr_id)s: %(pr_title)s" - -#: kallithea/model/scm.py:812 +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Neue Changesets in %s %s seit dem letzten Pull Request:" + +#: kallithea/model/pull_request.py:355 +#, fuzzy +#| msgid "Ancestor didn't change - show diff since previous version:" +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "Vorgänger unverändert - zeige Diff zu lezter Version:" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" +"Dieser Pull Request basiert auf einer anderen %s Revision. Daher ist kein " +"Simple Diff verfügbar." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "Keine Änderungen seit der letzten Version gefunden in %s %s." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "Letzter Tip" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "Neue Benutzerregistrierung" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 #, fuzzy -msgid "You can't remove this user since it is crucial for the entire application" +msgid "" +"You can't remove this user since it is crucial for the entire application" msgstr "" "Sie können diesen Benutzer nicht löschen, da er von entscheidender " "Bedeutung für die gesamte Applikation ist" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2040,17 +1659,17 @@ msgstr "" "nicht entfernt werden. Entweder muss der Besitzer geändert oder das " "Repository entfernt werden: %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" msgstr "" "Der Benutzer \"%s\" ist noch der Besitzer von %s Repositorygruppen und " "kann daher nicht entfernt werden. Entweder muss der Besitzer geändert " "oder die Repositorygruppen müssen entfernt werden: %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2060,68 +1679,67 @@ msgstr "" "nicht entfernt werden. Entweder muss der Besitzer geändert oder die " "Benutzergruppen müssen gelöscht werden: %s" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "Link zum Zurücksetzen des Passworts" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 #, fuzzy -#| msgid "Password reset link" msgid "Password reset notification" msgstr "Link zum Zurücksetzen des Passworts" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -"Das Passwort für dein Konto %s wurde mit dem Formular zum Zurücksetzen des " -"Passworts geändert." - -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +"Das Passwort für dein Konto %s wurde mit dem Formular zum Zurücksetzen " +"des Passworts geändert." + +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "Eine leere Liste ist kein gültiger Wert" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Benutezrname \"%(username)s\" existiert bereits" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Benutzername \"%(username)s\" ist ungültig" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 #, fuzzy msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" msgstr "" "Der Benutzername darf nur alphanumerische Zeichen, Unterstriche, Punkte " "oder Bindestriche enthalten und muss mit einem alphanumerischen Zeichen " "oder einem Unterstrich beginnen" -#: kallithea/model/validators.py:126 +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "Die Eingabe ist nicht gültig" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:112 #, python-format msgid "Username %(username)s is not valid" msgstr "Benutzername \"%(username)s\" ist ungültig" -#: kallithea/model/validators.py:152 +#: kallithea/model/validators.py:133 msgid "Invalid user group name" msgstr "Ungültiger Benutzergruppenname" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Benutzergruppe \"%(usergroup)s\" existiert bereits" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2130,69 +1748,68 @@ msgstr "" "Unterstriche, Punkte oder Bindestriche enthalten und muss mit einem " "alphanumerischen Zeichen beginnen" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "Kann diese Gruppe nicht als vorgesetzt setzen" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Gruppe \"%(group_name)s\" existiert bereits" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Es gibt bereits ein Repository mit \"%(group_name)s\"" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "Üngültige(nicht ASCII) Zeichen im Passwort" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "Ungültiges altes Passwort" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "Die Passwörter stimmen nicht überein" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 #, fuzzy msgid "Invalid username or password" msgstr "Ungültiges Passwort" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:312 msgid "Token mismatch" -msgstr "Schlüssel stimmt nicht überein" - -#: kallithea/model/validators.py:345 +msgstr "Schlüssel stimmt nicht überein" + +#: kallithea/model/validators.py:328 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" -msgstr "Repository Name \"%(repo)s\" ist verboten" - -#: kallithea/model/validators.py:347 +msgstr "Repository Name \"%(repo)s\" ist nicht erlaubt" + +#: kallithea/model/validators.py:330 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Es gibt bereits ein Repository mit \"%(repo)s\"" -#: kallithea/model/validators.py:348 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -"Es gibt bereits ein Repository mit \"%(repo)s\" in der Gruppe " -"\"%(group)s\"" - -#: kallithea/model/validators.py:350 +"Es gibt bereits ein Repository mit \"%(repo)s\" in der Gruppe \"%(group)s" +"\"" + +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Eine Repositorygruppe mit dem Namen \"%(repo)s\" existiert bereits" -#: kallithea/model/validators.py:465 -#, fuzzy +#: kallithea/model/validators.py:419 msgid "Invalid repository URL" -msgstr "privates Repository" - -#: kallithea/model/validators.py:466 +msgstr "Ungültige Repository-URL" + +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -2200,43 +1817,44 @@ msgstr "" "Ungültige Repository-URL. Es muss eine gültige http, https, ssh, svn+http " "oder svn+https URL sein" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "Forke um den selben typ wie der Vorgesetze zu haben" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "" "Du hast nicht die erforderlichen Berechtigungen, um in dieser Gruppe ein " "Repository zu erzeugen" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "keine Berechtigung, um ein Repository auf höchster Ebene anzulegen" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" -msgstr "Sie haben keine Berechtigung, um an diesem Ort ein Repository anzulegen" - -#: kallithea/model/validators.py:597 +msgstr "" +"Sie haben keine Berechtigung, um an diesem Ort ein Repository anzulegen" + +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "Dieser Benutzername oder Benutzergruppenname ist nicht gültig" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "Dies ist ein Ungültiger Pfad" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 #, fuzzy msgid "This email address is already in use" msgstr "Diese E-Mailaddresse ist bereits in Benutzung" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "E-MailAddresse \"%(email)s\" existiert nicht." -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -2244,254 +1862,158 @@ msgstr "" "Das LDAP-Login-Attribut des CN muss angeben werden - Es ist der Name des " "Attributes äquivalent zu \"Benutzername\"" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Bitte eine gültige IPv4- oder IPv6-Adresse angeben" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" "Die Größe (in Bits) des Netzwerks muss im Bereich 0-32 liegen (nicht " "%(bits)r)" -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Der Name eines Schlüssels darf nur aus Buchstaben, Ziffern, Unterstrich " "und Bindestrich bestehen" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "Dateiname darf kein Unterverzeichnis enthalten" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -"Die Plug-Ins %(loaded)s und %(next_to_load)s exportieren beide den selben" -" Namen" - -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +"Die Plug-Ins %(loaded)s und %(next_to_load)s exportieren beide den selben " +"Namen" + +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "Über" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Übersichtsseite" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "Schnellfilter..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "Repositories" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "Repository hinzufügen" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 msgid "Add Repository Group" msgstr "Repositorygruppe hinzufügen" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "Du hast Adminrechte für diese Gruppe und kannst sie editieren" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "Repositorygruppe bearbeiten" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "Gruppenname" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "Repository" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "Beschreibung" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Name" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "Letzte Änderung" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "Tipp" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "Besitzer" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "Klicken um Aufsteigend zu Sortieren" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "Klicken um Absteigend zu Sortieren" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Keine Repositories gefunden." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Datenfehler." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Lade..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "Log In" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "Log In in %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "Benutzername" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "Passwort" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Login Speichern" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "Passowrt Vergessen?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "Kein Account?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "Einloggen" @@ -2499,34 +2021,33 @@ msgstr "Einloggen" msgid "Password Reset" msgstr "Passwort zurücksetzen" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" msgstr "Setze dein Passwort auf %s zurück" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "Setze dein Passwort zurück" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "E-Mailadresse" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" -msgstr "Captcha" - -#: kallithea/templates/password_reset.html:46 +msgstr "CAPTCHA" + +#: kallithea/templates/password_reset.html:47 msgid "Send Password Reset Email" msgstr "E-Mail zum Zurücksetzen des Passworts anfordern" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:52 #, fuzzy -#| msgid "" " msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." @@ -2534,13 +2055,13 @@ msgstr "" "Der Link zum Zurücksetzen des Passworts wird an die zum Benutzernamen " "zugehörige E-Mailaddresse gesendet." -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" "Du bist dabei, ein neues Passwort für die E-Mail-Adresse %s festzulegen." -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." @@ -2548,110 +2069,91 @@ msgstr "" "Beachten Sie, dass Sie dafür die gleiche Browsersitzung verwenden müssen, " "mit der Sie das Zurücksetzen des Passworts beantragt haben." -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "Code, den du in der E-Mail erhalten hast" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 #, fuzzy -#| msgid "New password" msgid "New Password" msgstr "Neues Passwort" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 #, fuzzy -#| msgid "Confirm new password" msgid "Confirm New Password" msgstr "Bestätige neues Passwort" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "Bestätigen" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "Registrieren" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "Registrieren für %s" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "Passwort erneut eingeben" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "Vorname" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "Nachname" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "E-Mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "Registrierte Konten können ohne weitere Aktion genutzt werden." -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" "Bitte warten Sie auf die Aktivierung Ihres Benutzerkontos durch einen " "Administrator." -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Es gibt bisher keine Branches" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "Geschlossene Branches" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Es gibt bisher keine Tags" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Es gibt bisher keine Lesezeichen" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "Admin-Logbuch" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "Logbuch filter..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "Filter" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2659,30 +2161,16 @@ msgstr[0] "%s Eintrag" msgstr[1] "%s Einträge" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Aktion" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Repository" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Datum" @@ -2690,7 +2178,7 @@ msgstr "Datum" msgid "From IP" msgstr "Von IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "Es sind bisher keine Aktionen passiert" @@ -2699,19 +2187,19 @@ msgid "Authentication Settings" msgstr "Authentifizierungseinstellungen" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "Authentifizierung" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "Plug-Ins zur Authentifizierung" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "Aktivierte Plugins" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 #, fuzzy msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " @@ -2721,57 +2209,57 @@ msgstr "" "der Reihenfolge, in der Kallithea die Plug-Ins zur Authentifizierung des " "Benutzers verwendet" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "Verfügbare mitgelieferte Plug-Ins" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "Plugin" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "Speichern" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 msgid "Repository Defaults" msgstr "Repositorystandards" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Typ" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Privates Repository" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2779,34 +2267,34 @@ msgstr "" "Private Repositories sind nur für explizit hinzugefügte Mitarbeiter " "sichtbar." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 msgid "Enable statistics" msgstr "Aktiviere Statistiken" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 msgid "Enable statistics window on summary page." msgstr "Statistik-Fenster in der Zusammenfassungsseite aktivieren." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 msgid "Enable downloads" msgstr "Aktiviere Downloads" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "Download-Menü auf der Zusammenfassungsseite aktivieren." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "Locking aktivieren" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "Aktivieren Sie Lock-by-Pulling im Repository." @@ -2815,7 +2303,7 @@ msgstr "Aktivieren Sie Lock-by-Pulling i msgid "Edit Gist" msgstr "Gist editieren" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " @@ -2824,38 +2312,38 @@ 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:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "Gist Beschreibung ..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "Gist Lebenszeit" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "Verfällt" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 #, fuzzy msgid "Never" msgstr "nie" @@ -2865,7 +2353,8 @@ msgid "Update Gist" msgstr "Gist aktualisieren" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "Abbrechen" @@ -2888,16 +2377,16 @@ msgstr "Öffentliche Gists" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "Neuen Gist erstellen" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "Erstellt" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "Bisher sind keine Gists vorhanden" @@ -2906,45 +2395,47 @@ msgstr "Bisher sind keine Gists vorhande msgid "New Gist" msgstr "Neuer Gist" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." +#: kallithea/templates/admin/gists/new.html:45 +#, fuzzy +#| msgid "name this file..." +msgid "Name this gist ..." msgstr "benenne diese Datei..." -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "Privaten Gist erstellen" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "Öffentlichen Gist erstellen" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "Zurücksetzen" @@ -2954,190 +2445,208 @@ msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/templates/admin/gists/show.html:35 msgid "Public Gist" msgstr "Öffentlicher Gist" -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/templates/admin/gists/show.html:37 msgid "Private Gist" msgstr "Privater Gist" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "Löschen" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "Löschen des Gists bestätigen" -#: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 #: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 #: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 #: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Bearbeiten" -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "erstellt" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "Mein Account" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "Profil" -#: kallithea/templates/admin/my_account/my_account.html:36 -#, fuzzy +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" -msgstr "Neue E-Mailadresse" - -#: kallithea/templates/admin/my_account/my_account.html:38 +msgstr "E-Mail-Adressen" + +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "API Keys" -#: kallithea/templates/admin/my_account/my_account.html:39 -#, fuzzy +#: kallithea/templates/admin/my_account/my_account.html:29 msgid "Owned Repositories" -msgstr "Repositories" - -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 -#, fuzzy +msgstr "Eigene Repositories" + +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" -msgstr "Repositories" - -#: kallithea/templates/admin/my_account/my_account.html:41 +msgstr "Beobachtete Repositories" + +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 -#, fuzzy msgid "Show Permissions" -msgstr "Berechtigungen kopieren" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +msgstr "Berechtigungen anzeigen" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "Mitgeliefert" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 -#, fuzzy, python-format +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#, python-format msgid "Confirm to reset this API key: %s" -msgstr "Zurücksetzen des API Keys \"%s\" bestätigen" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 -#, fuzzy +msgstr "Zurücksetzen des API-Schlüssels \"%s\" bestätigen" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" -msgstr "verfallen" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 -#, fuzzy, python-format +msgstr "Verfallen" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#, python-format msgid "Confirm to remove this API key: %s" -msgstr "Entfernen des API Keys \"%s\" bestätigen" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 -#, fuzzy +msgstr "Entfernen des API-Schlüssels \"%s\" bestätigen" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" -msgstr "entfernen" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 -#, fuzzy +msgstr "Entfernen" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" -msgstr "Keine weiteren API Keys spezifiziert" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 -#, fuzzy +msgstr "Keine weiteren API-Schlüssel angegeben" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" -msgstr "Neuer API Key" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +msgstr "Neuer API-Schlüssel" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "Hinzufügen" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" +"\n" +"API-Schlüssel werden verwendet, um Skripten oder Diensten denselben\n" +"Zugang zu %s zu gewähren, den Sie mit Eingabe Ihres Passworts\n" +"erlangen würden.\n" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" +"\n" +"Ebenso wie Passworte, sollten API-Schlüssel somit niemals mit anderen\n" +"geteilt oder von nicht-vertrauenswürdigen Skripten oder Diensten\n" +"verwendet werden. Falls ein solcher Zugriff zwischenzeitlich passiert " +"sein\n" +"sollte, dann können Sie hier den API-Schlüssel zurücksetzen, um weiteren\n" +"Missbrauchen zu verhindern.\n" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "Primär" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "Löschen der E-Mail \"%s\" bestätigen" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "Keine weiteren E-Mails spezifiziert." -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "Neue E-Mailadresse" @@ -3145,108 +2654,71 @@ msgstr "Neue E-Mailadresse" msgid "Change Your Account Password" msgstr "Passwort des Benutzerkontos ändern" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "Aktuelles Passwort" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "Neues Passwort" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "Bestätige neues Passwort" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" -"Dieses Konto wird mit %s verwaltet und das Passwort kann hier nicht geändert " -"werden" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" -msgstr "Benutzerbild ändern unter" - -#: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "Verwendet" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 -msgid "Avatars are disabled" -msgstr "Avatare sind deaktiviert" - -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "E-Mailadresse fehlt, bitte aktualisieren." - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" +"Dieser Account wird mit %s verwaltet - daher kann das Passwort nicht " +"geändert werden" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 #, fuzzy msgid "Current IP" msgstr "Aktuelle IP-Adresse" +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "Gravatar" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" +msgstr "Benutzerbild %s ändern unter" + +#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +msgid "Avatars are disabled" +msgstr "Avatare sind deaktiviert" + #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" msgstr "Repositories in Ihrem Besitz" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Keine Datensätze gefunden." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "Name" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Repositories, denen Sie folgen" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "Meine Benachrichtigungen" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "Alle" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "Kommentare" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "Pull Requests" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "Markiere alle als gelesen" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "Bisher gibt es keine Benachrichtigungen" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "Zeige Benachrichtigung" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "Benachrichtigungen" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "Standardrechte" @@ -3260,11 +2732,17 @@ msgstr "Global" msgid "IP Whitelist" msgstr "IP Whitelist" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "Anonymer Zugang" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +#, fuzzy +#| msgid "Anonymous access" +msgid "Allow anonymous access" +msgstr "Anonymer Zugang" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " @@ -3273,7 +2751,7 @@ msgstr "" "Unauthentifizierten Zugriff auf Kallithea erlauben. Anonyme Benutzer " "verwenden %s Benutzerrechte." -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " @@ -3283,24 +2761,23 @@ msgstr "" "gesetzt. Beachten Sie, dass alle spezifischen Standardrechte der " "Repositories verloren gehen" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 -#, fuzzy +#: kallithea/templates/admin/permissions/permissions_globals.html:20 msgid "Apply to all existing repositories" -msgstr "Bestehendes Repository importieren?" +msgstr "Auf alle bestehenden Repositories anwenden" + +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "Berechtigungen für neue Repositories des Vorgabe-Benutzers." #: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." -msgstr "Berechtigungen für den Standardbenutzer auf neuen Repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "Repository Gruppe" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "Repository Gruppe" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " @@ -3310,52 +2787,49 @@ msgstr "" "Rechte gesetzt. Beachten Sie, dass all spezifischen Standardrechte der " "Repositorygruppen verloren gehen" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 -#, fuzzy +#: kallithea/templates/admin/permissions/permissions_globals.html:33 msgid "Apply to all existing repository groups" -msgstr "Bestehendes Repository importieren?" - -#: kallithea/templates/admin/permissions/permissions_globals.html:41 -#, fuzzy +msgstr "Auf alle bestehenden Repository-Gruppen anwenden" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." -msgstr "Rechte der übergeordneten Repositorygruppe kopieren." - -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +msgstr "Berechtigungen des Vorgabe-Benutzers für neue Repository-Gruppen." + +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "Benutzergruppe" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 -#, fuzzy +#: kallithea/templates/admin/permissions/permissions_globals.html:45 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -"Alle Standardrechte jeder Benutzergruppe werden auf die gewählten Rechte " -"gesetzt. Beachten Sie, dass alle spezifischen Standardrechte der " -"Benutzergruppen verloren gehen" - -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +"Alle Vorgabe-Berechtigungen jeder Benutzergruppe werden auf die gewählten " +"Berechtigungen zurückgesetzt. Beachten Sie, dass dabei alle Anpassungen " +"von Vorgabe-Berechtigungen für Benutzergruppen verloren gehen" + +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "Auf alle bestehenden Benutzergruppen anwenden" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." -msgstr "Berechtigungen für den Standardbenutzer für neue Benutzergruppen." - -#: kallithea/templates/admin/permissions/permissions_globals.html:60 -#, fuzzy +msgstr "Berechtigungen für neue Benutzergruppen des den Vorgabe-Benutzer." + +#: kallithea/templates/admin/permissions/permissions_globals.html:53 msgid "Top level repository creation" -msgstr "Repository erstellung" - -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "Erstellung eines übergeordneten Repositories" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." msgstr "" "Aktiviere dies, damit Nicht-Administratoren Repositories auf der obersten " "Ebene erstellen können." -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:57 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." @@ -3363,91 +2837,93 @@ msgstr "" "Hinweis: dadurch erhalten auch alle Benutzer API-Zugriff, um überall " "Repositories zu erstellen. Das kann sich in zukünftigen Versionen ändern." -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:61 msgid "Repository creation with group write access" -msgstr "Repository-Erstellung mit Gruppenschreibzugriff" - -#: kallithea/templates/admin/permissions/permissions_globals.html:74 -#, fuzzy +msgstr "Repository-Erstellung mit Gruppen-Schreibzugriff" + +#: kallithea/templates/admin/permissions/permissions_globals.html:64 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -"Schreibrechte einer Repository Gruppe erlauben innerhalb der Gruppe neue " -"Repositorys zu erstellen." - -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +"Falls aktiv, gewährt dies das Recht zum Erzeugen von Repositories in " +"einer Repository-Gruppe. Falls inaktiv, sind Gruppen-" +"Schreibberechtigungen wirkungslos." + +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "Benutzergruppen Erstellung" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" -"Aktivieren Sie dies, damit Nicht-Administratoren Benutzergruppen erstellen " -"können." - -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +"Aktivieren Sie dies, damit Nicht-Administratoren Benutzergruppen " +"erstellen können." + +#: kallithea/templates/admin/permissions/permissions_globals.html:75 msgid "Repository forking" msgstr "Repository-forking" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:78 msgid "Enable this to allow non-admins to fork repositories." msgstr "" "Aktivieren Sie dies, um Nichtadministratoren zu erlauben, Repositories zu " "forken." -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:82 msgid "Registration" msgstr "Registrierung" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#, fuzzy msgid "External auth account activation" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +msgstr "Externe Authentifizierung für Accounts aktivieren" + +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "Bestätigen diese IP zu löschen: %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "Alle IP-Adressen sind zulässig." -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "Neue IP-Adresse" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "Repositorygruppen" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "Gruppen name" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "Übergeordnete Gruppe" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "Rechte der übergeordneten Gruppe kopieren" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "Rechte der übergeordneten Repositorygruppe kopieren." @@ -3456,30 +2932,29 @@ msgstr "Rechte der übergeordneten Repositorygruppe kopieren." msgid "%s Repository Group Settings" msgstr "%s Einstellungen für Repositorygruppen" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "Untergruppe hinzufügen" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "Einstellungen" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "Erweitert" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "Rechte" @@ -3495,7 +2970,7 @@ msgstr "Repositories oberster Ebene" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:7 msgid "Total repositories" -msgstr "" +msgstr "Alle Repositories" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:8 msgid "Children groups" @@ -3504,12 +2979,12 @@ msgstr "Untergruppen" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "Erstellt am" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3520,8 +2995,26 @@ msgstr[1] "Löschen der Gruppe bestätigen: %s mit %s Repositories" msgid "Delete this repository group" msgstr "Diese Repositorygruppe löschen" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "Nicht sichtbar" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "Sichtbar" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "Repository hinzufügen" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "Benutzergruppen hinzufügen oder ändern" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy msgid "User/User Group" @@ -3529,119 +3022,120 @@ msgstr "Benutzer/Benutzergruppe" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 -#, fuzzy msgid "Default" -msgstr "standart" +msgstr "Vorgabe" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 -#, fuzzy msgid "Revoke" -msgstr "entziehen" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +msgstr "Zurückziehen" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +msgstr "Neues hinzufügen" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +msgstr "Auf untergeordnete Elemente anwenden" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "Beide" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +"Setzen oder zurückziehen von Berechtigungen bezüglich aller " +"untergeordneten Elemente, einschließlich nicht-privater Repositories und " +"anderer Gruppen, falls ausgewählt." + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" +"Aktiviere die Sperre-bei-Pull für die Gruppe. Diese Option wird auf alle " +"anderen enthaltenen Gruppen und Repositories angewandt" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "Diese Gruppe löschen" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "Löschen der Gruppe bestätigen" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "mit" +msgid "Repository group %s" +msgstr "Repository-Gruppe %s" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "Repositorygruppenverwaltung" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "Anzahl der Repositories oberster Ebene" -#: kallithea/templates/admin/repos/repo_add_base.html:17 -#, fuzzy +#: kallithea/templates/admin/repos/repo_add_base.html:12 msgid "Clone remote repository" -msgstr "[erstellt] Repository" - -#: kallithea/templates/admin/repos/repo_add_base.html:22 +msgstr "Entferntes Repository clonen" + +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." +"Optional: URL eines entfernten Repositories. Falls gesetzt, dann wird das " +"Repository als Clon von dieser URL erstellt." + +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Halten Sie es kurz und prägnant. Benutzen Sie eine README-Datei für " "längere Beschreibungen." -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:59 +"Wähle bei Bedarf eine Gruppe, der dieses Repository zugeordnet werden " +"soll." + +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "Repository Typ der erstellt werden soll." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Start Revision" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" msgstr "" +"Vorgabe-Revision für Datei-Seiten, Downloads, Volltext-Indizierung und " +"Doku-Erzeugung" #: kallithea/templates/admin/repos/repo_creating.html:9 #, python-format @@ -3650,7 +3144,7 @@ msgstr "%s Erstelle Repository" #: kallithea/templates/admin/repos/repo_creating.html:13 msgid "Creating repository" -msgstr "" +msgstr "Repository erzeugen" #: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format @@ -3658,34 +3152,39 @@ msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" msgstr "" +"Repository \"%(repo_name)s\" wird erzeugt. Sie werden dorthin umgeleitet, " +"sobald der Prozess abgeschlossen ist." #: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." msgstr "" +"Bedauerlicherweise ist bei dieser Operation ein Fehler aufgetreten. Bitte " +"prüfen Sie die Kallithea-Server-Logs or kontaktieren Sie die " +"Administrierenden." #: kallithea/templates/admin/repos/repo_edit.html:8 #, python-format msgid "%s Repository Settings" msgstr "%s Repositoryeinstellungen" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:52 +msgstr "Extra-Feld" + +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit.html:55 +msgstr "Zwischenspeicher" + +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "Entfernt" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "Statistiken" @@ -3694,28 +3193,27 @@ msgid "Parent" msgstr "Übergeordnet" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +msgstr "Setzen" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +"Manuell dieses Repository als Fork einem anderen aus der List zuordnen." + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "Sichtbarkeit des öffentlichen Logbuches" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "Entferne aus dem Öffentlichen Logbuch" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "Zum öffentlichen Logbuch hinzufügen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." @@ -3723,183 +3221,187 @@ msgstr "" "Alle Aktionen, die in diesem Repository ausgeführt wurden, sind im " "öffentlichen Logbuch für jeden einsehbar." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +msgstr "Ändere die Sperrung" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 msgid "Confirm to unlock repository." msgstr "Entsperren des Repositorys bestätigen." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 msgid "Unlock Repository" msgstr "Repository entsperren" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 #, python-format msgid "Locked by %s on %s" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +msgstr "Gesperrt durch %s auf %s" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 msgid "Confirm to lock repository." msgstr "Sperren des Repositorys bestätigen." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Lock Repository" msgstr "Repository sperren" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "Repository ist nicht gesperrt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " "pulling locks the repository; only the user who pulled and locked it can " "unlock it by doing a push." msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +"Erzwinge die Sperre dieses Repositories. Dies funktioniert nur, falls " +"anonymer Zugang abgeschaltet ist. Ein Pull führt zur Sperre des " +"Repositories. Der pullende Nutzer sperrt das Repository; nur dieser " +"Nutzer kann die Sperre durch eine Push-Operation wieder aufheben." + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Löschen des Repositorys bestätigen: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "Dieses Repository löschen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "Dieses Repository hat %s Fork" msgstr[1] "Dieses Repository hat %s Forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "Fork abtrennen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "Forks löschen" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " "it or restore it." msgstr "" +"Das gelöschte Repository wird beiseitegelegt und versteckt, bis ein " +"Administrierender es verfallen lässt. Der Administrierende kann es sowohl " +"permanent löschen oder wiederherstellen." #: kallithea/templates/admin/repos/repo_edit_caches.html:4 msgid "Invalidate Repository Cache" msgstr "Ungültiger Repositorycache" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +"Manuell den Zwischenspeicher für dieses Repository verfallen lassen. Beim " +"ersten Zugriff wird der Zwischenspeicher erneut aufgefüllt." + +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "Liste der zwischengespeicherten Werte" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "Präfix" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Schlüssel" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "Aktiv" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +msgstr "Bezeichnung" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Löschen des Felds bestätigen: %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +msgstr "Eindeutiges Kennzeichen des neuen Felds" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +msgstr "Neue Bezeichnung des Felds" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +msgstr "Eingabe einer kurzen Bezeichnung" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +msgstr "Beschreibung des neuen Felds" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +msgstr "Beschreibung eines Felds eingeben" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "Zusatzfelder sind deaktiviert." -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 -#, fuzzy +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" -msgstr "privates Repository" - -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 -#, fuzzy +msgstr "Privates Repository" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +msgid "Fork of repository" +msgstr "Fork des Repository" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" -msgstr "Repositorium erzeugt %s" - -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 -#, fuzzy +msgstr "URL des entfernten Repository" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" -msgstr "[Pulled von Remote] in Repository" - -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -#, fuzzy -msgid "Confirm to pull changes from remote repository." -msgstr "[Pulled von Remote] in Repository" +msgstr "Hole Änderungen vom entfernten Repository" #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "Bestätige die Abholung von Änderungen vom entfernten Repository." + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 -#, fuzzy +msgstr "Für dieses Repository ist keine nicht-lokale URL angegeben." + +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" -msgstr "privates Repository" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +msgstr "Dauerhafte Repository-Kennung" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +msgstr "Was ist das?" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +msgstr "URL nach Kennung" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3908,36 +3410,47 @@ msgid "" " This is useful for CI systems, or any " "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 -#, fuzzy +"Falls dieses Repository umbenannt oder in eine andere Gruppe verschoben " +"wird, ändert sich seine URL.\n" +"Die Verwendung der permanenten URL garantiert, dass dieses Repository " +"immer über diese URL erreichbar sein wird.\n" +"Dies ist insbesondere für CI-Systeme oder in Fällen nützlich, in denen " +"die URL des Repositories bei Dritten dauerhaft eingetragen wird." + +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" -msgstr "[erstellt] Repository" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 -#, fuzzy +msgstr "Entferntes Repository" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" -msgstr "Repository" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +msgstr "Repository URL" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +"Optional: URL eines entfernten Repositories. Falls gesetzt, dann kann das " +"Repository von dieser URL bezogen werden." + +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "Besitzer des Repositorys ändern." -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "" @@ -3953,7 +3466,7 @@ msgstr "" msgid "Repositories Administration" msgstr "Repositoryverwaltung" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3974,7 +3487,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "Hooks" @@ -3986,279 +3499,271 @@ msgstr "Volltextsuche" msgid "System Info" msgstr "Systeminfo" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "Senden" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "Einstellungen speichern" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom Hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Description" +msgid "Rescan options" +msgstr "Beschreibung" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. " -"Current hooks will be updated to the latest version." +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "Erneut Indizieren" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "Prüfe auf Updates..." + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:7 #, fuzzy msgid "Check for updates" msgstr "Auf Updates prüfen" -#: kallithea/templates/admin/settings/settings_system.html:5 +#: kallithea/templates/admin/settings/settings_system.html:8 msgid "Kallithea configuration file" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:6 +#: kallithea/templates/admin/settings/settings_system.html:9 msgid "Python version" msgstr "Python-Version" -#: kallithea/templates/admin/settings/settings_system.html:7 +#: kallithea/templates/admin/settings/settings_system.html:10 msgid "Platform" msgstr "Plattform" -#: kallithea/templates/admin/settings/settings_system.html:8 +#: kallithea/templates/admin/settings/settings_system.html:11 msgid "Git version" msgstr "Git-Version" -#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/templates/admin/settings/settings_system.html:12 msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" "Hinweis: Bitte stellen Sie sicher, dass der Server auf die URL zugreifen " "kann" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "Prüfe auf Updates..." - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Web" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "Mercurial-Erweiterungen" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 msgid "Enable largefiles extension" msgstr "Erweiterung largefiles aktivieren" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 msgid "Enable hgsubversion extension" msgstr "Erweiterung hgsubversion aktivieren" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 msgid "Location of repositories" msgstr "Ort der Repositories" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "Allgemein" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "Zeige Kallithea-Version" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4275,93 +3780,101 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "Clone-URL" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Repository Größe" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "Icons" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 #, fuzzy msgid "Meta Tagging" msgstr "Einstellungen" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Benutzergruppe hinzufügen" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "Benutzergruppen" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "Benutzergruppe hinzufügen" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "Kurze, optionale Beschreibung für diese Benutzergruppe." @@ -4381,13 +3894,13 @@ msgid "User Group: %s" msgstr "Benutzergruppe: %s" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "Mitglieder" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4396,15 +3909,15 @@ msgstr "" msgid "Delete this user group" msgstr "Diese Benutzergruppe löschen" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Noch keine Mitglieder" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Ausgewählte Grppenmitglieder" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Verfügbare Mitglieder" @@ -4418,17 +3931,17 @@ msgstr "Benutzer hinzufügen" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "Benutzer" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "Benutzer hinzufügen" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "" @@ -4447,12 +3960,12 @@ msgid "User: %s" msgstr "Benutzer: %s" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "Letzter Login" @@ -4461,7 +3974,7 @@ msgid "Member of User Groups" msgstr "Mitglieder der Benutzergruppe" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4470,24 +3983,16 @@ msgstr "" msgid "Delete this user" msgstr "Diesen Benutzer löschen" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "" @@ -4495,223 +4000,224 @@ msgstr "" msgid "Users Administration" msgstr "Benutzerverwaltung" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "Authentifizierungsart" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "Support" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "Mercurial Repository" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "Git Repository" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "Fork erstellen" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "Zusammenfassung" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Dateien" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "Pull Requests" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "Optionen" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "Fork vergleichen" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "" - #: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" -msgstr "" - #: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "Keine Übereinstimmungen gefunden" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "Öffentliches Logbuch" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Meine Pull Requests" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "Nicht eingeloggt" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:379 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "Passwort vergessen?" -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:383 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Kein Account?" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "Keine Übereinstimmungen gefunden" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 #, fuzzy msgid "Inherit defaults" msgstr "Repositorystandards" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "" @@ -4720,231 +4226,176 @@ msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "Rechte" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "Berechtigungen editieren" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "Einen weiteren Kommentar hinzufügen" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "Gruppe" - -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "mitglieder" - -#: kallithea/templates/base/root.html:27 -msgid "Loading ..." -msgstr "" - #: kallithea/templates/base/root.html:28 -msgid "loading ..." +msgid "Retry" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" -msgstr "" +#, fuzzy +#| msgid "Enable downloads" +msgid "Unable to post" +msgstr "Aktiviere Downloads" #: kallithea/templates/base/root.html:31 -#, fuzzy -#| msgid "on pull request" -msgid "Open New Pull Request from {0}" -msgstr "Kommentar von Pull Request" +msgid "Add Another Comment" +msgstr "Einen weiteren Kommentar hinzufügen" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:33 -#, fuzzy -#| msgid "Show Selected Changeset __S" -msgid "Show Selected Changesets {0} → {1}" -msgstr "Ausgewähltes Changeset anzeigen __S" +msgid "Start following this repository" +msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" -msgstr "" +msgid "Group" +msgstr "Gruppe" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" -msgstr "Widerruf der Rechte für {0}: {1} bestätigen?" +msgid "No matching files" +msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "Aktiviert" +#, fuzzy +msgid "Open New Pull Request from {0}" +msgstr "Kommentar von Pull Request" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "Deaktiviert" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#, fuzzy +msgid "Show Selected Changesets {0} → {1}" +msgstr "Ausgewähltes Changeset anzeigen __S" #: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +#, fuzzy +msgid "No revisions" +msgstr "revisionen" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "Widerruf der Rechte für {0}: {1} bestätigen?" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "Änderungssätze auswählen" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "Changeset angeben" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Autor" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Revision" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "Klicken um Aufsteigend zu Sortieren" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "Klicken um Absteigend zu Sortieren" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "Keine Datensätze gefunden." + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "Datenfehler." + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "Lade..." + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 msgid "Go to tip of repository" msgstr "Gehe zum Tip des Repositorys" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "Branch %s" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "Bisher gibt es keine Änderungen" @@ -4960,7 +4411,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "" @@ -4974,129 +4425,142 @@ msgstr "" msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "Alter" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -#, fuzzy -msgid "Push new repository" -msgstr "privates Repository" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" -msgstr "" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, fuzzy, python-format +msgid "Changeset status: %s by %s" +msgstr "Setze Changesetstatus" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%d comment" +#| msgid_plural "%d comments" +msgid "%s comments" +msgstr "%d Kommentar" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "Branch %s" #: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 msgid "Merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 #, fuzzy msgid "Replaced by:" msgstr "Erstellt von" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 #, fuzzy msgid "Preceded by:" msgstr "Erstellt von" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 +#: kallithea/templates/changeset/changeset_file_comment.html:20 #, fuzzy -msgid "No revisions" -msgstr "revisionen" +#| msgid "Comment" +msgid "comment" +msgstr "Kommentar" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy @@ -5116,172 +4580,177 @@ msgstr "%s Changesets" msgid "Delete comment?" msgstr "Kommentar löschen?" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 #, fuzzy msgid "Status change" msgstr "Letzte Änderungen" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "Kommentarvorschau" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "Setze Changesetstatus" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "Keine Änderungen" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "Kommentar von Pull Request" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "Schließen" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "Kommentar" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "Vorschau" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d Kommentar" msgstr[1] "%d Kommentare" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "%d inline" msgstr[1] "%d inline" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "%d generell" msgstr[1] "%d generell" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "Setze Changesetstatus" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "Keine Änderungen" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "Schließen" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:43 -msgid "Show full diff for this file" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 -msgid "Show full side-by-side diff for this file" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:38 -msgid "Show inline comments" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:86 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "Datei entfernt" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Ungeändert" + +#: kallithea/templates/changeset/diff_block.html:42 msgid "Deleted" msgstr "Gelöscht" -#: kallithea/templates/changeset/diff_block.html:89 +#: kallithea/templates/changeset/diff_block.html:44 msgid "Renamed" msgstr "Umbenannt" -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Unbekannte Revision %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Kein Dateiname" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "Datei hinzugefügt" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:43 +msgid "Show full diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 +msgid "Show full side-by-side diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:72 +msgid "Show inline comments" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, python-format msgid "%s changesets" msgstr "%s Changesets" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "zurück" @@ -5292,132 +4761,191 @@ msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "Öffenentliches Repository" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "Abonniere den %s RSS Feed" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "Abonniere den %s ATOM Feed" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Comment on Changeset \"%s\"" +msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset on" +msgstr "Änderungssatz" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Zweig" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Letzte Änderungen" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "" +"Dieser Pull Request wurde geschlossen und kann daher nicht aktualisiert " +"werden." + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "Hallo %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 #, fuzzy -#| msgid "We received a request to create a new password for your account." msgid "We have received a request to reset the password for your account." msgstr "" "Wir haben eine Anforderung erhalten, für deinen Account ein neues " "Passwort zu erstellen." -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "Pull Request [kommentiert] für" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Pull request %s" +msgid "Pull request" +msgstr "Pull Request %s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "" +#, fuzzy, python-format +#| msgid "%(user)s commented on pull request %(age)s" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Pull Request #%s von %s#%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Pull Request [kommentiert] für" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Gruppen name" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5435,7 +4963,7 @@ msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "" @@ -5445,72 +4973,74 @@ msgstr "" msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "oder" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "" +#, fuzzy +msgid "New file type" +msgstr "neue Datei" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 msgid "Commit Changes" msgstr "Änderungen einchecken" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Größe" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "Zuletzt geändert" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "" @@ -5520,7 +5050,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "Datei löschen" @@ -5533,24 +5063,20 @@ msgstr "" msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5558,51 +5084,61 @@ msgid_plural "%s authors" msgstr[0] "%s Autor" msgstr[1] "%s Autoren" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "Branch %s gelöscht" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "" +#: kallithea/templates/files/files_source.html:69 +#, fuzzy +msgid "File is too big to display." +msgstr "Die Datei ist zu groß, um sie anzuzeigen" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" -msgstr "Die Datei ist zu groß, um sie anzuzeigen" +msgid "Show as raw." +msgstr "" #: kallithea/templates/files/files_ypjax.html:5 msgid "annotation" @@ -5622,12 +5158,12 @@ msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "" @@ -5636,35 +5172,35 @@ msgstr "" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Privat" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Berechtigungen kopieren" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5674,40 +5210,40 @@ msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 msgid "ATOM journal feed" msgstr "ATOM Logbuch Feed" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "RSS Logbuch Feed" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "Meine Repositories" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "ATOM Feed für das Öffentliche Logbuch" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "RSS Feed für das Öffentliche Logbuch" @@ -5716,31 +5252,36 @@ msgstr "RSS Feed für das Öffentliche Logbuch" msgid "New Pull Request" msgstr "Neuer Pull Request" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "Titel" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "Revision" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "" @@ -5753,6 +5294,10 @@ msgstr "" msgid "Vote" msgstr "entziehen" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "Alter" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5776,7 +5321,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "" @@ -5803,104 +5348,99 @@ msgstr "Pull Request #%s" msgid "Pull request %s from %s#%s" msgstr "Pull Request #%s von %s#%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "Zusammenfassung der Änderungen" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -msgid "There are no reviewers" -msgstr "Es gibt keine Reviewers" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "in" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "Aktualisierung" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "Registrierung" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "Pull Request Reviewers" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "Änderungen verwerfen" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#, fuzzy +#| msgid "Remove reviewer" +msgid "Reviewers" +msgstr "Reviewer entfernen" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 msgid "Remove reviewer" msgstr "Reviewer entfernen" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 msgid "Potential Reviewers" msgstr "Potentielle Reviewer" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "Als neuen Pull Request speichern" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" -msgstr "Änderungen verwerfen" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "Inhalt des Pull Requests" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5908,7 +5448,6 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull Requests from '%s'" msgstr "Pull Requests von '%s'" @@ -5917,35 +5456,41 @@ msgstr "Pull Requests von '%s'" msgid "Pull Requests to '%s'" msgstr "Pull Requests für '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "Einen neuen Pull Request eröffnen" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "Zeige Pull Requests für '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "Zeige Pull Requests von '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "Von mir erstellte Pull Requests" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Pull Request Reviewers" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" @@ -5959,29 +5504,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "Suche in allen Repositories" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" -msgstr "" - -#: kallithea/templates/search/search.html:62 +msgstr "Suchbegriff" + +#: kallithea/templates/search/search.html:54 msgid "Search in" -msgstr "" - -#: kallithea/templates/search/search.html:65 +msgstr "Suchen in" + +#: kallithea/templates/search/search.html:56 msgid "File contents" -msgstr "" - -#: kallithea/templates/search/search.html:66 +msgstr "Dateiinhalt" + +#: kallithea/templates/search/search.html:57 msgid "Commit messages" -msgstr "" - -#: kallithea/templates/search/search.html:67 +msgstr "Commit Nachrichten" + +#: kallithea/templates/search/search.html:58 msgid "File names" -msgstr "" - -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +msgstr "Dateinamen" + +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "Zugriff verweigert" @@ -5991,80 +5536,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" -msgstr "" - -#: kallithea/templates/summary/statistics.html:39 +msgstr "Aktiviere" + +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" -msgstr "" - -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +msgstr "Dateien" + +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" -msgstr "" - -#: kallithea/templates/summary/statistics.html:390 +msgstr "Mehr anzeigen" + +#: kallithea/templates/summary/statistics.html:405 msgid "commits" -msgstr "" - -#: kallithea/templates/summary/statistics.html:391 +msgstr "Commits" + +#: kallithea/templates/summary/statistics.html:406 msgid "files added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:392 +msgstr "Dateien hinzugefügt" + +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:393 +msgstr "Dateien geändert" + +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:395 +msgstr "Dateien entfernt" + +#: kallithea/templates/summary/statistics.html:410 msgid "commit" -msgstr "" - -#: kallithea/templates/summary/statistics.html:396 +msgstr "Commit" + +#: kallithea/templates/summary/statistics.html:411 msgid "file added" -msgstr "" - -#: kallithea/templates/summary/statistics.html:397 +msgstr "Datei hinzugefügt" + +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" -msgstr "" - -#: kallithea/templates/summary/statistics.html:398 +msgstr "Datei geändert" + +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" -msgstr "" - -#: kallithea/templates/summary/summary.html:4 +msgstr "Datei entfernt" + +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "" @@ -6072,85 +5617,218 @@ msgstr "" msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "Clone von" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "Clone-URL" - -#: kallithea/templates/summary/summary.html:78 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:68 msgid "Show by ID" msgstr "" -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:73 +msgid "Show by Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" -msgstr "" - -#: kallithea/templates/summary/summary.html:125 +msgstr "Herunterladen als zip" + +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" -msgstr "" - -#: kallithea/templates/summary/summary.html:186 +msgstr "Feed" + +#: kallithea/templates/summary/summary.html:175 msgid "Latest Changes" msgstr "Letzte Änderungen" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:177 msgid "Quick Start" msgstr "Schnelleinstieg" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +#, fuzzy +msgid "Push new repository" +msgstr "privates Repository" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" -msgstr "" - -#: kallithea/templates/summary/summary.html:293 +msgstr "Liesmich-Datei von Revision %s:%s" + +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" -msgstr "" - -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s Tags" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "Tags vergleichen" +msgstr "%s als %s herunterladen" + +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "" +#~ "Es gibt keinen durchsuchbaren Index. Bitte den Whoosh Indizierer " +#~ "ausführen" + +#~ msgid "IP %s not allowed" +#~ msgstr "IP-Adresse %s ist nicht erlaubt" + +#, fuzzy +#~ msgid "%(user)s commented on changeset %(age)s" +#~ msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" + +#, fuzzy +#~ msgid "%(user)s sent message %(age)s" +#~ msgstr "%(user)s hat am %(when)s eine Nachricht gesendet" + +#, fuzzy +#~ msgid "%(user)s mentioned you %(age)s" +#~ msgstr "%(user)s hat Sie am %(when)s erwähnt" + +#, fuzzy +#~ msgid "%(user)s registered in Kallithea %(age)s" +#~ msgstr "%(user)s hat sich am %(when)s bei Kallithea registriert" + +#, fuzzy +#~ msgid "%(user)s opened new pull request %(age)s" +#~ msgstr "%(user)s hat am %(when)s einen neuen Pull Request eröffnet" + +#, fuzzy +#~ msgid "%(user)s commented on pull request %(age)s" +#~ msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" + +#~ msgid "%(user)s commented on changeset at %(when)s" +#~ msgstr "%(user)s hat am %(when)s ein Changeset kommentiert" + +#~ msgid "%(user)s sent message at %(when)s" +#~ msgstr "%(user)s hat am %(when)s eine Nachricht gesendet" + +#~ msgid "%(user)s mentioned you at %(when)s" +#~ msgstr "%(user)s hat Sie am %(when)s erwähnt" + +#~ msgid "%(user)s registered in Kallithea at %(when)s" +#~ msgstr "%(user)s hat sich am %(when)s bei Kallithea registriert" + +#~ msgid "%(user)s opened new pull request at %(when)s" +#~ msgstr "%(user)s hat am %(when)s einen neuen Pull Request eröffnet" + +#~ msgid "%(user)s commented on pull request at %(when)s" +#~ msgstr "%(user)s hat am %(when)s einen Pull Request kommentiert" + +#, fuzzy +#~| msgid "Repository group" +#~ msgid "Repository Group" +#~ msgstr "Repository Gruppe" + +#~ msgid "My Notifications" +#~ msgstr "Meine Benachrichtigungen" + +#~ msgid "All" +#~ msgstr "Alle" + +#~ msgid "Comments" +#~ msgstr "Kommentare" + +#~ msgid "Mark All Read" +#~ msgstr "Markiere alle als gelesen" + +#~ msgid "Mark as read" +#~ msgstr "Markiere als gelesen" + +#~ msgid "No notifications here yet" +#~ msgstr "Bisher gibt es keine Benachrichtigungen" + +#~ msgid "Show Notification" +#~ msgstr "Zeige Benachrichtigung" + +#~ msgid "Notifications" +#~ msgstr "Benachrichtigungen" + +#~ msgid "with" +#~ msgstr "mit" + +#~ msgid "members" +#~ msgstr "mitglieder" + +#~ msgid "Author" +#~ msgstr "Autor" + +#, fuzzy +#~| msgid "on pull request" +#~ msgid "Pull request from" +#~ msgstr "Kommentar von Pull Request" + +#, fuzzy +#~| msgid "Date" +#~ msgid "at" +#~ msgstr "Datum" + +#~ msgid "There are no reviewers" +#~ msgstr "Es gibt keine Reviewers" + +#~ msgid "Pull Request Reviewers" +#~ msgstr "Pull Request Reviewers" + +#~ msgid "Dashboard" +#~ msgstr "Übersichtsseite" + +#~ msgid "Group Name" +#~ msgstr "Gruppenname" + +#~ msgid "Remember me" +#~ msgstr "Login Speichern" + +#~ msgid "name this file..." +#~ msgstr "benenne diese Datei..." + +#~ msgid "Change your avatar at" +#~ msgstr "Benutzerbild ändern unter" + +#~ msgid "Using" +#~ msgstr "Verwendet" + +#~ msgid "Missing email, please update your user email address." +#~ msgstr "E-Mailadresse fehlt, bitte aktualisieren." + +#~ msgid "Web" +#~ msgstr "Web" + +#~ msgid "quick filter..." +#~ msgstr "Schnellfilter..." + +#~ msgid "Forgot password ?" +#~ msgstr "Passwort vergessen?" + +#~ msgid "Repository Size" +#~ msgstr "Repository Größe" #~ msgid "No comments." #~ msgstr "Keine Kommentare." @@ -6194,12 +5872,6 @@ msgstr "Tags vergleichen" #~ msgid "invalid clone URL" #~ msgstr "ungültige Clone-URL" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "Voreinstellungen" @@ -6221,9 +5893,6 @@ msgstr "Tags vergleichen" #~ msgid "delete" #~ msgstr "löschen" -#~ msgid "" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "Rechteverwaltung" @@ -6251,14 +5920,9 @@ msgstr "Tags vergleichen" #~ msgid "admin" #~ msgstr "admin" -#~ msgid "delegated admin" +#~ msgid "Optional URL from which repository should be cloned." #~ msgstr "" - -#~ msgid "apply to children" -#~ msgstr "" - -#~ msgid "Optional URL from which repository should be cloned." -#~ msgstr "Optionale http[s] URL, von welcher das Repository geclont werden soll." +#~ "Optionale http[s] URL, von welcher das Repository geclont werden soll." #~ msgid "Remote URL" #~ msgstr "Remote URL" @@ -6266,36 +5930,12 @@ msgstr "Tags vergleichen" #~ msgid "Pull Changes from Remote Location" #~ msgstr "Änderungen von entferntem Ort übertragen" -#~ msgid "Confirm to pull changes from remote side." -#~ msgstr "" - -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - -#~ msgid "Non-changeable id" -#~ msgstr "" - #~ msgid "edit" #~ msgstr "bearbeiten" -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - #~ msgid "Email prefix" #~ msgstr "E-Mail-Präfix" -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - #~ msgid "SMTP server" #~ msgstr "SMTP-Server" @@ -6308,60 +5948,15 @@ msgstr "Tags vergleichen" #~ msgid "SMTP port" #~ msgstr "SMTP-Port" -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - -#~ msgid "Destroy old data" -#~ msgstr "" - -#~ msgid "Meta-Tagging" -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "Standart Rechte" #~ msgid "user groups" #~ msgstr "Benutzergruppen" -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "Push new repo" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "merge" -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "Statusänderung durch Pull Request" -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - #~ msgid "Mimetype" #~ msgstr "MIME-Type" @@ -6371,29 +5966,9 @@ msgstr "Tags vergleichen" #~ msgid "Latest vote: %s" #~ msgstr "Letzte Stimmabgabe: %s" -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "%s Pull Request #%s" -#~ msgstr "" - -#~ msgid "owner" -#~ msgstr "" - -#~ msgid "reviewer" +#~ msgid "This pull request can be updated with changes on %s:" #~ msgstr "" - -#~ msgid "with subrepos" -#~ msgstr "" - -#~ msgid "" -#~ "Your password reset was successful, new" -#~ " password has been sent to your " -#~ "email" -#~ msgstr "" -#~ "Das Zurücksetzen des Passworted war " -#~ "erfolgreich, ein neues Passwort wurde an" -#~ " ihre EMail Addresse gesendet" +#~ "Dieser Pull Request kann mit Änderungen in %s aktualisiert werden:" #~ msgid "Your new password" #~ msgstr "Dein neues Passwort" @@ -6401,19 +5976,158 @@ msgstr "Tags vergleichen" #~ msgid "Your new Kallithea password:%s" #~ msgstr "Ihr neues Kallithea-Passwort: %s" -#~ msgid "Open New Pull Request for Selected Changesets" -#~ msgstr "" - -#~ msgid "Show Selected Changesets __S → __E" -#~ msgstr "" +#~ msgid "Comment preview" +#~ msgstr "Kommentarvorschau" + +#~ msgid "Preview" +#~ msgstr "Vorschau" #~ msgid "You can generate it by clicking following URL" #~ msgstr "Du kannst es über die folgende URL erstellen" -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" -#~ "Bitte ignoriere diese E-Mail, wenn du" -#~ " kein neues Passwort angefordert hast." - #~ msgid "Created by" #~ msgstr "Erstellt von" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Geschlossen, ersetzt durch %s." + +#~ msgid "Closing." +#~ msgstr "Schließen." + +#~ msgid "Repository no access" +#~ msgstr "Kein Zugriff auf Repository" + +#~ msgid "Repository read access" +#~ msgstr "Lesender Zugriff auf Repository" + +#~ msgid "Repository write access" +#~ msgstr "Schreibdender Zugriff auf Repository" + +#~ msgid "Repository admin access" +#~ msgstr "Administrativer Zugang zum Repository" + +#~ msgid "Repository Group no access" +#~ msgstr "Repository Gruppe hat Keinen Zugriff" + +#~ msgid "Repository Group read access" +#~ msgstr "Repository Gruppe hat lesenden Zugriff" + +#~ msgid "Repository Group write access" +#~ msgstr "Repository Gruppe hat schreibenden Zugriff" + +#~ msgid "Repository Group admin access" +#~ msgstr "Repository Gruppe hat Administrativen Zugriff" + +#~ msgid "Repository creation disabled" +#~ msgstr "Erstellung eines Repositorys deaktiviert" + +#~ msgid "Repository creation enabled" +#~ msgstr "Erstellung eines Repositorys aktiviert" + +#~ msgid "Repository forking disabled" +#~ msgstr "Forking eines Repositorys deaktiviert" + +#~ msgid "Repository forking enabled" +#~ msgstr "Forking eines Repositorys aktiviert" + +#~ msgid "Register disabled" +#~ msgstr "Registrierung deaktiviert" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "" +#~ "Registrierung neuer Benutzer in Kallithea mit manueller Aktivierung" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "" +#~ "Registrierung neuer Benutzer in Kallithea mit Automatischer Aktivierung" + +#~ msgid "Not Reviewed" +#~ msgstr "Nicht Begutachtet" + +#~ msgid "Rejected" +#~ msgstr "Abgelehnt" + +#~ msgid "Under Review" +#~ msgstr "In Begutachtung" + +#~ msgid "Repository group no access" +#~ msgstr "Kein Zugriff für Repositorygruppe" + +#~ msgid "Repository group read access" +#~ msgstr "Lesezugriff für Repositorygruppe" + +#~ msgid "Repository group write access" +#~ msgstr "Schreibzugriff für Repositorygruppe" + +#~ msgid "Repository group admin access" +#~ msgstr "Administrativer Zugriff für Repositorygruppe" + +#~ msgid "User group no access" +#~ msgstr "Kein Zugriff für Benutzergruppe" + +#~ msgid "User group read access" +#~ msgstr "Lesezugriff für Benutzergruppe" + +#~ msgid "User group write access" +#~ msgstr "Nutzergruppe Schreibzugriff" + +#~ msgid "User group admin access" +#~ msgstr "Administrativer Zugriff für Benutzergruppe" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Erstellung von Repositorygruppen deaktiviert" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Erstellung von Repositorygruppen aktiviert" + +#~ msgid "User Group creation disabled" +#~ msgstr "Erstellung von Benutzergruppen deaktiviert" + +#~ msgid "User Group creation enabled" +#~ msgstr "Erstellung von Benutzergruppen aktiviert" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Benutzerregistrierung mit manueller Kontoaktivierung" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Benutzerregistrierung mit automatische Kontoaktivierung" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "Review Request für %(repo_name)s Pull Request #%(pr_id)s von %(ref)s " +#~ "erstellt von %(pr_username)s" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "Kommentar von %(comment_username)s für %(repo_name)s Pull Request #" +#~ "%(pr_id)s von %(ref)s" + +#~ msgid "repositories" +#~ msgstr "Repositories" + +#~ msgid "No repositories found." +#~ msgstr "Keine Repositories gefunden." + +#~ msgid "There are no branches yet" +#~ msgstr "Es gibt bisher keine Branches" + +#~ msgid "There are no tags yet" +#~ msgstr "Es gibt bisher keine Tags" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Es gibt bisher keine Lesezeichen" + +#~ msgid "enabled" +#~ msgstr "Aktiviert" + +#~ msgid "Update" +#~ msgstr "Aktualisierung" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Als neuen Pull Request speichern" + +#~ msgid "%s Tags" +#~ msgstr "%s Tags" + +#~ msgid "Compare Tags" +#~ msgstr "Tags vergleichen" diff --git a/kallithea/i18n/el/LC_MESSAGES/kallithea.po b/kallithea/i18n/el/LC_MESSAGES/kallithea.po new file mode 100644 --- /dev/null +++ b/kallithea/i18n/el/LC_MESSAGES/kallithea.po @@ -0,0 +1,5504 @@ +# Greek translations for Kallithea. +# Copyright (C) 2015 Various authors, licensing as GPLv3 +# This file is distributed under the same license as the Kallithea project. +# Automatically generated, 2015. +# +msgid "" +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: 2017-06-14 18:51+0000\n" +"Last-Translator: Asterios Dimitriou \n" +"Language-Team: Greek \n" +"Language: el\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 2.15-dev\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +msgid "There are no changesets yet" +msgstr "Δεν υπάρχουν σετ αλλαγών ακόμα" + +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/base/perms_summary.html:14 +msgid "None" +msgstr "Χωρίς" + +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +msgid "(closed)" +msgstr "(κλειστό)" + +#: kallithea/controllers/changeset.py:83 +msgid "Show whitespace" +msgstr "Εμφάνιση κενού" + +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 +#: kallithea/templates/files/diff_2way.html:55 +msgid "Ignore whitespace" +msgstr "Αγνόηση κενού" + +#: kallithea/controllers/changeset.py:163 +#, python-format +msgid "Increase diff context to %(num)s lines" +msgstr "Αύξηση του diff πλαισίου σε %(num)s γραμμές" + +#: kallithea/controllers/changeset.py:203 +#, fuzzy +#| msgid "No permission to change pull request status" +msgid "No permission to change status" +msgstr "Χωρίς δικαιώματα αλλαγής της κατάστασης του αιτήματος έλξης" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 +msgid "Such revision does not exist for this repository" +msgstr "Δεν υπάρχει τέτοια αναθεώρηση για αυτό το αποθετήριο" + +#: kallithea/controllers/compare.py:66 +#, fuzzy, python-format +#| msgid "Error creating repository %s" +msgid "Could not find other repository %s" +msgstr "Βλάβη κατά τη δημιουργία του αποθετηρίου %s" + +#: kallithea/controllers/compare.py:72 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "" +"Δεν μπορεί να γίνει σύγκριση αποθετηρίων χωρίς να χρησιμοποιηθεί κοινός " +"πρόγονος" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 +msgid "Cannot compare repositories without using common ancestor" +msgstr "" +"Δεν μπορεί να γίνει σύγκριση αποθετηρίων χωρίς να χρησιμοποιηθεί κοινός " +"πρόγονος" + +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "Χωρίς απόκριση" + +#: kallithea/controllers/error.py:71 +msgid "Unknown error" +msgstr "Άγνωστο λάθος" + +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" +"Η αίτηση δεν μπόρεσε να ερμηνευτεί από τον εξυπηρετητή λόγω κακής " +"διατύπωσης." + +#: kallithea/controllers/error.py:87 +msgid "Unauthorized access to resource" +msgstr "Ανεξουσιοδοτημένη πρόσβαση στον πόρο" + +#: kallithea/controllers/error.py:89 +msgid "You don't have permission to view this page" +msgstr "Δεν έχετε άδεια για να εμφανίσετε αυτή τη σελίδα" + +#: kallithea/controllers/error.py:91 +msgid "The resource could not be found" +msgstr "Ο πόρος δεν μπορεί να βρεθεί" + +#: kallithea/controllers/error.py:93 +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." +msgstr "" +"Ο εξυπηρετητής συνάντησε μια απρόσμενη κατάσταση που τον απέτρεψαν να " +"πραγματοποιήσει την αίτηση." + +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "%s συνέβαλε στο %s" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "Το σετ αλλαγών ήταν πολύ μεγάλο και περικόπηκε..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#, python-format +msgid "%s %s feed" +msgstr "%s %s τροφοδοσία" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" +msgstr "Αλλαγές στο αποθετήριο %s" + +#: kallithea/controllers/files.py:92 +msgid "Click here to add new file" +msgstr "Κλικ εδώ για προθήκη νέου αρχείου" + +#: kallithea/controllers/files.py:93 +#, python-format +msgid "There are no files yet. %s" +msgstr "Δεν υπάρχουν αρχεία ακόμα. %s" + +#: kallithea/controllers/files.py:194 +#, python-format +msgid "%s at %s" +msgstr "%s την %s" + +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 +#, python-format +msgid "This repository has been locked by %s on %s" +msgstr "Το αποθετήριο κλειδώθηκε από %s την %s" + +#: kallithea/controllers/files.py:312 +#, fuzzy +msgid "You can only delete files with revision being a valid branch" +msgstr "" +"Μπορείτε να διαγράψετε μόνο αρχεία σε αναθεώρηση που βρίσκονται σε έγκυρη " +"διακλάδωση " + +#: kallithea/controllers/files.py:323 +#, python-format +msgid "Deleted file %s via Kallithea" +msgstr "Διαγραφή αρχείου %s μέσω του Kallithea" + +#: kallithea/controllers/files.py:345 +#, python-format +msgid "Successfully deleted file %s" +msgstr "Επιτυχής διαγραφή αρχείου %s" + +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 +msgid "Error occurred during commit" +msgstr "Συνέβη λάθος κατά το commit" + +#: kallithea/controllers/files.py:372 +msgid "You can only edit files with revision being a valid branch" +msgstr "" +"Μπορείτε να επεξεργαστείτε μόνο αρχεία σε αναθεώρηση που βρίσκονται σε " +"έγκυρη διακλάδωση" + +#: kallithea/controllers/files.py:386 +#, python-format +msgid "Edited file %s via Kallithea" +msgstr "Επεξεργασία αρχείου %s μέσω του Kallithea" + +#: kallithea/controllers/files.py:402 +msgid "No changes" +msgstr "Καμία αλλαγή" + +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#, python-format +msgid "Successfully committed to %s" +msgstr "Επιτυχής παράδοση σε %s" + +#: kallithea/controllers/files.py:438 +msgid "Added file via Kallithea" +msgstr "Προσθήκη αρχείου μέσω Kallithea" + +#: kallithea/controllers/files.py:459 +msgid "No content" +msgstr "Χωρίς περιεχόμενο" + +#: kallithea/controllers/files.py:463 +msgid "No filename" +msgstr "Χωρίς όνομα αρχείου" + +#: kallithea/controllers/files.py:488 +msgid "Location must be relative path and must not contain .. in path" +msgstr "" +"Η τοποθεσία πρέπει να είναι σχετική διαδρομή και να μην περιέχει .. μέσα " +"της" + +#: kallithea/controllers/files.py:520 +msgid "Downloads disabled" +msgstr "Οι μεταφορτώσεις απενεργοποιήθηκαν" + +#: kallithea/controllers/files.py:531 +#, python-format +msgid "Unknown revision %s" +msgstr "Άγνωστη αναθεώρηση %s" + +#: kallithea/controllers/files.py:533 +msgid "Empty repository" +msgstr "Άδειο αποθετήριο" + +#: kallithea/controllers/files.py:535 +msgid "Unknown archive type" +msgstr "Άγνωστος τύπος αρχειοθέτησης" + +#: kallithea/controllers/files.py:756 +#: 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/model/scm.py:706 +msgid "Branches" +msgstr "Κλάδοι" + +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +msgid "Tags" +msgstr "Ετικέτες" + +#: kallithea/controllers/forks.py:174 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Συνέβει ένα λάθος κατά την διακλάδωση του αποθετηρίου %s" + +#: kallithea/controllers/home.py:78 +msgid "Groups" +msgstr "Ομάδες" + +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repos/repo_add.html:12 +#: kallithea/templates/admin/repos/repo_add.html:16 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/users/user_edit_advanced.html:6 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +msgid "Repositories" +msgstr "Αποθετήρια" + +#: kallithea/controllers/home.py:121 +#: kallithea/templates/files/files_add.html:32 +#: kallithea/templates/files/files_delete.html:23 +#: kallithea/templates/files/files_edit.html:32 +msgid "Branch" +msgstr "Κλάδος" + +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Κλειστοί Κλάδοι" + +#: kallithea/controllers/home.py:133 +msgid "Tag" +msgstr "Ετικέτα" + +#: kallithea/controllers/home.py:139 +msgid "Bookmark" +msgstr "Σελιδοδείκτης" + +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/templates/journal/public_journal.html:4 +#: kallithea/templates/journal/public_journal.html:18 +msgid "Public Journal" +msgstr "Δημόσιο Ημερολόγιο" + +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +msgid "Journal" +msgstr "Ημερολόγιο" + +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +msgid "Bad captcha" +msgstr "Λάθος captcha" + +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "Εγγραφήκατε επιτυχώς στο %s" + +#: kallithea/controllers/login.py:189 +msgid "A password reset confirmation code has been sent" +msgstr "Στάλθηκε ένας κωδικός επιβεβαίωσης επαναφοράς του συνθηματικού" + +#: kallithea/controllers/login.py:238 +msgid "Invalid password reset token" +msgstr "Άκυρο τεκμήριο (token) επαναφοράς του συνθηματικού" + +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 +msgid "Successfully updated password" +msgstr "Το συνθηματικό ενημερώθηκε επιτυχώς" + +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "Καθορίστηκε άκυρος σχολιαστής \"%s\"" + +#: kallithea/controllers/pullrequests.py:133 +#, python-format +msgid "%s (closed)" +msgstr "%s (κλειστό)" + +#: kallithea/controllers/pullrequests.py:160 +#: kallithea/templates/changeset/changeset.html:12 +msgid "Changeset" +msgstr "Σετ αλλαγών" + +#: kallithea/controllers/pullrequests.py:181 +msgid "Special" +msgstr "Ειδικός" + +#: kallithea/controllers/pullrequests.py:182 +msgid "Peer branches" +msgstr "Ομότιμοι κλάδοι" + +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +msgid "Bookmarks" +msgstr "Σελιδοδείκτες" + +#: kallithea/controllers/pullrequests.py:320 +#, python-format +msgid "Error creating pull request: %s" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 +msgid "Error occurred while creating pull request" +msgstr "Λάθος κατά τη δημιουργία αιτήματος έλξης (pull request)" + +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς" + +#: kallithea/controllers/pullrequests.py:375 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Δημιουργήθηκε ενημέρωση αιτήματος έλξης" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Χωρίς περιγραφή" + +#: kallithea/controllers/pullrequests.py:432 +msgid "Pull request updated" +msgstr "Ενημερώθηκε η αίτηση έλξης" + +#: kallithea/controllers/pullrequests.py:445 +msgid "Successfully deleted pull request" +msgstr "Επιτυχής διαγραφή αιτήματος έλξης" + +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "Δεν βρέθηκαν σετ αλλαγών για ενημέρωση αυτού του αιτήματος έλξης." + +#: kallithea/controllers/pullrequests.py:522 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "Το αίτημα έλξης έχει ήδη συγχωνευτεί με το %s." + +#: kallithea/controllers/pullrequests.py:524 +msgid "This pull request has been closed and can not be updated." +msgstr "Αυτό το αίτημα έλξης έχει κλείσει και δεν μπορεί να ενημερωθεί." + +#: kallithea/controllers/pullrequests.py:543 +#, fuzzy, python-format +#| msgid "The following changes are available on %s:" +msgid "The following additional changes are available on %s:" +msgstr "Οι ακόλουθες αλλαγές είναι διαθέσιμες στο %s:" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." +msgstr "Δεν βρέθηκαν σετ αλλαγών για ενημέρωση αυτού του αιτήματος έλξης." + +#: kallithea/controllers/pullrequests.py:557 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "Σημείωση: Ο κλάδος %s έχει άλλη κεφαλή (head): %s." + +#: kallithea/controllers/pullrequests.py:564 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." +msgstr "Αιτήματα έλξης του git δεν υποστηρίζουν ακόμα ενημερώσεις." + +#: kallithea/controllers/pullrequests.py:566 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "Δεν βρέθηκαν σετ αλλαγών για ενημέρωση αυτού του αιτήματος έλξης." + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 +msgid "Invalid search query. Try quoting it." +msgstr "Άκυρο αίτημα αναζήτησης. Δοκιμάστε με εισαγωγικά." + +#: kallithea/controllers/search.py:140 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 +msgid "An error occurred during search operation." +msgstr "Ένα λάθος συνέβη κατά την διαδικασία αναζήτησης." + +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 +msgid "No data ready yet" +msgstr "Δεν υπάρχουν ακόμα έτοιμα δεδομένα" + +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 +msgid "Statistics are disabled for this repository" +msgstr "Τα στατιστικά είναι απενεργοποιημένα για αυτό το αποθετήριο" + +#: kallithea/controllers/admin/auth_settings.py:135 +msgid "Auth settings updated successfully" +msgstr "Οι ρυθμίσεις εξουσιοδότησης ενημερώθηκαν επιτυχώς" + +#: kallithea/controllers/admin/auth_settings.py:146 +msgid "error occurred during update of auth settings" +msgstr "παρουσιάστηκε βλάβη κατά την ενημέρωση των ρυθμίσεων εξουσιοδότησης" + +#: kallithea/controllers/admin/defaults.py:75 +msgid "Default settings updated successfully" +msgstr "Οι προεπιλεγμένες ρυθμίσεις ενημερώθηκαν επιτυχώς" + +#: kallithea/controllers/admin/defaults.py:90 +msgid "Error occurred during update of defaults" +msgstr "Συνέβη μία βλάβη κατά την ενημέρωση των προεπιλογών" + +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "Πάντα" + +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 λεπτά" + +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "1 ώρα" + +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "1 ημέρα" + +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 +msgid "1 month" +msgstr "1 μήνας" + +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 +msgid "Lifetime" +msgstr "Διάρκεια ζωής" + +#: kallithea/controllers/admin/gists.py:140 +msgid "Error occurred during gist creation" +msgstr "Συνέβη μία βλάβη κατά τη δημιουργία του gist" + +#: kallithea/controllers/admin/gists.py:156 +#, python-format +msgid "Deleted gist %s" +msgstr "Διαγράφηκε το gist %s" + +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "Mη τροποποιημένo" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "Το περιεχόμενο του gist ενημερώθηκε επιτυχώς" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "Τα δεδομένα του gist ενημερώθηκαν επιτυχώς" + +#: kallithea/controllers/admin/gists.py:233 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "Σφάλμα συνέβη κατά την ενημέρωση του gist %s" + +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 +msgid "You can't edit this user since it's crucial for entire application" +msgstr "" +"Δεν μπορείτε να επεξεργαστείτε αυτόν το χρήστη καθώς είναι κρίσιμος για " +"όλη την εφαρμογή" + +#: kallithea/controllers/admin/my_account.py:117 +msgid "Your account was updated successfully" +msgstr "Ο λογαριασμός σας ενημερώθηκε επιτυχώς" + +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "Συνέβη ένα σφάλμα κατά την ενημέρωση του χρήστη %s" + +#: kallithea/controllers/admin/my_account.py:166 +msgid "Error occurred during update of user password" +msgstr "Συνέβη ένα σφάλμα κατά την ενημέρωση του κωδικού του χρήστη" + +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 +#, python-format +msgid "Added email %s to user" +msgstr "Προστέθηκε το email %s στον χρήστη" + +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 +msgid "An error occurred during email saving" +msgstr "Συνέβη ένα σφάλμα κατά την αποθήκευση του email" + +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 +msgid "Removed email from user" +msgstr "Αφαιρέθηκε το email από τον χρήστη" + +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "Το API κλειδί δημιουργήθηκε επιτυχώς" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "Το API κλειδί επαναφέρθηκε επιτυχώς" + +#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/users.py:285 +msgid "API key successfully deleted" +msgstr "Το API κλειδί διαγράφηκε επιτυχώς" + +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "Read" +msgstr "Ανάγνωση" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "Write" +msgstr "Εγγραφή" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 +#: kallithea/templates/base/perms_summary.html:17 +msgid "Admin" +msgstr "Διαχειριστής" + +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "Απενεργοποιημένο" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Επιτρέπεται με χειροποίητη ενεργοποίηση του λογαριασμού" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Επιτρέπεται με αυτόματη ενεργοποίηση του λογαριασμού" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "Χειροποίητη ενεργοποίηση εξωτερικού λογαριασμού" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "Αυτόματη ενεργοποίηση εξωτερικού λογαριασμού" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 +msgid "Enabled" +msgstr "Ενεργό" + +#: kallithea/controllers/admin/permissions.py:125 +msgid "Global permissions updated successfully" +msgstr "Τα καθολικά δικαιώματα ενημερώθηκαν επιτυχώς" + +#: kallithea/controllers/admin/permissions.py:140 +msgid "Error occurred during update of permissions" +msgstr "Συνέβει μια βλάβη κατά την ενημέρωση των δικαιωμάτων" + +#: kallithea/controllers/admin/repo_groups.py:174 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "Συνέβει μια βλάβη κατά την δημιουργία της ομάδας αποθετηρίου %s" + +#: kallithea/controllers/admin/repo_groups.py:179 +#, python-format +msgid "Created repository group %s" +msgstr "Δημιουργήθηκε η ομάδα αποθετηρίου %s" + +#: kallithea/controllers/admin/repo_groups.py:226 +#, python-format +msgid "Updated repository group %s" +msgstr "Ενημερώθηκε η ομάδα αποθετηρίου %s" + +#: kallithea/controllers/admin/repo_groups.py:242 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "Συνέβει μια βλάβη κατά την ενημέρωση της ομάδας αποθετηρίου %s" + +#: kallithea/controllers/admin/repo_groups.py:252 +#, python-format +msgid "This group contains %s repositories and cannot be deleted" +msgstr "Αυτή η ομάδα περιέχει %s αποθετήρια και δε μπορεί να διαγραφεί" + +#: kallithea/controllers/admin/repo_groups.py:259 +#, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "Αυτή η ομάδα περιέχει %s υποομάδες και δε μπορεί να διαγραφεί" + +#: kallithea/controllers/admin/repo_groups.py:265 +#, python-format +msgid "Removed repository group %s" +msgstr "Αφαιρέθηκε η ομάδα αποθετηρίου %s" + +#: kallithea/controllers/admin/repo_groups.py:270 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "Συνέβει μια βλάβη κατά την διαγραφή της ομάδας αποθετηρίου %s" + +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 +msgid "Cannot revoke permission for yourself as admin" +msgstr "Δεν μπορείτε να ανακαλέσετε την άδεια σας ως διαχειριστής" + +#: kallithea/controllers/admin/repo_groups.py:369 +msgid "Repository group permissions updated" +msgstr "Τα δικαιώματα της ομάδας αποθετηρίου ενημερώθηκαν" + +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 +msgid "An error occurred during revoking of permission" +msgstr "Συνέβει μια βλάβη κατά την ανάκληση της άδειας" + +#: kallithea/controllers/admin/repos.py:137 +#, python-format +msgid "Error creating repository %s" +msgstr "Βλάβη κατά τη δημιουργία του αποθετηρίου %s" + +#: kallithea/controllers/admin/repos.py:195 +#, python-format +msgid "Created repository %s from %s" +msgstr "Δημιουργήθηκε το αποθετήριο %s από το %s" + +#: kallithea/controllers/admin/repos.py:204 +#, python-format +msgid "Forked repository %s as %s" +msgstr "Κλωνοποιήθηκε το αποθετηρίο %s ως %s" + +#: kallithea/controllers/admin/repos.py:207 +#, python-format +msgid "Created repository %s" +msgstr "Δημιουργήθηκε το αποθετήριο %s" + +#: kallithea/controllers/admin/repos.py:236 +#, python-format +msgid "Repository %s updated successfully" +msgstr "Το αποθετήριο %s ενημερώθηκε επιτυχώς" + +#: kallithea/controllers/admin/repos.py:256 +#, python-format +msgid "Error occurred during update of repository %s" +msgstr "Συνέβει μια βλάβη κατά την ενημέρωση του αποθετηρίου %s" + +#: kallithea/controllers/admin/repos.py:274 +#, python-format +msgid "Detached %s forks" +msgstr "Αποσυνδέθηκαν %s κλώνοι" + +#: kallithea/controllers/admin/repos.py:277 +#, python-format +msgid "Deleted %s forks" +msgstr "Διαγράφηκαν %s κλώνοι" + +#: kallithea/controllers/admin/repos.py:282 +#, python-format +msgid "Deleted repository %s" +msgstr "Διαγράφηκε το αποθετήριο %s" + +#: kallithea/controllers/admin/repos.py:285 +#, python-format +msgid "Cannot delete repository %s which still has forks" +msgstr "Δε μπορεί να διαγραφεί το αποθετήριο %s που ακόμα έχει κλώνους" + +#: kallithea/controllers/admin/repos.py:290 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "Συνέβει μια βλάβη κατά την διαγραφή του %s" + +#: kallithea/controllers/admin/repos.py:330 +msgid "Repository permissions updated" +msgstr "Τα δικαιώματα του αποθετηρίου ενημερώθηκαν" + +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" +msgstr "Συνέβει μια βλάβη κατά τη δημιουργία του πεδίου" + +#: kallithea/controllers/admin/repos.py:401 +msgid "An error occurred during removal of field" +msgstr "Συνέβει μια βλάβη κατά την απομάκρυνση του πεδίου" + +#: kallithea/controllers/admin/repos.py:415 +msgid "-- Not a fork --" +msgstr "-- Όχι κλώνος --" + +#: kallithea/controllers/admin/repos.py:446 +msgid "Updated repository visibility in public journal" +msgstr "Ενημερώθηκε η ορατότητα του αποθετηρίου στο δημόσιο ημερολόγιο" + +#: kallithea/controllers/admin/repos.py:450 +msgid "An error occurred during setting this repository in public journal" +msgstr "" +"Συνέβει μια βλάβη κατά την τοποθέτηση αυτού το αποθετηρίου στο δημόσιο " +"ημερολόγιο" + +#: kallithea/controllers/admin/repos.py:466 +msgid "Nothing" +msgstr "Χωρίς" + +#: kallithea/controllers/admin/repos.py:468 +#, python-format +msgid "Marked repository %s as fork of %s" +msgstr "Σημειώθηκε το αποθετήριο %s σαν κλώνος του %s" + +#: kallithea/controllers/admin/repos.py:475 +msgid "An error occurred during this operation" +msgstr "Παρουσιάστηκε ένα σφάλμα κατά τη διάρκεια αυτής της λειτουργίας" + +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 +msgid "Repository has been locked" +msgstr "Το αποθετήριο έχει κλειδωθεί" + +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 +msgid "Repository has been unlocked" +msgstr "Το αποθετήριο έχει ξεκλειδωθεί" + +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 +msgid "An error occurred during unlocking" +msgstr "Παρουσιάστηκε ένα σφάλμα κατά το ξεκλείδωμα" + +#: kallithea/controllers/admin/repos.py:528 +msgid "Cache invalidation successful" +msgstr "Η ακύρωση της cache ήταν επιτυχής" + +#: kallithea/controllers/admin/repos.py:532 +msgid "An error occurred during cache invalidation" +msgstr "Παρουσιάστηκε ένα σφάλμα κατά τη διάρκεια ακύρωσης της cache" + +#: kallithea/controllers/admin/repos.py:545 +msgid "Pulled from remote location" +msgstr "" + +#: kallithea/controllers/admin/repos.py:548 +msgid "An error occurred during pull from remote location" +msgstr "" + +#: kallithea/controllers/admin/repos.py:579 +msgid "An error occurred during deletion of repository stats" +msgstr "" + +#: kallithea/controllers/admin/settings.py:135 +msgid "Updated VCS settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:174 +#, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." +msgstr "" + +#: kallithea/controllers/admin/settings.py:189 +#, fuzzy, python-format +#| msgid "Deleted repository %s" +msgid "Invalidated %s repositories" +msgstr "Διαγράφηκε το αποθετήριο %s" + +#: kallithea/controllers/admin/settings.py:230 +msgid "Updated application settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:283 +msgid "Updated visualisation settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:288 +msgid "Error occurred during updating visualisation settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:312 +msgid "Please enter email address" +msgstr "" + +#: kallithea/controllers/admin/settings.py:327 +msgid "Send email task created" +msgstr "" + +#: kallithea/controllers/admin/settings.py:355 +#, fuzzy +#| msgid "No data ready yet" +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 "Added new hook" +msgstr "" + +#: kallithea/controllers/admin/settings.py:376 +msgid "Updated hooks" +msgstr "" + +#: kallithea/controllers/admin/settings.py:380 +msgid "Error occurred during hook creation" +msgstr "" + +#: kallithea/controllers/admin/settings.py:404 +msgid "Whoosh reindex task scheduled" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:143 +#, python-format +msgid "Created user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:156 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:184 +#, python-format +msgid "Updated user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:206 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:217 +msgid "Successfully deleted user group" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:222 +msgid "An error occurred during deletion of user group" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:278 +msgid "Target group cannot be the same" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:284 +msgid "User group permissions updated" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 +msgid "Updated permissions" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 +msgid "An error occurred during permissions saving" +msgstr "" + +#: kallithea/controllers/admin/users.py:123 +#, python-format +msgid "Created user %s" +msgstr "" + +#: kallithea/controllers/admin/users.py:138 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "" + +#: kallithea/controllers/admin/users.py:162 +msgid "User updated successfully" +msgstr "" + +#: kallithea/controllers/admin/users.py:190 +msgid "Successfully deleted user" +msgstr "" + +#: kallithea/controllers/admin/users.py:195 +msgid "An error occurred during deletion of user" +msgstr "" + +#: kallithea/controllers/admin/users.py:203 +msgid "The default user cannot be edited" +msgstr "" + +#: kallithea/controllers/admin/users.py:412 +#, python-format +msgid "Added IP address %s to user whitelist" +msgstr "" + +#: kallithea/controllers/admin/users.py:418 +msgid "An error occurred while adding IP address" +msgstr "" + +#: kallithea/controllers/admin/users.py:430 +msgid "Removed IP address from user whitelist" +msgstr "" + +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:444 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:608 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "" + +#: kallithea/lib/diffs.py:193 +msgid "Binary file" +msgstr "" + +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:223 +msgid "No changes detected" +msgstr "" + +#: kallithea/lib/helpers.py:612 +#, python-format +msgid "Deleted branch: %s" +msgstr "" + +#: kallithea/lib/helpers.py:614 +#, python-format +msgid "Created tag: %s" +msgstr "" + +#: kallithea/lib/helpers.py:625 +#, python-format +msgid "Changeset %s not found" +msgstr "" + +#: kallithea/lib/helpers.py:674 +#, python-format +msgid "Show all combined changesets %s->%s" +msgstr "" + +#: kallithea/lib/helpers.py:680 +msgid "Compare view" +msgstr "" + +#: kallithea/lib/helpers.py:699 +msgid "and" +msgstr "" + +#: kallithea/lib/helpers.py:700 +#, python-format +msgid "%s more" +msgstr "" + +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 +msgid "revisions" +msgstr "" + +#: kallithea/lib/helpers.py:725 +#, python-format +msgid "Fork name %s" +msgstr "" + +#: kallithea/lib/helpers.py:746 +#, python-format +msgid "Pull request %s" +msgstr "" + +#: kallithea/lib/helpers.py:756 +msgid "[deleted] repository" +msgstr "" + +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +msgid "[created] repository" +msgstr "" + +#: kallithea/lib/helpers.py:760 +msgid "[created] repository as fork" +msgstr "" + +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +msgid "[forked] repository" +msgstr "" + +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +msgid "[updated] repository" +msgstr "" + +#: kallithea/lib/helpers.py:766 +msgid "[downloaded] archive from repository" +msgstr "" + +#: kallithea/lib/helpers.py:768 +msgid "[delete] repository" +msgstr "" + +#: kallithea/lib/helpers.py:776 +msgid "[created] user" +msgstr "" + +#: kallithea/lib/helpers.py:778 +msgid "[updated] user" +msgstr "" + +#: kallithea/lib/helpers.py:780 +msgid "[created] user group" +msgstr "" + +#: kallithea/lib/helpers.py:782 +msgid "[updated] user group" +msgstr "" + +#: kallithea/lib/helpers.py:784 +msgid "[commented] on revision in repository" +msgstr "" + +#: kallithea/lib/helpers.py:786 +msgid "[commented] on pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:788 +msgid "[closed] pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:790 +msgid "[pushed] into" +msgstr "" + +#: kallithea/lib/helpers.py:792 +msgid "[committed via Kallithea] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:794 +msgid "[pulled from remote] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:796 +msgid "[pulled] from" +msgstr "" + +#: kallithea/lib/helpers.py:798 +msgid "[started following] repository" +msgstr "" + +#: kallithea/lib/helpers.py:800 +msgid "[stopped following] repository" +msgstr "" + +#: kallithea/lib/helpers.py:928 +#, python-format +msgid " and %s more" +msgstr "" + +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 +msgid "No files" +msgstr "" + +#: kallithea/lib/helpers.py:957 +msgid "new file" +msgstr "" + +#: kallithea/lib/helpers.py:960 +msgid "mod" +msgstr "" + +#: kallithea/lib/helpers.py:963 +msgid "del" +msgstr "" + +#: kallithea/lib/helpers.py:966 +msgid "rename" +msgstr "" + +#: kallithea/lib/helpers.py:971 +msgid "chmod" +msgstr "" + +#: kallithea/lib/helpers.py:1264 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" + +#: kallithea/lib/utils2.py:333 +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:334 +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:335 +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:336 +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:337 +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:338 +#, python-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:354 +#, python-format +msgid "in %s" +msgstr "" + +#: kallithea/lib/utils2.py:356 +#, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/utils2.py:358 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/utils2.py:361 +#, python-format +msgid "%s and %s ago" +msgstr "" + +#: kallithea/lib/utils2.py:364 +msgid "just now" +msgstr "" + +#: kallithea/model/comment.py:68 +#, python-format +msgid "on line %s" +msgstr "" + +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +msgid "[Mention]" +msgstr "" + +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1705 +msgid "Default user has no access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1706 +msgid "Default user has read access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1707 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1708 +msgid "Default user has admin access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1710 +msgid "Default user has no access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1711 +msgid "Default user has read access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1712 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1713 +msgid "Default user has admin access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Default user has no access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1716 +msgid "Default user has read access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1717 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1718 +msgid "Default user has admin access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1720 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1721 +msgid "Non-admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1723 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1724 +msgid "Non-admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1726 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1727 +msgid "Non-admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1733 +msgid "Non-admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1737 +msgid "User registration with automatic account activation" +msgstr "" + +#: kallithea/model/db.py:2263 +msgid "Not reviewed" +msgstr "" + +#: kallithea/model/db.py:2264 +msgid "Under review" +msgstr "" + +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "" + +#: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 +#, python-format +msgid "Enter a value %(min)i characters long or more" +msgstr "" + +#: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 +#, python-format +msgid "Enter %(min)i characters or more" +msgstr "" + +#: kallithea/model/forms.py:170 +msgid "Name must not contain only digits" +msgstr "" + +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:168 +#, python-format +msgid "New user %(new_username)s registered" +msgstr "" + +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 +msgid "Closing" +msgstr "" + +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" + +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Ελλιπή σετ αλλαγών από την προηγούμενη αίτηση έλξης:" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Καινούρια σετ αλλαγών στα %s %s από την προηγούμενη αίτηση έλξης:" + +#: kallithea/model/pull_request.py:355 +#, fuzzy +#| msgid "Ancestor didn't change - show diff since previous version:" +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" +"Το γονικό δεν άλλαξε - εμφάνισε τις διαφορές από την προηγούμενη έκδοση:" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +#| msgid "" +#| "This pull request is based on another %s revision and there is no " +#| "simple diff." +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" +"Αυτή η αίτηση έλξης είναι βασισμένη σε μία άλλη %s αναθεώρηση και δεν " +"υπάρχει ένα απλό diff." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "Δεν βρέθηκαν αλλαγές στο %s %s από την προηγούμενη έκδοση." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 +msgid "latest tip" +msgstr "" + +#: kallithea/model/user.py:189 +msgid "New user registration" +msgstr "" + +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" + +#: kallithea/model/user.py:258 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:263 +#, python-format +msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 +#, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:364 +msgid "Password reset link" +msgstr "" + +#: kallithea/model/user.py:413 +msgid "Password reset notification" +msgstr "" + +#: kallithea/model/user.py:414 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" + +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 +msgid "Value cannot be an empty list" +msgstr "" + +#: kallithea/model/validators.py:74 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:76 +#, python-format +msgid "Username \"%(username)s\" cannot be used" +msgstr "" + +#: kallithea/model/validators.py:78 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 +msgid "The input is not valid" +msgstr "" + +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:133 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:134 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:136 +msgid "" +"user group name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "" + +#: kallithea/model/validators.py:176 +msgid "Cannot assign this group as parent" +msgstr "" + +#: kallithea/model/validators.py:177 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:179 +#, python-format +msgid "Repository with name \"%(group_name)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:235 +msgid "Invalid characters (non-ascii) in password" +msgstr "" + +#: kallithea/model/validators.py:250 +msgid "Invalid old password" +msgstr "" + +#: kallithea/model/validators.py:266 +msgid "Passwords do not match" +msgstr "" + +#: kallithea/model/validators.py:281 +msgid "Invalid username or password" +msgstr "" + +#: kallithea/model/validators.py:312 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:330 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + +#: kallithea/model/validators.py:331 +#, python-format +msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" +msgstr "" + +#: kallithea/model/validators.py:333 +#, python-format +msgid "Repository group with name \"%(repo)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:419 +msgid "Invalid repository URL" +msgstr "" + +#: kallithea/model/validators.py:420 +msgid "" +"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " +"svn+https URL" +msgstr "" + +#: kallithea/model/validators.py:445 +msgid "Fork has to be the same type as parent" +msgstr "" + +#: kallithea/model/validators.py:460 +msgid "You don't have permissions to create repository in this group" +msgstr "" + +#: kallithea/model/validators.py:462 +msgid "no permission to create repository in root location" +msgstr "" + +#: kallithea/model/validators.py:512 +msgid "You don't have permissions to create a group in this location" +msgstr "" + +#: kallithea/model/validators.py:552 +msgid "This username or user group name is not valid" +msgstr "" + +#: kallithea/model/validators.py:645 +msgid "This is not a valid path" +msgstr "" + +#: kallithea/model/validators.py:662 +msgid "This email address is already in use" +msgstr "" + +#: kallithea/model/validators.py:682 +#, python-format +msgid "Email address \"%(email)s\" not found" +msgstr "" + +#: kallithea/model/validators.py:719 +msgid "" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" + +#: kallithea/model/validators.py:731 +msgid "Please enter a valid IPv4 or IPv6 address" +msgstr "" + +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: kallithea/model/validators.py:779 +msgid "Filename cannot be inside a directory" +msgstr "" + +#: kallithea/model/validators.py:795 +#, python-format +msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" +msgstr "" + +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 +msgid "About" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 +msgid "Add Repository" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 +msgid "You have admin right to this group, and can edit it" +msgstr "" + +#: kallithea/templates/index_base.html:37 +msgid "Edit Repository Group" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 +msgid "Description" +msgstr "" + +#: kallithea/templates/index_base.html:60 +msgid "Last Change" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 +msgid "Tip" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 +msgid "Owner" +msgstr "" + +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 +msgid "Log In" +msgstr "" + +#: kallithea/templates/login.html:17 +#, python-format +msgid "Log In to %s" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:5 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 +msgid "Username" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 +msgid "Password" +msgstr "" + +#: kallithea/templates/login.html:44 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 +msgid "Forgot your password ?" +msgstr "" + +#: kallithea/templates/login.html:55 +msgid "Don't have an account ?" +msgstr "" + +#: kallithea/templates/login.html:62 +msgid "Sign In" +msgstr "" + +#: kallithea/templates/password_reset.html:5 +msgid "Password Reset" +msgstr "" + +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 +#, python-format +msgid "Reset Your Password to %s" +msgstr "" + +#: kallithea/templates/password_reset.html:23 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:18 +msgid "Reset Your Password" +msgstr "" + +#: kallithea/templates/password_reset.html:30 +msgid "Email Address" +msgstr "" + +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 +msgid "Captcha" +msgstr "" + +#: kallithea/templates/password_reset.html:47 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 +msgid "" +"A password reset link will be sent to the specified email address if it " +"is registered in the system." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:23 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:24 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:29 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:36 +msgid "New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:43 +msgid "Confirm New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:51 +msgid "Confirm" +msgstr "" + +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 +msgid "Sign Up" +msgstr "" + +#: kallithea/templates/register.html:22 +#, python-format +msgid "Sign Up to %s" +msgstr "" + +#: kallithea/templates/register.html:45 +msgid "Re-enter password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 +msgid "First Name" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 +msgid "Last Name" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:39 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 +msgid "Email" +msgstr "" + +#: kallithea/templates/register.html:85 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:87 +msgid "Please wait for an administrator to activate your account." +msgstr "" + +#: kallithea/templates/admin/admin.html:5 +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:55 +msgid "Admin Journal" +msgstr "" + +#: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +msgid "journal filter..." +msgstr "" + +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:12 +msgid "Filter" +msgstr "" + +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/journal/journal.html:13 +#, python-format +msgid "%s Entry" +msgid_plural "%s Entries" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/admin/admin_log.html:6 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +msgid "Action" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:8 +msgid "Date" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:9 +msgid "From IP" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:61 +msgid "No actions yet" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:5 +msgid "Authentication Settings" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:61 +msgid "Authentication" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:27 +msgid "Authentication Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:29 +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:32 +msgid "" +"Comma-separated list of plugins; Kallithea will try user authentication " +"in plugin order" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:36 +msgid "Available built-in plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:53 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +msgid "Save" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:5 +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:62 +msgid "Repository Defaults" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +msgid "Type" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +msgid "Enable downloads" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:5 +#: kallithea/templates/admin/gists/edit.html:18 +msgid "Edit Gist" +msgstr "" + +#: 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." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +msgid "Gist description ..." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +msgid "Gist lifetime" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +msgid "Expires" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +msgid "Never" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:145 +msgid "Update Gist" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 +msgid "Cancel" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:6 +#: kallithea/templates/admin/gists/index.html:16 +#, python-format +msgid "Private Gists for User %s" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:8 +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:10 +#: kallithea/templates/admin/gists/index.html:20 +msgid "Public Gists" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:312 +msgid "Create New Gist" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 +msgid "Created" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:66 +msgid "There are no gists yet" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:5 +#: kallithea/templates/admin/gists/new.html:18 +msgid "New Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +msgid "Create Private Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:54 +msgid "Create Public Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +msgid "Reset" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:5 +#: kallithea/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:10 +msgid "URL" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:37 +msgid "Private Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:30 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/pullrequests/pullrequest_data.html:20 +msgid "Delete" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:54 +msgid "Confirm to delete this Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +msgid "Show as Raw" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:69 +msgid "created" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:82 +msgid "Show as raw" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:5 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:397 +msgid "My Account" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:25 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:26 +msgid "Email Addresses" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:28 +#: kallithea/templates/admin/users/user_edit.html:31 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:29 +msgid "Owned Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +msgid "Watched Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/permissions/permissions.html:30 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "Show Permissions" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +msgid "Built-in" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#, python-format +msgid "Confirm to reset this API key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +msgid "Expired" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#, python-format +msgid "Confirm to remove this API key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +msgid "Remove" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +msgid "No additional API keys specified" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +msgid "New API key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +msgid "Add" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +msgid "Primary" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#, python-format +msgid "Confirm to delete this email: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +msgid "No additional emails specified." +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +msgid "New email address" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:1 +msgid "Change Your Account Password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:8 +msgid "Current password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +msgid "New password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:22 +msgid "Confirm new password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +msgid "Avatars are disabled" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_repos.html:1 +msgid "Repositories You Own" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_watched.html:1 +msgid "Repositories You are Watching" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:5 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/base/base.html:60 +msgid "Default Permissions" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 +msgid "Global" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +msgid "Anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 +#, python-format +msgid "" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +msgid "" +"All default permissions on each repository will be reset to chosen " +"permission, note that all custom default permission on repositories will " +"be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:20 +msgid "Apply to all existing repositories" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +msgid "" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:33 +msgid "Apply to all existing repository groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +msgid "Permissions for the Default user on new repository groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 +msgid "User group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +msgid "" +"All default permissions on each user group will be reset to chosen " +"permission, note that all custom default permission on user groups will " +"be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:46 +msgid "Apply to all existing user groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:53 +msgid "Top level repository creation" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:61 +msgid "Repository creation with group write access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:64 +msgid "" +"With this, write permission to a repository group allows creating " +"repositories inside that group. Without this, group write permissions " +"mean nothing." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:68 +msgid "User group creation" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:71 +msgid "Enable this to allow non-admins to create user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:75 +msgid "Repository forking" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:78 +msgid "Enable this to allow non-admins to fork repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 +msgid "Registration" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:88 +msgid "External auth account activation" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#, python-format +msgid "Confirm to delete this IP address: %s" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +msgid "All IP addresses are allowed." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +msgid "New IP address" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +msgid "Group name" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +msgid "Group parent" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +msgid "Copy parent group permissions" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +msgid "Copy permission set from parent repository group." +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 +#, python-format +msgid "%s Repository Group Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 +msgid "Add Child Group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:25 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 +msgid "Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:33 +msgid "Advanced" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 +msgid "Permissions" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:1 +#, python-format +msgid "Repository Group: %s" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:6 +msgid "Top level repositories" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:7 +msgid "Total repositories" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:8 +msgid "Children groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 +#: kallithea/templates/admin/users/user_edit_advanced.html:8 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 +msgid "Created on" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 +#: kallithea/templates/data_table/_dt_elements.html:121 +#, python-format +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:25 +msgid "Delete this repository group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "Disabled" +msgid "Visible" +msgstr "Απενεργοποιημένο" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "Χωρίς απόκριση" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +msgid "User/User Group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +msgid "Default" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +msgid "Revoke" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +msgid "Add new" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +msgid "Apply to children" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 +msgid "Both" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +msgid "" +"Set or revoke permission to all children of that group, including non-" +"private repositories and other groups if selected." +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +msgid "Confirm to delete this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_show.html:4 +#, fuzzy, python-format +#| msgid "Updated repository group %s" +msgid "Repository group %s" +msgstr "Ενημερώθηκε η ομάδα αποθετηρίου %s" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:5 +msgid "Repository Groups Administration" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +msgid "Number of Top-level Repositories" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:12 +msgid "Clone remote repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:16 +msgid "" +"Optional: URL of a remote repository. If set, the repository will be " +"created as a clone from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +msgid "Optionally select a group to put this repository into." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:45 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +msgid "Landing revision" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:52 +msgid "" +"Default revision for files page, downloads, full text search index and " +"readme generation" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:9 +#, python-format +msgid "%s Creating Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:13 +msgid "Creating repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:27 +#, python-format +msgid "" +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:39 +msgid "" +"We're sorry but error occurred during this operation. Please check your " +"Kallithea server logs, or contact administrator." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:8 +#, python-format +msgid "%s Repository Settings" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:34 +msgid "Extra Fields" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:37 +msgid "Caches" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:40 +msgid "Remote" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 +msgid "Statistics" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +msgid "Parent" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 +msgid "Set" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +msgid "Manually set this repository as a fork of another from the list." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +msgid "Public Journal Visibility" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +msgid "Remove from public journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +msgid "Add to Public Journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +msgid "" +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +msgid "Change Locking" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +msgid "Lock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +msgid "Repository is not locked" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +msgid "" +"Force locking on the repository. Works only when anonymous access is " +"disabled. Triggering a pull locks the repository. The user who is " +"pulling locks the repository; only the user who pulled and locked it can " +"unlock it by doing a push." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +msgid "Delete this Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +msgid "Detach forks" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +msgid "Delete forks" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +msgid "" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:4 +msgid "Invalidate Repository Cache" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 +msgid "" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +msgid "Prefix" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +msgid "Key" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +msgid "Active" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +msgid "Label" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 +#, python-format +msgid "Confirm to delete this field: %s" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 +msgid "New field key" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 +msgid "New field label" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 +msgid "Enter short label" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 +msgid "New field description" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 +msgid "Enter description of a field" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 +msgid "Extra fields are disabled." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 +msgid "Private Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Empty repository" +msgid "Fork of repository" +msgstr "Άδειο αποθετήριο" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 +msgid "Remote repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 +msgid "Pull Changes from Remote Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 +msgid "This repository does not have a remote repository URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +msgid "Permanent Repository ID" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +msgid "What is that?" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 +msgid "URL by id" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "" +"In case this repository is renamed or moved into another group the " +"repository URL changes.\n" +" Using the above permanent URL guarantees " +"that this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any " +"other cases that you need to hardcode the URL into a 3rd party service." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +msgid "Remote repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "" +"Optional: URL of a remote repository. If set, the repository can be " +"pulled from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 +msgid "Default revision for files page, downloads, whoosh and readme" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +msgid "Change owner of this repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +msgid "Processed progress" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:10 +msgid "Reset Statistics" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:10 +msgid "Confirm to remove current statistics." +msgstr "" + +#: kallithea/templates/admin/repos/repos.html:5 +msgid "Repositories Administration" +msgstr "" + +#: kallithea/templates/admin/repos/repos.html:43 +msgid "State" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:5 +msgid "Settings Administration" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:27 +msgid "VCS" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 +msgid "Visual" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +msgid "Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 +msgid "System Info" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:4 +msgid "Send test email to" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:12 +msgid "Send" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:4 +msgid "Site branding" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:12 +msgid "HTTP authentication realm" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +msgid "" +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +msgid "ReCaptcha public key" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:35 +msgid "Public key for reCaptcha system." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:40 +msgid "ReCaptcha private key" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:43 +msgid "" +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +msgid "Save Settings" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:3 +msgid "Built-in Mercurial Hooks (Read-Only)" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 +msgid "" +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:60 +msgid "Failed to remove hook" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +msgid "Delete records of missing repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:12 +msgid "" +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:17 +msgid "Invalidate cache for all repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:20 +msgid "Check this to reload data and clear cache keys for all repositories." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:25 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 +msgid "Overwrite existing Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 +msgid "Rescan Repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:4 +msgid "Index build option" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:12 +msgid "" +"This option completely reindexeses all of the repositories for proper " +"fulltext search capabilities." +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:18 +msgid "Reindex" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +msgid "Check for updates" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:8 +msgid "Kallithea configuration file" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:9 +msgid "Python version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +msgid "Note: please make sure this server can access this URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:23 +msgid "Python Packages" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:9 +msgid "Show repository size after push" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:15 +msgid "Log user push commands" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:21 +msgid "Log user pull commands" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:27 +msgid "Update repository after push (hg update)" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:33 +msgid "Mercurial extensions" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:38 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +msgid "Enable hgsubversion extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:47 +msgid "" +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:59 +msgid "Location of repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:64 +msgid "" +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 +msgid "" +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:4 +msgid "General" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:9 +msgid "Use repository extra fields" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:12 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:17 +msgid "Show Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:20 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +msgid "" +"Gravatar URL allows you to use another avatar server application.\n" +" The following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " +"variables are available:\n" +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repositories" +msgid "Repository page size" +msgstr "Αποθετήρια" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +msgid "" +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 +msgid "" +"Number of items displayed in the admin pages grids before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:70 +msgid "Icons" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:75 +msgid "Show public repository icon on repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:84 +msgid "Show public/private icons next to repository names." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:89 +msgid "Meta Tagging" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:94 +msgid "" +"Parses meta tags from the repository description field and turns them " +"into colored tags." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:5 +msgid "Add user group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +msgid "Add User Group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 +msgid "Short, optional description for this user group." +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#, python-format +msgid "%s user group settings" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 +msgid "Show Members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:1 +#, python-format +msgid "User Group: %s" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +msgid "Members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 +#: kallithea/templates/data_table/_dt_elements.html:102 +#, python-format +msgid "Confirm to delete this user group: %s" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:21 +msgid "Delete this user group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 +msgid "No members yet" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 +msgid "Chosen group members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 +msgid "Available members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_groups.html:5 +msgid "User Groups Administration" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:5 +msgid "Add user" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +msgid "Users" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:23 +msgid "Add User" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:41 +msgid "Password confirmation" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:5 +#, python-format +msgid "%s user settings" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "Emails" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:1 +#, python-format +msgid "User: %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:7 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +msgid "Source of Record" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:41 +msgid "Last Login" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:10 +msgid "Member of User Groups" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:21 +#: kallithea/templates/data_table/_dt_elements.html:90 +#, python-format +msgid "Confirm to delete this user: %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:23 +msgid "Delete this user" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#, python-format +msgid "Inherited from %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:39 +msgid "Name in Source of Record" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:53 +msgid "New password confirmation" +msgstr "" + +#: kallithea/templates/admin/users/users.html:5 +msgid "Users Administration" +msgstr "" + +#: kallithea/templates/admin/users/users.html:44 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:16 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: kallithea/templates/base/base.html:28 +msgid "Support" +msgstr "" + +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 +msgid "Mercurial repository" +msgstr "" + +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 +msgid "Git repository" +msgstr "" + +#: kallithea/templates/base/base.html:115 +msgid "Create Fork" +msgstr "" + +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 +msgid "Summary" +msgstr "" + +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 +msgid "Changelog" +msgstr "" + +#: kallithea/templates/base/base.html:133 +#: kallithea/templates/files/files.html:11 +msgid "Files" +msgstr "" + +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 +msgid "Options" +msgstr "" + +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 +msgid "Compare Fork" +msgstr "" + +#: kallithea/templates/base/base.html:158 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:67 +msgid "Search" +msgstr "" + +#: kallithea/templates/base/base.html:164 +msgid "Unlock" +msgstr "" + +#: kallithea/templates/base/base.html:166 +msgid "Lock" +msgstr "" + +#: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:178 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 +msgid "Create Pull Request" +msgstr "" + +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:308 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:309 +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:313 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:315 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:316 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:321 +msgid "Search in repositories" +msgstr "" + +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:360 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:369 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:400 +msgid "Log Out" +msgstr "" + +#: kallithea/templates/base/base.html:524 +msgid "Parent rev." +msgstr "" + +#: kallithea/templates/base/base.html:533 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 +msgid "Inherit defaults" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:15 +#, python-format +msgid "" +"Select to inherit global settings, IP whitelist and permissions from the " +"%s." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:23 +msgid "Create repositories" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:33 +msgid "Create user groups" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:37 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:43 +msgid "Fork repositories" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:47 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:13 +#: kallithea/templates/changelog/changelog.html:41 +msgid "Show" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:22 +msgid "No permissions defined yet" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:30 +#: kallithea/templates/base/perms_summary.html:55 +msgid "Permission" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:32 +#: kallithea/templates/base/perms_summary.html:57 +msgid "Edit Permission" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:92 +msgid "No permission defined" +msgstr "" + +#: kallithea/templates/base/root.html:28 +msgid "Retry" +msgstr "" + +#: kallithea/templates/base/root.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." +msgstr "" + +#: kallithea/templates/base/root.html:30 +msgid "Unable to post" +msgstr "" + +#: kallithea/templates/base/root.html:31 +msgid "Add Another Comment" +msgstr "" + +#: kallithea/templates/base/root.html:32 +msgid "Stop following this repository" +msgstr "" + +#: kallithea/templates/base/root.html:33 +msgid "Start following this repository" +msgstr "" + +#: kallithea/templates/base/root.html:34 +msgid "Group" +msgstr "" + +#: kallithea/templates/base/root.html:35 +msgid "Loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:36 +msgid "loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:37 +msgid "Search truncated" +msgstr "" + +#: kallithea/templates/base/root.html:38 +msgid "No matching files" +msgstr "" + +#: kallithea/templates/base/root.html:39 +msgid "Open New Pull Request from {0}" +msgstr "" + +#: kallithea/templates/base/root.html:40 +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +msgid "Show Selected Changesets {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "Επιλογή σετ αλλαγών" + +#: kallithea/templates/base/root.html:52 +msgid "Specify changeset" +msgstr "" + +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 +#, python-format +msgid "%s Changelog" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:23 +#, python-format +msgid "showing %d out of %d revision" +msgid_plural "showing %d out of %d revisions" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changelog/changelog.html:47 +msgid "Clear selection" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:54 +msgid "Go to tip of repository" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 +#, python-format +msgid "Compare fork with %s" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:61 +#, python-format +msgid "Compare fork with parent repository (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:65 +#: kallithea/templates/files/files.html:29 +msgid "Branch filter:" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:221 +msgid "There are no changes yet" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:4 +#: kallithea/templates/changeset/changeset.html:77 +msgid "Removed" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:5 +#: kallithea/templates/changeset/changeset.html:78 +msgid "Changed" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:6 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:38 +msgid "Added" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:8 +#: kallithea/templates/changelog/changelog_details.html:9 +#: kallithea/templates/changelog/changelog_details.html:10 +#: kallithea/templates/changeset/changeset.html:81 +#: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 +#, python-format +msgid "Affected %s files" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%s committed on %s" +msgid "%s comments" +msgstr "%s συνέβαλε στο %s" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:8 +#, python-format +msgid "%s Changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:34 +msgid "Changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 +msgid "Raw diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:46 +msgid "Patch diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 +msgid "Download diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 +msgid "Merge" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:96 +msgid "Grafted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:102 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:108 +msgid "Replaced by:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:122 +msgid "Preceded by:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 +#, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#, fuzzy +#| msgid "%s committed on %s" +msgid "comment" +msgstr "%s συνέβαλε στο %s" + +#: kallithea/templates/changeset/changeset_file_comment.html:21 +msgid "on pull request" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:22 +msgid "No title" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:24 +msgid "on this changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:30 +msgid "Delete comment?" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 +msgid "Status change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 +msgid "Comment" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:137 +msgid "You need to be logged in to comment." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:137 +msgid "Login now" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:141 +msgid "Hide" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:153 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:154 +#, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:155 +#, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_range.html:5 +#, python-format +msgid "%s Changesets" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +msgid "Files affected" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Mη τροποποιημένo" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Άγνωστη αναθεώρηση %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Χωρίς όνομα αρχείου" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "New file type" +msgid "File after" +msgstr "Άγνωστος τύπος αρχειοθέτησης" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:43 +msgid "Show full diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 +msgid "Show full side-by-side diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:72 +msgid "Show inline comments" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:5 +msgid "No changesets" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:54 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#, python-format +msgid "%s changesets" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:56 +msgid "behind" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:6 +#: kallithea/templates/compare/compare_diff.html:8 +#, python-format +msgid "%s Compare" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:41 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:39 +msgid "Swap" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:48 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 +#, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/compare/compare_diff.html:95 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:23 +msgid "Public repository" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:29 +msgid "Repository creation in progress..." +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:42 +msgid "No changesets yet" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:76 +msgid "Creating" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset on" +msgstr "Σετ αλλαγών" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Κλάδος" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +msgid "Status change:" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "Αυτό το αίτημα έλξης έχει κλείσει και δεν μπορεί να ενημερωθεί." + +#: kallithea/templates/email_templates/password_reset.html:9 +#, python-format +msgid "Hello %s" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:16 +msgid "We have received a request to reset the password for your account." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 +msgid "To set a new password, click the following link" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:33 +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:44 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Finish pull request" +msgid "Pull request" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Λάθος στη δημιουργία αιτήματος έλξης - pull request: %s" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" +msgstr "" + +#: kallithea/templates/files/diff_2way.html:15 +#, python-format +msgid "%s File side-by-side diff" +msgstr "" + +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 +msgid "File diff" +msgstr "" + +#: kallithea/templates/files/file_diff.html:4 +#, python-format +msgid "%s File Diff" +msgstr "" + +#: kallithea/templates/files/files.html:4 +#: kallithea/templates/files/files.html:77 +#, python-format +msgid "%s Files" +msgstr "" + +#: kallithea/templates/files/files_add.html:4 +#, python-format +msgid "%s Files Add" +msgstr "" + +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 +#: kallithea/templates/files/files_ypjax.html:3 +msgid "Location" +msgstr "" + +#: kallithea/templates/files/files_add.html:41 +msgid "Enter filename..." +msgstr "" + +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +msgid "or" +msgstr "" + +#: kallithea/templates/files/files_add.html:43 +msgid "Upload File" +msgstr "" + +#: kallithea/templates/files/files_add.html:47 +msgid "Create New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:53 +#, fuzzy +msgid "New file type" +msgstr "Άγνωστος τύπος αρχειοθέτησης" + +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +msgid "Commit Changes" +msgstr "" + +#: kallithea/templates/files/files_browser.html:37 +msgid "Search File List" +msgstr "" + +#: kallithea/templates/files/files_browser.html:42 +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 +msgid "Last Committer" +msgstr "" + +#: kallithea/templates/files/files_delete.html:4 +#, python-format +msgid "%s Files Delete" +msgstr "" + +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:30 +msgid "Delete file" +msgstr "" + +#: kallithea/templates/files/files_edit.html:4 +#, python-format +msgid "%s File Edit" +msgstr "" + +#: kallithea/templates/files/files_edit.html:21 +msgid "Edit file" +msgstr "" + +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 +msgid "Source" +msgstr "" + +#: kallithea/templates/files/files_history_box.html:2 +#, python-format +msgid "%s author" +msgid_plural "%s authors" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/files/files_source.html:6 +msgid "Diff to Revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:7 +msgid "Show at Revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + +#: kallithea/templates/files/files_source.html:10 +msgid "Show Authors" +msgstr "" + +#: kallithea/templates/files/files_source.html:26 +msgid "Show Source" +msgstr "" + +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:41 +msgid "Deleting files allowed only when on branch head revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:58 +#, python-format +msgid "Binary file (%s)" +msgstr "" + +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + +#: kallithea/templates/files/files_source.html:73 +msgid "Show as raw." +msgstr "" + +#: kallithea/templates/files/files_ypjax.html:5 +msgid "annotation" +msgstr "" + +#: kallithea/templates/files/files_ypjax.html:23 +msgid "Go Back" +msgstr "" + +#: kallithea/templates/files/files_ypjax.html:24 +msgid "No files at given path" +msgstr "" + +#: kallithea/templates/followers/followers.html:5 +#, python-format +msgid "%s Followers" +msgstr "" + +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 +msgid "Followers" +msgstr "" + +#: kallithea/templates/followers/followers_data.html:9 +msgid "Started following -" +msgstr "" + +#: kallithea/templates/forks/fork.html:5 +#, python-format +msgid "Fork repository %s" +msgstr "" + +#: kallithea/templates/forks/fork.html:25 +msgid "Fork name" +msgstr "" + +#: kallithea/templates/forks/fork.html:53 +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" + +#: kallithea/templates/forks/fork.html:58 +msgid "Private" +msgstr "" + +#: kallithea/templates/forks/fork.html:66 +msgid "Copy permissions" +msgstr "" + +#: kallithea/templates/forks/fork.html:69 +msgid "Copy permissions from forked repository" +msgstr "" + +#: kallithea/templates/forks/fork.html:75 +msgid "Update after clone" +msgstr "" + +#: kallithea/templates/forks/fork.html:78 +msgid "Checkout source after making a clone" +msgstr "" + +#: kallithea/templates/forks/fork.html:85 +msgid "Fork this Repository" +msgstr "" + +#: kallithea/templates/forks/forks.html:5 +#, python-format +msgid "%s Forks" +msgstr "" + +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 +msgid "Forks" +msgstr "" + +#: kallithea/templates/forks/forks_data.html:14 +msgid "Forked" +msgstr "" + +#: kallithea/templates/forks/forks_data.html:24 +msgid "There are no forks yet" +msgstr "" + +#: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +msgid "RSS journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:34 +msgid "My Repositories" +msgstr "" + +#: kallithea/templates/journal/journal_data.html:42 +msgid "No entries yet" +msgstr "" + +#: kallithea/templates/journal/public_journal.html:10 +msgid "ATOM public journal feed" +msgstr "" + +#: kallithea/templates/journal/public_journal.html:11 +msgid "RSS public journal feed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:8 +msgid "New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:26 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 +msgid "Title" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:28 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 +msgid "Write a short description on this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:40 +msgid "Changeset flow" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:46 +msgid "Origin repository" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:62 +msgid "Destination repository" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +msgid "No entries" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:14 +msgid "Vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:28 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:30 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:35 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:37 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 +msgid "Closed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:67 +msgid "Delete Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:68 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:70 +#, python-format +msgid "Confirm again to delete this pull request with %s comments" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 +#, python-format +msgid "%s Pull Request %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, python-format +msgid "Pull request %s from %s#%s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Summarize the changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 +msgid "Pull request status calculated from votes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:81 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:86 +msgid "on" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:95 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +msgid "Pull changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:234 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:240 +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:243 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:268 +msgid "Pull Request Content" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 +#, python-format +msgid "%s Pull Requests" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, python-format +msgid "Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 +#, python-format +msgid "Pull Requests to '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 +msgid "Open New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 +#, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 +#, python-format +msgid "Show Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 +msgid "Pull Requests Created by Me" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 +msgid "Pull Requests I Participate In" +msgstr "" + +#: kallithea/templates/search/search.html:6 +#, python-format +msgid "%s Search" +msgstr "" + +#: kallithea/templates/search/search.html:8 +#: kallithea/templates/search/search.html:16 +msgid "Search in All Repositories" +msgstr "" + +#: kallithea/templates/search/search.html:47 +msgid "Search term" +msgstr "" + +#: kallithea/templates/search/search.html:54 +msgid "Search in" +msgstr "" + +#: kallithea/templates/search/search.html:56 +msgid "File contents" +msgstr "" + +#: kallithea/templates/search/search.html:57 +msgid "Commit messages" +msgstr "" + +#: kallithea/templates/search/search.html:58 +msgid "File names" +msgstr "" + +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +msgid "Permission denied" +msgstr "" + +#: kallithea/templates/summary/statistics.html:4 +#, python-format +msgid "%s Statistics" +msgstr "" + +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:36 +#, python-format +msgid "%s ATOM feed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:37 +#, python-format +msgid "%s RSS feed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 +msgid "Enable" +msgstr "" + +#: kallithea/templates/summary/statistics.html:38 +msgid "Stats gathered: " +msgstr "" + +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 +msgid "files" +msgstr "" + +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 +msgid "Show more" +msgstr "" + +#: kallithea/templates/summary/statistics.html:405 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:406 +msgid "files added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:407 +msgid "files changed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:408 +msgid "files removed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:410 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:411 +msgid "file added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:412 +msgid "file changed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:413 +msgid "file removed" +msgstr "" + +#: kallithea/templates/summary/summary.html:5 +#, python-format +msgid "%s Summary" +msgstr "" + +#: kallithea/templates/summary/summary.html:14 +#, python-format +msgid "Repository locked by %s" +msgstr "" + +#: kallithea/templates/summary/summary.html:16 +msgid "Repository unlocked" +msgstr "" + +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "" + +#: kallithea/templates/summary/summary.html:27 +msgid "Clone from" +msgstr "" + +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:73 +msgid "Show by Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:84 +msgid "Trending files" +msgstr "" + +#: kallithea/templates/summary/summary.html:98 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:101 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:103 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:109 +msgid "Download as zip" +msgstr "" + +#: kallithea/templates/summary/summary.html:113 +msgid "Check this to download archive with subrepos" +msgstr "" + +#: kallithea/templates/summary/summary.html:115 +msgid "With subrepos" +msgstr "" + +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 +msgid "Feed" +msgstr "" + +#: kallithea/templates/summary/summary.html:175 +msgid "Latest Changes" +msgstr "" + +#: kallithea/templates/summary/summary.html:177 +msgid "Quick Start" +msgstr "" + +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 +#, python-format +msgid "Readme file from revision %s:%s" +msgstr "" + +#: kallithea/templates/summary/summary.html:298 +#, python-format +msgid "Download %s as %s" +msgstr "" + +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "" +#~ "Δεν υπάρχει ευρετήριο για την αναζήτηση. Παρακαλώ τρέξτε τον whoosh " +#~ "για την δημιουργία του" + +#, fuzzy +#~| msgid "Updated repository group %s" +#~ msgid "Repository Group" +#~ msgstr "Ενημερώθηκε η ομάδα αποθετηρίου %s" + +#~ msgid "This pull request can be updated with changes on %s:" +#~ msgstr "Αυτό το αίτημα έλξης μπορεί να ενημερωθεί με αλλαγές στο %s:" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Κλειστό, αντικαταστάθηκε από %s." + +#~ msgid "Closing." +#~ msgstr "Κλείνει." + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Ένα νέο αίτημα έλξης (pull request) δημιουργήθηκε επιτυχώς" diff --git a/kallithea/i18n/en/LC_MESSAGES/kallithea.mo b/kallithea/i18n/en/LC_MESSAGES/kallithea.mo deleted file mode 100644 index 1c0f22c4e5f9ca6147dc394a594d3398f6c11805..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@, 2016. +# +msgid "" +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: 2018-04-18 11:43+0000\n" +"Last-Translator: Jesús Sánchez \n" +"Language-Team: Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.0-dev\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 +msgid "There are no changesets yet" +msgstr "Aún no hay cambios" + +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 +#: kallithea/templates/base/perms_summary.html:14 +msgid "None" +msgstr "Ninguno" + +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 +msgid "(closed)" +msgstr "(cerrado)" + +#: kallithea/controllers/changeset.py:83 +msgid "Show whitespace" +msgstr "Mostrar espacios en blanco" + +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 +#: kallithea/templates/files/diff_2way.html:55 +msgid "Ignore whitespace" +msgstr "Ignorar espacios en blanco" + +#: kallithea/controllers/changeset.py:163 +#, python-format +msgid "Increase diff context to %(num)s lines" +msgstr "Aumentar el contexto del diff a %(num)s lineas" + +#: kallithea/controllers/changeset.py:203 +#, fuzzy +#| msgid "No permission to change pull request status" +msgid "No permission to change status" +msgstr "No tene permiso para cambiar el estado de la petición pull" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 +msgid "Such revision does not exist for this repository" +msgstr "La revisión no existe en este repositorio" + +#: kallithea/controllers/compare.py:66 +#, python-format +msgid "Could not find other repository %s" +msgstr "No se puede encontrar otro repositorio %s" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "No se pueden comparar repositorios de diferentes tipos" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "No se puede mostrar diff vacio" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 +msgid "Cannot compare repositories without using common ancestor" +msgstr "No se pueden comparar repositorios sin usar un ancestro común" + +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "No hay respuesta" + +#: kallithea/controllers/error.py:71 +msgid "Unknown error" +msgstr "Error desconocido" + +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" +"La petición no ha podido ser atendida por el servidor debido un error de " +"sintaxis." + +#: kallithea/controllers/error.py:87 +msgid "Unauthorized access to resource" +msgstr "Acceso no autorizado al recurso" + +#: kallithea/controllers/error.py:89 +msgid "You don't have permission to view this page" +msgstr "No tiene permiso para ver esta página" + +#: kallithea/controllers/error.py:91 +msgid "The resource could not be found" +msgstr "No se ha encontrado el recurso" + +#: kallithea/controllers/error.py:93 +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." +msgstr "" +"La petición no se ha podido completar debido a que el servidor encontró " +"un problema inesperado." + +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "%s anotó en %s" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "El cambio era demasiado grande y se redució..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#, python-format +msgid "%s %s feed" +msgstr "%s%s canal" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, fuzzy, python-format +msgid "Changes on %s repository" +msgstr "Cambios en %s repositorio" + +#: kallithea/controllers/files.py:92 +msgid "Click here to add new file" +msgstr "Haga clic aquí para añadir un archivo nuevo" + +#: kallithea/controllers/files.py:93 +#, python-format +msgid "There are no files yet. %s" +msgstr "Aún no hay archivos. %s" + +#: kallithea/controllers/files.py:194 +#, 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 +#, 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 +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 +#, python-format +msgid "Deleted file %s via Kallithea" +msgstr "Archivo %s eliminado mediante Kallithea" + +#: kallithea/controllers/files.py:345 +#, 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 +msgid "Error occurred during commit" +msgstr "Ocurrió un error al anotar los cambios" + +#: kallithea/controllers/files.py:372 +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 +#, python-format +msgid "Edited file %s via Kallithea" +msgstr "Archivo %s editado mediante Kallithea" + +#: kallithea/controllers/files.py:402 +msgid "No changes" +msgstr "No hay cambios" + +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 +#, python-format +msgid "Successfully committed to %s" +msgstr "Anotado correctamente a %s" + +#: kallithea/controllers/files.py:438 +msgid "Added file via Kallithea" +msgstr "Archivo añadido mediante Kallithea" + +#: kallithea/controllers/files.py:459 +msgid "No content" +msgstr "Sin contenido" + +#: kallithea/controllers/files.py:463 +msgid "No filename" +msgstr "Sin nombre de archivo" + +#: kallithea/controllers/files.py:488 +#, 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 +msgid "Downloads disabled" +msgstr "Descargas deshabilitadas" + +#: kallithea/controllers/files.py:531 +#, python-format +msgid "Unknown revision %s" +msgstr "Revisión desconocida %s" + +#: kallithea/controllers/files.py:533 +msgid "Empty repository" +msgstr "Repositorio vacío" + +#: kallithea/controllers/files.py:535 +msgid "Unknown archive type" +msgstr "Tipo de archivo desconocido" + +#: kallithea/controllers/files.py:756 +#: 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/pullrequests.py:184 kallithea/model/scm.py:706 +msgid "Branches" +msgstr "Ramas" + +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 +msgid "Tags" +msgstr "Etiquetas" + +#: kallithea/controllers/forks.py:174 +#, python-format +msgid "An error occurred during repository forking %s" +msgstr "Ocurrió un error mientras se bifurcaba el repositorio %s" + +#: kallithea/controllers/home.py:78 +msgid "Groups" +msgstr "Grupos" + +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/templates/admin/repos/repo_add.html:12 +#: kallithea/templates/admin/repos/repo_add.html:16 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/users/user_edit_advanced.html:6 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 +msgid "Repositories" +msgstr "Repositorios" + +#: kallithea/controllers/home.py:121 +#: kallithea/templates/files/files_add.html:32 +#: kallithea/templates/files/files_delete.html:23 +#: kallithea/templates/files/files_edit.html:32 +msgid "Branch" +msgstr "Rama" + +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Ramas cerradas" + +#: kallithea/controllers/home.py:133 +msgid "Tag" +msgstr "Etiqueta" + +#: kallithea/controllers/home.py:139 +msgid "Bookmark" +msgstr "Marcador" + +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/templates/journal/public_journal.html:4 +#: kallithea/templates/journal/public_journal.html:18 +msgid "Public Journal" +msgstr "Registro público" + +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 +msgid "Journal" +msgstr "Registro" + +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 +msgid "Bad captcha" +msgstr "CAPTCHA erróneo" + +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "El registro en %s se ha efectuado correctamente" + +#: kallithea/controllers/login.py:189 +msgid "A password reset confirmation code has been sent" +msgstr "Se ha enviado una confirmación de restauración de contraseña" + +#: kallithea/controllers/login.py:238 +msgid "Invalid password reset token" +msgstr "Señal de restauración de contraseña inválida" + +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 +msgid "Successfully updated password" +msgstr "Contraseña actualizada correctamente" + +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "El validador \"%s\" no es correcto" + +#: kallithea/controllers/pullrequests.py:133 +#, python-format +msgid "%s (closed)" +msgstr "%s (cerrado)" + +#: kallithea/controllers/pullrequests.py:160 +#: kallithea/templates/changeset/changeset.html:12 +msgid "Changeset" +msgstr "Cambio" + +#: kallithea/controllers/pullrequests.py:181 +msgid "Special" +msgstr "Especial" + +#: kallithea/controllers/pullrequests.py:182 +#, fuzzy +msgid "Peer branches" +msgstr "Ramas de los pares" + +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +msgid "Bookmarks" +msgstr "Marcadores" + +#: kallithea/controllers/pullrequests.py:320 +#, python-format +msgid "Error creating pull request: %s" +msgstr "Error al crear la petición de pull: %s" + +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 +msgid "Error occurred while creating pull request" +msgstr "Ocurrió un error al crear la petición de pull" + +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "La petición de pull se ha creado correctamente" + +#: kallithea/controllers/pullrequests.py:375 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Actualización de la petición pull creada" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "No hay descripción" + +#: kallithea/controllers/pullrequests.py:432 +msgid "Pull request updated" +msgstr "Petición pull actualizada" + +#: kallithea/controllers/pullrequests.py:445 +msgid "Successfully deleted pull request" +msgstr "Petición pull eliminada correctamente" + +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "No se encontraron cambios para actualizar la petición pull." + +#: kallithea/controllers/pullrequests.py:522 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "La petición pull ya ha sido incluida a %s." + +#: kallithea/controllers/pullrequests.py:524 +msgid "This pull request has been closed and can not be updated." +msgstr "La petición pull esta cerrada y no se puede actualizar." + +#: kallithea/controllers/pullrequests.py:543 +#, fuzzy, python-format +#| msgid "The following changes are available on %s:" +msgid "The following additional changes are available on %s:" +msgstr "Los siguientes cambios están disponibles en %s:" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." +msgstr "No se encontraron cambios para actualizar la petición pull." + +#: kallithea/controllers/pullrequests.py:557 +#, fuzzy, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "Nota: la rama %s tiene otro head: %s." + +#: kallithea/controllers/pullrequests.py:564 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." +msgstr "La peticiones pull de Git aún no soportan actualizaciones." + +#: kallithea/controllers/pullrequests.py:566 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "No se encontraron cambios para actualizar la petición pull." + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 +msgid "Invalid search query. Try quoting it." +msgstr "Consulta de búsqueda inválida. Inténtelo entre comillas." + +#: kallithea/controllers/search.py:140 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 +msgid "An error occurred during search operation." +msgstr "Ocurrió un error mientras se ejecutaba la búsqueda." + +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 +msgid "No data ready yet" +msgstr "Todavía no hay datos disponibles" + +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 +msgid "Statistics are disabled for this repository" +msgstr "Las estadísticas están deshabilitadas en este repositorio" + +#: kallithea/controllers/admin/auth_settings.py:135 +msgid "Auth settings updated successfully" +msgstr "Los ajustes de autentificación se han actualizado correctamente" + +#: kallithea/controllers/admin/auth_settings.py:146 +msgid "error occurred during update of auth settings" +msgstr "ocurrió un error al actualizar los ajustes de autentificación" + +#: kallithea/controllers/admin/defaults.py:75 +msgid "Default settings updated successfully" +msgstr "Los ajustes predeterminados se han actualizado correctamente" + +#: kallithea/controllers/admin/defaults.py:90 +msgid "Error occurred during update of defaults" +msgstr "Ocurrió un error al actualizar los ajustes predeterminados" + +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "Para siempre" + +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 minutos" + +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "1 hora" + +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "1 día" + +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 +msgid "1 month" +msgstr "1 mes" + +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 +msgid "Lifetime" +msgstr "Tiempo de vida" + +#: kallithea/controllers/admin/gists.py:140 +msgid "Error occurred during gist creation" +msgstr "Ocurrió un error mientras se creaba el gist" + +#: kallithea/controllers/admin/gists.py:156 +#, python-format +msgid "Deleted gist %s" +msgstr "Gist %s eliminado" + +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "Sin modificar" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "Gist actualizado correctamente" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "" + +#: kallithea/controllers/admin/gists.py:233 +#, python-format +msgid "Error occurred during update of gist %s" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 +msgid "You can't edit this user since it's crucial for entire application" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:117 +msgid "Your account was updated successfully" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 +#, python-format +msgid "Error occurred during update of user %s" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:166 +msgid "Error occurred during update of user password" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 +#, python-format +msgid "Added email %s to user" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 +msgid "An error occurred during email saving" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 +msgid "Removed email from user" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/users.py:285 +msgid "API key successfully deleted" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "Read" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 +#: kallithea/templates/admin/auth/auth_settings.html:9 +#: kallithea/templates/admin/defaults/defaults.html:9 +#: kallithea/templates/admin/permissions/permissions.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repo_add.html:10 +#: kallithea/templates/admin/repos/repo_add.html:14 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/settings/settings.html:9 +#: kallithea/templates/admin/user_groups/user_group_add.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/user_add.html:8 +#: kallithea/templates/admin/users/user_edit.html:9 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 +#: kallithea/templates/base/perms_summary.html:17 +msgid "Admin" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:87 +#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:95 +#: kallithea/controllers/admin/permissions.py:98 +#: kallithea/controllers/admin/permissions.py:101 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 +msgid "Enabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:125 +msgid "Global permissions updated successfully" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:140 +msgid "Error occurred during update of permissions" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:174 +#, python-format +msgid "Error occurred during creation of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:179 +#, python-format +msgid "Created repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:226 +#, python-format +msgid "Updated repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:242 +#, python-format +msgid "Error occurred during update of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:252 +#, python-format +msgid "This group contains %s repositories and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:259 +#, python-format +msgid "This group contains %s subgroups and cannot be deleted" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:265 +#, python-format +msgid "Removed repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:270 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:369 +msgid "Repository group permissions updated" +msgstr "" + +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 +msgid "An error occurred during revoking of permission" +msgstr "" + +#: kallithea/controllers/admin/repos.py:137 +#, python-format +msgid "Error creating repository %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:195 +#, python-format +msgid "Created repository %s from %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:204 +#, python-format +msgid "Forked repository %s as %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:207 +#, python-format +msgid "Created repository %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:236 +#, python-format +msgid "Repository %s updated successfully" +msgstr "" + +#: kallithea/controllers/admin/repos.py:256 +#, python-format +msgid "Error occurred during update of repository %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:274 +#, python-format +msgid "Detached %s forks" +msgstr "" + +#: kallithea/controllers/admin/repos.py:277 +#, python-format +msgid "Deleted %s forks" +msgstr "" + +#: kallithea/controllers/admin/repos.py:282 +#, python-format +msgid "Deleted repository %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:285 +#, python-format +msgid "Cannot delete repository %s which still has forks" +msgstr "" + +#: kallithea/controllers/admin/repos.py:290 +#, python-format +msgid "An error occurred during deletion of %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:330 +msgid "Repository permissions updated" +msgstr "" + +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "An error occurred during repository forking %s" +msgid "An error occurred during creation of field: %r" +msgstr "Ocurrió un error mientras se bifurcaba el repositorio %s" + +#: kallithea/controllers/admin/repos.py:401 +msgid "An error occurred during removal of field" +msgstr "" + +#: kallithea/controllers/admin/repos.py:415 +msgid "-- Not a fork --" +msgstr "" + +#: kallithea/controllers/admin/repos.py:446 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:450 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:466 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:468 +#, python-format +msgid "Marked repository %s as fork of %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:475 +msgid "An error occurred during this operation" +msgstr "" + +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 +msgid "Repository has been locked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 +msgid "Repository has been unlocked" +msgstr "" + +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 +msgid "An error occurred during unlocking" +msgstr "" + +#: kallithea/controllers/admin/repos.py:528 +msgid "Cache invalidation successful" +msgstr "" + +#: kallithea/controllers/admin/repos.py:532 +msgid "An error occurred during cache invalidation" +msgstr "" + +#: kallithea/controllers/admin/repos.py:545 +msgid "Pulled from remote location" +msgstr "" + +#: kallithea/controllers/admin/repos.py:548 +msgid "An error occurred during pull from remote location" +msgstr "" + +#: kallithea/controllers/admin/repos.py:579 +msgid "An error occurred during deletion of repository stats" +msgstr "" + +#: kallithea/controllers/admin/settings.py:135 +msgid "Updated VCS settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:174 +#, python-format +msgid "Repositories successfully rescanned. Added: %s. Removed: %s." +msgstr "" + +#: kallithea/controllers/admin/settings.py:189 +#, python-format +msgid "Invalidated %s repositories" +msgstr "" + +#: kallithea/controllers/admin/settings.py:230 +msgid "Updated application settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:283 +msgid "Updated visualisation settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:288 +msgid "Error occurred during updating visualisation settings" +msgstr "" + +#: kallithea/controllers/admin/settings.py:312 +msgid "Please enter email address" +msgstr "" + +#: kallithea/controllers/admin/settings.py:327 +msgid "Send email task created" +msgstr "" + +#: kallithea/controllers/admin/settings.py:355 +#, fuzzy +#| msgid "No data ready yet" +msgid "Hook already exists" +msgstr "Todavía no hay datos disponibles" + +#: 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 "Added new hook" +msgstr "" + +#: kallithea/controllers/admin/settings.py:376 +msgid "Updated hooks" +msgstr "" + +#: kallithea/controllers/admin/settings.py:380 +msgid "Error occurred during hook creation" +msgstr "" + +#: kallithea/controllers/admin/settings.py:404 +msgid "Whoosh reindex task scheduled" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:143 +#, python-format +msgid "Created user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:156 +#, python-format +msgid "Error occurred during creation of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:184 +#, python-format +msgid "Updated user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:206 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:217 +msgid "Successfully deleted user group" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:222 +msgid "An error occurred during deletion of user group" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:278 +msgid "Target group cannot be the same" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:284 +msgid "User group permissions updated" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 +msgid "Updated permissions" +msgstr "" + +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 +msgid "An error occurred during permissions saving" +msgstr "" + +#: kallithea/controllers/admin/users.py:123 +#, python-format +msgid "Created user %s" +msgstr "" + +#: kallithea/controllers/admin/users.py:138 +#, python-format +msgid "Error occurred during creation of user %s" +msgstr "" + +#: kallithea/controllers/admin/users.py:162 +msgid "User updated successfully" +msgstr "" + +#: kallithea/controllers/admin/users.py:190 +msgid "Successfully deleted user" +msgstr "" + +#: kallithea/controllers/admin/users.py:195 +msgid "An error occurred during deletion of user" +msgstr "" + +#: kallithea/controllers/admin/users.py:203 +msgid "The default user cannot be edited" +msgstr "" + +#: kallithea/controllers/admin/users.py:412 +#, python-format +msgid "Added IP address %s to user whitelist" +msgstr "" + +#: kallithea/controllers/admin/users.py:418 +msgid "An error occurred while adding IP address" +msgstr "" + +#: kallithea/controllers/admin/users.py:430 +msgid "Removed IP address from user whitelist" +msgstr "" + +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:444 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 +msgid "Repository not found in the filesystem" +msgstr "" + +#: kallithea/lib/base.py:608 +#, python-format +msgid "Changeset for %s %s not found in %s" +msgstr "" + +#: kallithea/lib/diffs.py:193 +msgid "Binary file" +msgstr "" + +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:223 +msgid "No changes detected" +msgstr "" + +#: kallithea/lib/helpers.py:612 +#, python-format +msgid "Deleted branch: %s" +msgstr "" + +#: kallithea/lib/helpers.py:614 +#, python-format +msgid "Created tag: %s" +msgstr "" + +#: kallithea/lib/helpers.py:625 +#, python-format +msgid "Changeset %s not found" +msgstr "" + +#: kallithea/lib/helpers.py:674 +#, python-format +msgid "Show all combined changesets %s->%s" +msgstr "" + +#: kallithea/lib/helpers.py:680 +msgid "Compare view" +msgstr "" + +#: kallithea/lib/helpers.py:699 +msgid "and" +msgstr "" + +#: kallithea/lib/helpers.py:700 +#, python-format +msgid "%s more" +msgstr "" + +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 +msgid "revisions" +msgstr "" + +#: kallithea/lib/helpers.py:725 +#, python-format +msgid "Fork name %s" +msgstr "" + +#: kallithea/lib/helpers.py:746 +#, python-format +msgid "Pull request %s" +msgstr "" + +#: kallithea/lib/helpers.py:756 +msgid "[deleted] repository" +msgstr "" + +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 +msgid "[created] repository" +msgstr "" + +#: kallithea/lib/helpers.py:760 +msgid "[created] repository as fork" +msgstr "" + +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 +msgid "[forked] repository" +msgstr "" + +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 +msgid "[updated] repository" +msgstr "" + +#: kallithea/lib/helpers.py:766 +msgid "[downloaded] archive from repository" +msgstr "" + +#: kallithea/lib/helpers.py:768 +msgid "[delete] repository" +msgstr "" + +#: kallithea/lib/helpers.py:776 +msgid "[created] user" +msgstr "" + +#: kallithea/lib/helpers.py:778 +msgid "[updated] user" +msgstr "" + +#: kallithea/lib/helpers.py:780 +msgid "[created] user group" +msgstr "" + +#: kallithea/lib/helpers.py:782 +msgid "[updated] user group" +msgstr "" + +#: kallithea/lib/helpers.py:784 +msgid "[commented] on revision in repository" +msgstr "" + +#: kallithea/lib/helpers.py:786 +msgid "[commented] on pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:788 +msgid "[closed] pull request for" +msgstr "" + +#: kallithea/lib/helpers.py:790 +msgid "[pushed] into" +msgstr "" + +#: kallithea/lib/helpers.py:792 +msgid "[committed via Kallithea] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:794 +msgid "[pulled from remote] into repository" +msgstr "" + +#: kallithea/lib/helpers.py:796 +msgid "[pulled] from" +msgstr "" + +#: kallithea/lib/helpers.py:798 +msgid "[started following] repository" +msgstr "" + +#: kallithea/lib/helpers.py:800 +msgid "[stopped following] repository" +msgstr "" + +#: kallithea/lib/helpers.py:928 +#, python-format +msgid " and %s more" +msgstr "" + +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 +msgid "No files" +msgstr "" + +#: kallithea/lib/helpers.py:957 +msgid "new file" +msgstr "" + +#: kallithea/lib/helpers.py:960 +msgid "mod" +msgstr "" + +#: kallithea/lib/helpers.py:963 +msgid "del" +msgstr "" + +#: kallithea/lib/helpers.py:966 +msgid "rename" +msgstr "" + +#: kallithea/lib/helpers.py:971 +msgid "chmod" +msgstr "" + +#: kallithea/lib/helpers.py:1264 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" + +#: kallithea/lib/utils2.py:333 +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:334 +#, python-format +msgid "%d month" +msgid_plural "%d months" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:335 +#, python-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:336 +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:337 +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:338 +#, python-format +msgid "%d second" +msgid_plural "%d seconds" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/lib/utils2.py:354 +#, python-format +msgid "in %s" +msgstr "" + +#: kallithea/lib/utils2.py:356 +#, python-format +msgid "%s ago" +msgstr "" + +#: kallithea/lib/utils2.py:358 +#, python-format +msgid "in %s and %s" +msgstr "" + +#: kallithea/lib/utils2.py:361 +#, python-format +msgid "%s and %s ago" +msgstr "" + +#: kallithea/lib/utils2.py:364 +msgid "just now" +msgstr "" + +#: kallithea/model/comment.py:68 +#, python-format +msgid "on line %s" +msgstr "" + +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 +msgid "[Mention]" +msgstr "" + +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1705 +msgid "Default user has no access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1706 +msgid "Default user has read access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1707 +msgid "Default user has write access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1708 +msgid "Default user has admin access to new repositories" +msgstr "" + +#: kallithea/model/db.py:1710 +msgid "Default user has no access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1711 +msgid "Default user has read access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1712 +msgid "Default user has write access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1713 +msgid "Default user has admin access to new repository groups" +msgstr "" + +#: kallithea/model/db.py:1715 +msgid "Default user has no access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1716 +msgid "Default user has read access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1717 +msgid "Default user has write access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1718 +msgid "Default user has admin access to new user groups" +msgstr "" + +#: kallithea/model/db.py:1720 +msgid "Only admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1721 +msgid "Non-admins can create repository groups" +msgstr "" + +#: kallithea/model/db.py:1723 +msgid "Only admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1724 +msgid "Non-admins can create user groups" +msgstr "" + +#: kallithea/model/db.py:1726 +msgid "Only admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1727 +msgid "Non-admins can create top level repositories" +msgstr "" + +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 +msgid "Only admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1733 +msgid "Non-admins can fork repositories" +msgstr "" + +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 +msgid "User registration with manual account activation" +msgstr "" + +#: kallithea/model/db.py:1737 +msgid "User registration with automatic account activation" +msgstr "" + +#: kallithea/model/db.py:2263 +msgid "Not reviewed" +msgstr "" + +#: kallithea/model/db.py:2264 +msgid "Under review" +msgstr "" + +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "" + +#: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 +#, python-format +msgid "Enter a value %(min)i characters long or more" +msgstr "" + +#: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 +#, python-format +msgid "Enter %(min)i characters or more" +msgstr "" + +#: kallithea/model/forms.py:170 +msgid "Name must not contain only digits" +msgstr "" + +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:168 +#, python-format +msgid "New user %(new_username)s registered" +msgstr "" + +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 +msgid "Closing" +msgstr "" + +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" + +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Error al crear la petición de pull: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Cambios que faltan desde la ultima petición de pull:" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Cambios nuevos en %s %s desde la ultima petición pull:" + +#: kallithea/model/pull_request.py:355 +#, fuzzy +#| msgid "Ancestor didn't change - show diff since previous version:" +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" +"El ascendente no ha cambiado - ver diferencias desde la versión anterior:" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" +"La petición de pull está basada en otra %s revisión y no hay un diff " +"simple." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "No se encontró ningún cambio en %s %s desde la versión anterior." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 +msgid "latest tip" +msgstr "" + +#: kallithea/model/user.py:189 +msgid "New user registration" +msgstr "" + +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" + +#: kallithea/model/user.py:258 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:263 +#, python-format +msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 +#, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:364 +msgid "Password reset link" +msgstr "" + +#: kallithea/model/user.py:413 +msgid "Password reset notification" +msgstr "" + +#: kallithea/model/user.py:414 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" + +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 +msgid "Value cannot be an empty list" +msgstr "" + +#: kallithea/model/validators.py:74 +#, python-format +msgid "Username \"%(username)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:76 +#, python-format +msgid "Username \"%(username)s\" cannot be used" +msgstr "" + +#: kallithea/model/validators.py:78 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 +msgid "The input is not valid" +msgstr "" + +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + +#: kallithea/model/validators.py:133 +msgid "Invalid user group name" +msgstr "" + +#: kallithea/model/validators.py:134 +#, python-format +msgid "User group \"%(usergroup)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:136 +msgid "" +"user group name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "" + +#: kallithea/model/validators.py:176 +msgid "Cannot assign this group as parent" +msgstr "" + +#: kallithea/model/validators.py:177 +#, python-format +msgid "Group \"%(group_name)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:179 +#, python-format +msgid "Repository with name \"%(group_name)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:235 +msgid "Invalid characters (non-ascii) in password" +msgstr "" + +#: kallithea/model/validators.py:250 +msgid "Invalid old password" +msgstr "" + +#: kallithea/model/validators.py:266 +msgid "Passwords do not match" +msgstr "" + +#: kallithea/model/validators.py:281 +msgid "Invalid username or password" +msgstr "" + +#: kallithea/model/validators.py:312 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:330 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + +#: kallithea/model/validators.py:331 +#, python-format +msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" +msgstr "" + +#: kallithea/model/validators.py:333 +#, python-format +msgid "Repository group with name \"%(repo)s\" already exists" +msgstr "" + +#: kallithea/model/validators.py:419 +msgid "Invalid repository URL" +msgstr "" + +#: kallithea/model/validators.py:420 +msgid "" +"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " +"svn+https URL" +msgstr "" + +#: kallithea/model/validators.py:445 +msgid "Fork has to be the same type as parent" +msgstr "" + +#: kallithea/model/validators.py:460 +msgid "You don't have permissions to create repository in this group" +msgstr "" + +#: kallithea/model/validators.py:462 +msgid "no permission to create repository in root location" +msgstr "" + +#: kallithea/model/validators.py:512 +msgid "You don't have permissions to create a group in this location" +msgstr "" + +#: kallithea/model/validators.py:552 +msgid "This username or user group name is not valid" +msgstr "" + +#: kallithea/model/validators.py:645 +msgid "This is not a valid path" +msgstr "" + +#: kallithea/model/validators.py:662 +msgid "This email address is already in use" +msgstr "" + +#: kallithea/model/validators.py:682 +#, python-format +msgid "Email address \"%(email)s\" not found" +msgstr "" + +#: kallithea/model/validators.py:719 +msgid "" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" + +#: kallithea/model/validators.py:731 +msgid "Please enter a valid IPv4 or IPv6 address" +msgstr "" + +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 +msgid "Key name can only consist of letters, underscore, dash or numbers" +msgstr "" + +#: kallithea/model/validators.py:779 +msgid "Filename cannot be inside a directory" +msgstr "" + +#: kallithea/model/validators.py:795 +#, python-format +msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" +msgstr "" + +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 +msgid "About" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add.html:5 +#: kallithea/templates/admin/repos/repo_add.html:19 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 +msgid "Add Repository" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:5 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 +msgid "You have admin right to this group, and can edit it" +msgstr "" + +#: kallithea/templates/index_base.html:37 +msgid "Edit Repository Group" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 +#: kallithea/templates/pullrequests/pullrequest_show.html:38 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 +msgid "Description" +msgstr "" + +#: kallithea/templates/index_base.html:60 +msgid "Last Change" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 +msgid "Tip" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 +#: kallithea/templates/pullrequests/pullrequest_data.html:16 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 +msgid "Owner" +msgstr "" + +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 +msgid "Log In" +msgstr "" + +#: kallithea/templates/login.html:17 +#, python-format +msgid "Log In to %s" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:5 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 +msgid "Username" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 +msgid "Password" +msgstr "" + +#: kallithea/templates/login.html:44 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 +msgid "Forgot your password ?" +msgstr "" + +#: kallithea/templates/login.html:55 +msgid "Don't have an account ?" +msgstr "" + +#: kallithea/templates/login.html:62 +msgid "Sign In" +msgstr "" + +#: kallithea/templates/password_reset.html:5 +msgid "Password Reset" +msgstr "" + +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 +#, python-format +msgid "Reset Your Password to %s" +msgstr "" + +#: kallithea/templates/password_reset.html:23 +#: kallithea/templates/password_reset_confirmation.html:5 +#: kallithea/templates/password_reset_confirmation.html:18 +msgid "Reset Your Password" +msgstr "" + +#: kallithea/templates/password_reset.html:30 +msgid "Email Address" +msgstr "" + +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 +msgid "Captcha" +msgstr "" + +#: kallithea/templates/password_reset.html:47 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 +msgid "" +"A password reset link will be sent to the specified email address if it " +"is registered in the system." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:23 +#, python-format +msgid "You are about to set a new password for the email address %s." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:24 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:29 +msgid "Code you received in the email" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:36 +msgid "New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:43 +msgid "Confirm New Password" +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:51 +msgid "Confirm" +msgstr "" + +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 +msgid "Sign Up" +msgstr "" + +#: kallithea/templates/register.html:22 +#, python-format +msgid "Sign Up to %s" +msgstr "" + +#: kallithea/templates/register.html:45 +msgid "Re-enter password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 +msgid "First Name" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 +msgid "Last Name" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:39 +#: kallithea/templates/admin/settings/settings.html:31 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 +msgid "Email" +msgstr "" + +#: kallithea/templates/register.html:85 +msgid "Registered accounts are ready to use and need no further action." +msgstr "" + +#: kallithea/templates/register.html:87 +msgid "Please wait for an administrator to activate your account." +msgstr "" + +#: kallithea/templates/admin/admin.html:5 +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/base/base.html:55 +msgid "Admin Journal" +msgstr "" + +#: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 +msgid "journal filter..." +msgstr "" + +#: kallithea/templates/admin/admin.html:12 +#: kallithea/templates/journal/journal.html:12 +msgid "Filter" +msgstr "" + +#: kallithea/templates/admin/admin.html:13 +#: kallithea/templates/journal/journal.html:13 +#, python-format +msgid "%s Entry" +msgid_plural "%s Entries" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/admin/admin_log.html:6 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 +msgid "Action" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:8 +msgid "Date" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:9 +msgid "From IP" +msgstr "" + +#: kallithea/templates/admin/admin_log.html:61 +msgid "No actions yet" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:5 +msgid "Authentication Settings" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:11 +#: kallithea/templates/base/base.html:61 +msgid "Authentication" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:27 +msgid "Authentication Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:29 +msgid "Enabled Plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:32 +msgid "" +"Comma-separated list of plugins; Kallithea will try user authentication " +"in plugin order" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:36 +msgid "Available built-in plugins" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:53 +msgid "Plugin" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:101 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 +msgid "Save" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:5 +#: kallithea/templates/admin/defaults/defaults.html:11 +#: kallithea/templates/base/base.html:62 +msgid "Repository Defaults" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +msgid "Type" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +msgid "Enable downloads" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 +msgid "Enable download menu on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 +msgid "Enable locking" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:5 +#: kallithea/templates/admin/gists/edit.html:18 +msgid "Edit Gist" +msgstr "" + +#: 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." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 +msgid "Gist description ..." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 +msgid "Gist lifetime" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 +msgid "Expires" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +msgid "Never" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:145 +msgid "Update Gist" +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:146 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 +msgid "Cancel" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:6 +#: kallithea/templates/admin/gists/index.html:16 +#, python-format +msgid "Private Gists for User %s" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:8 +#: kallithea/templates/admin/gists/index.html:18 +#, python-format +msgid "Public Gists for User %s" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:10 +#: kallithea/templates/admin/gists/index.html:20 +msgid "Public Gists" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:37 +#: kallithea/templates/admin/gists/show.html:25 +#: kallithea/templates/base/base.html:312 +msgid "Create New Gist" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 +msgid "Created" +msgstr "" + +#: kallithea/templates/admin/gists/index.html:66 +msgid "There are no gists yet" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:5 +#: kallithea/templates/admin/gists/new.html:18 +msgid "New Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 +msgid "Create Private Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:54 +msgid "Create Public Gist" +msgstr "" + +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 +msgid "Reset" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:5 +#: kallithea/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:10 +msgid "URL" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:37 +msgid "Private Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 +#: kallithea/templates/changeset/changeset_file_comment.html:30 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/pullrequests/pullrequest_data.html:20 +msgid "Delete" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:54 +msgid "Confirm to delete this Gist" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 +msgid "Show as Raw" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:69 +msgid "created" +msgstr "" + +#: kallithea/templates/admin/gists/show.html:82 +msgid "Show as raw" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:5 +#: kallithea/templates/admin/my_account/my_account.html:9 +#: kallithea/templates/base/base.html:397 +msgid "My Account" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:25 +#: kallithea/templates/admin/users/user_edit.html:29 +msgid "Profile" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:26 +msgid "Email Addresses" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:28 +#: kallithea/templates/admin/users/user_edit.html:31 +msgid "API Keys" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:29 +msgid "Owned Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 +msgid "Watched Repositories" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/permissions/permissions.html:30 +#: kallithea/templates/admin/user_groups/user_group_edit.html:32 +#: kallithea/templates/admin/users/user_edit.html:34 +msgid "Show Permissions" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 +msgid "Built-in" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 +#, python-format +msgid "Confirm to reset this API key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 +msgid "Expired" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 +#, python-format +msgid "Confirm to remove this API key: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 +msgid "Remove" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 +msgid "No additional API keys specified" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 +msgid "New API key" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 +msgid "Add" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 +msgid "Primary" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 +#, python-format +msgid "Confirm to delete this email: %s" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 +msgid "No additional emails specified." +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 +msgid "New email address" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:1 +msgid "Change Your Account Password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:8 +msgid "Current password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 +msgid "New password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:22 +msgid "Confirm new password" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/users/user_edit_profile.html:12 +msgid "Avatars are disabled" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_repos.html:1 +msgid "Repositories You Own" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_watched.html:1 +msgid "Repositories You are Watching" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:5 +#: kallithea/templates/admin/permissions/permissions.html:11 +#: kallithea/templates/base/base.html:60 +msgid "Default Permissions" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:28 +#: kallithea/templates/admin/settings/settings.html:29 +msgid "Global" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions.html:29 +#: kallithea/templates/admin/users/user_edit.html:32 +msgid "IP Whitelist" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:4 +msgid "Anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 +#, python-format +msgid "" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +msgid "" +"All default permissions on each repository will be reset to chosen " +"permission, note that all custom default permission on repositories will " +"be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:20 +msgid "Apply to all existing repositories" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +msgid "" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:33 +msgid "Apply to all existing repository groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +msgid "Permissions for the Default user on new repository groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 +msgid "User group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +msgid "" +"All default permissions on each user group will be reset to chosen " +"permission, note that all custom default permission on user groups will " +"be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:46 +msgid "Apply to all existing user groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +msgid "Permissions for the Default user on new user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:53 +msgid "Top level repository creation" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:61 +msgid "Repository creation with group write access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:64 +msgid "" +"With this, write permission to a repository group allows creating " +"repositories inside that group. Without this, group write permissions " +"mean nothing." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:68 +msgid "User group creation" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:71 +msgid "Enable this to allow non-admins to create user groups." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:75 +msgid "Repository forking" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:78 +msgid "Enable this to allow non-admins to fork repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 +msgid "Registration" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:88 +msgid "External auth account activation" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#, python-format +msgid "Confirm to delete this IP address: %s" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 +msgid "All IP addresses are allowed." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 +msgid "New IP address" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 +msgid "Repository Groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 +msgid "Group name" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 +msgid "Group parent" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 +msgid "Copy parent group permissions" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 +msgid "Copy permission set from parent repository group." +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 +#, python-format +msgid "%s Repository Group Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 +msgid "Add Child Group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 +#: kallithea/templates/admin/repos/repo_edit.html:12 +#: kallithea/templates/admin/repos/repo_edit.html:25 +#: kallithea/templates/admin/settings/settings.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit.html:29 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 +msgid "Settings" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 +#: kallithea/templates/admin/user_groups/user_group_edit.html:30 +#: kallithea/templates/admin/users/user_edit.html:33 +msgid "Advanced" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 +#: kallithea/templates/admin/user_groups/user_group_edit.html:31 +msgid "Permissions" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:1 +#, python-format +msgid "Repository Group: %s" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:6 +msgid "Top level repositories" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:7 +msgid "Total repositories" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:8 +msgid "Children groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 +#: kallithea/templates/admin/users/user_edit_advanced.html:8 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 +msgid "Created on" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 +#: kallithea/templates/data_table/_dt_elements.html:121 +#, python-format +msgid "Confirm to delete this group: %s with %s repository" +msgid_plural "Confirm to delete this group: %s with %s repositories" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:25 +msgid "Delete this repository group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "No hay respuesta" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 +msgid "User/User Group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 +msgid "Default" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 +msgid "Revoke" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +msgid "Add new" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +msgid "Apply to children" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 +msgid "Both" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +msgid "" +"Set or revoke permission to all children of that group, including non-" +"private repositories and other groups if selected." +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +msgid "Remove this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +msgid "Confirm to delete this group" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_show.html:4 +#, python-format +msgid "Repository group %s" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:5 +msgid "Repository Groups Administration" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 +msgid "Number of Top-level Repositories" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:12 +msgid "Clone remote repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:16 +msgid "" +"Optional: URL of a remote repository. If set, the repository will be " +"created as a clone from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 +msgid "Optionally select a group to put this repository into." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:45 +msgid "Type of repository to create." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 +msgid "Landing revision" +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:52 +msgid "" +"Default revision for files page, downloads, full text search index and " +"readme generation" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:9 +#, python-format +msgid "%s Creating Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:13 +msgid "Creating repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:27 +#, python-format +msgid "" +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" +msgstr "" + +#: kallithea/templates/admin/repos/repo_creating.html:39 +msgid "" +"We're sorry but error occurred during this operation. Please check your " +"Kallithea server logs, or contact administrator." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:8 +#, python-format +msgid "%s Repository Settings" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:34 +msgid "Extra Fields" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:37 +msgid "Caches" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:40 +msgid "Remote" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/summary/statistics.html:8 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 +msgid "Statistics" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:1 +msgid "Parent" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:5 +msgid "Set" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 +msgid "Manually set this repository as a fork of another from the list." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 +msgid "Public Journal Visibility" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 +msgid "Remove from public journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 +msgid "Add to Public Journal" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +msgid "" +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 +msgid "Change Locking" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#, python-format +msgid "Locked by %s on %s" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +msgid "Lock Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +msgid "Repository is not locked" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +msgid "" +"Force locking on the repository. Works only when anonymous access is " +"disabled. Triggering a pull locks the repository. The user who is " +"pulling locks the repository; only the user who pulled and locked it can " +"unlock it by doing a push." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 +msgid "Delete this Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#, python-format +msgid "This repository has %s fork" +msgid_plural "This repository has %s forks" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 +msgid "Detach forks" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +msgid "Delete forks" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +msgid "" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:4 +msgid "Invalidate Repository Cache" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 +msgid "" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +msgid "Prefix" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +msgid "Key" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 +msgid "Active" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +msgid "Label" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 +#, python-format +msgid "Confirm to delete this field: %s" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 +msgid "New field key" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 +msgid "New field label" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 +msgid "Enter short label" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 +msgid "New field description" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 +msgid "Enter description of a field" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 +msgid "Extra fields are disabled." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 +msgid "Private Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Empty repository" +msgid "Fork of repository" +msgstr "Repositorio vacío" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 +msgid "Remote repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 +msgid "Pull Changes from Remote Repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 +msgid "This repository does not have a remote repository URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +msgid "Permanent Repository ID" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +msgid "What is that?" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 +msgid "URL by id" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +msgid "" +"In case this repository is renamed or moved into another group the " +"repository URL changes.\n" +" Using the above permanent URL guarantees " +"that this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any " +"other cases that you need to hardcode the URL into a 3rd party service." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +msgid "Remote repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +msgid "Repository URL" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "" +"Optional: URL of a remote repository. If set, the repository can be " +"pulled from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 +msgid "Default revision for files page, downloads, whoosh and readme" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 +msgid "Change owner of this repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +msgid "Processed progress" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:10 +msgid "Reset Statistics" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:10 +msgid "Confirm to remove current statistics." +msgstr "" + +#: kallithea/templates/admin/repos/repos.html:5 +msgid "Repositories Administration" +msgstr "" + +#: kallithea/templates/admin/repos/repos.html:43 +msgid "State" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:5 +msgid "Settings Administration" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:27 +msgid "VCS" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:28 +msgid "Remap and Rescan" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:30 +msgid "Visual" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:4 +msgid "Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:33 +msgid "Full Text Search" +msgstr "" + +#: kallithea/templates/admin/settings/settings.html:34 +msgid "System Info" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:4 +msgid "Send test email to" +msgstr "" + +#: kallithea/templates/admin/settings/settings_email.html:12 +msgid "Send" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:4 +msgid "Site branding" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:12 +msgid "HTTP authentication realm" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +msgid "" +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 +msgid "ReCaptcha public key" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:35 +msgid "Public key for reCaptcha system." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:40 +msgid "ReCaptcha private key" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:43 +msgid "" +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 +msgid "Save Settings" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:3 +msgid "Built-in Mercurial Hooks (Read-Only)" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 +msgid "" +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:60 +msgid "Failed to remove hook" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 +msgid "Delete records of missing repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:12 +msgid "" +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:17 +msgid "Invalidate cache for all repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:20 +msgid "Check this to reload data and clear cache keys for all repositories." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:25 +msgid "Install Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 +msgid "Overwrite existing Git hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 +msgid "Rescan Repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:4 +msgid "Index build option" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:12 +msgid "" +"This option completely reindexeses all of the repositories for proper " +"fulltext search capabilities." +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:18 +msgid "Reindex" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +msgid "Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 +msgid "Check for updates" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:8 +msgid "Kallithea configuration file" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:9 +msgid "Python version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +msgid "Upgrade info endpoint" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 +msgid "Note: please make sure this server can access this URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:23 +msgid "Python Packages" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:9 +msgid "Show repository size after push" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:15 +msgid "Log user push commands" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:21 +msgid "Log user pull commands" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:27 +msgid "Update repository after push (hg update)" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:33 +msgid "Mercurial extensions" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:38 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +msgid "Enable hgsubversion extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:47 +msgid "" +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:59 +msgid "Location of repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:64 +msgid "" +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 +msgid "" +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:4 +msgid "General" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:9 +msgid "Use repository extra fields" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:12 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:17 +msgid "Show Kallithea version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:20 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 +msgid "" +"Gravatar URL allows you to use another avatar server application.\n" +" The following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 +msgid "" +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " +"variables are available:\n" +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repositories" +msgid "Repository page size" +msgstr "Repositorios" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +msgid "" +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:65 +msgid "" +"Number of items displayed in the admin pages grids before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:70 +msgid "Icons" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:75 +msgid "Show public repository icon on repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:84 +msgid "Show public/private icons next to repository names." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:89 +msgid "Meta Tagging" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:94 +msgid "" +"Parses meta tags from the repository description field and turns them " +"into colored tags." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:5 +msgid "Add user group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit.html:11 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 +msgid "User Groups" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:12 +#: kallithea/templates/admin/user_groups/user_groups.html:24 +msgid "Add User Group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 +msgid "Short, optional description for this user group." +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit.html:5 +#, python-format +msgid "%s user group settings" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit.html:33 +msgid "Show Members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:1 +#, python-format +msgid "User Group: %s" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 +msgid "Members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 +#: kallithea/templates/data_table/_dt_elements.html:102 +#, python-format +msgid "Confirm to delete this user group: %s" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:21 +msgid "Delete this user group" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 +msgid "No members yet" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 +msgid "Chosen group members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 +msgid "Available members" +msgstr "" + +#: kallithea/templates/admin/user_groups/user_groups.html:5 +msgid "User Groups Administration" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:5 +msgid "Add user" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:10 +#: kallithea/templates/admin/users/user_edit.html:11 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 +msgid "Users" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:12 +#: kallithea/templates/admin/users/users.html:23 +msgid "Add User" +msgstr "" + +#: kallithea/templates/admin/users/user_add.html:41 +msgid "Password confirmation" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:5 +#, python-format +msgid "%s user settings" +msgstr "" + +#: kallithea/templates/admin/users/user_edit.html:30 +msgid "Emails" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:1 +#, python-format +msgid "User: %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:7 +#: kallithea/templates/admin/users/user_edit_profile.html:32 +msgid "Source of Record" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:9 +#: kallithea/templates/admin/users/users.html:41 +msgid "Last Login" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:10 +msgid "Member of User Groups" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:21 +#: kallithea/templates/data_table/_dt_elements.html:90 +#, python-format +msgid "Confirm to delete this user: %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_advanced.html:23 +msgid "Delete this user" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_ips.html:7 +#, python-format +msgid "Inherited from %s" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:39 +msgid "Name in Source of Record" +msgstr "" + +#: kallithea/templates/admin/users/user_edit_profile.html:53 +msgid "New password confirmation" +msgstr "" + +#: kallithea/templates/admin/users/users.html:5 +msgid "Users Administration" +msgstr "" + +#: kallithea/templates/admin/users/users.html:44 +msgid "Auth Type" +msgstr "" + +#: kallithea/templates/base/base.html:16 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: kallithea/templates/base/base.html:28 +msgid "Support" +msgstr "" + +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 +msgid "Mercurial repository" +msgstr "" + +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 +msgid "Git repository" +msgstr "" + +#: kallithea/templates/base/base.html:115 +msgid "Create Fork" +msgstr "" + +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 +msgid "Summary" +msgstr "" + +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 +msgid "Changelog" +msgstr "" + +#: kallithea/templates/base/base.html:133 +#: kallithea/templates/files/files.html:11 +msgid "Files" +msgstr "" + +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 +msgid "Options" +msgstr "" + +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 +msgid "Compare Fork" +msgstr "" + +#: kallithea/templates/base/base.html:158 +msgid "Compare" +msgstr "" + +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 +#: kallithea/templates/search/search.html:14 +#: kallithea/templates/search/search.html:67 +msgid "Search" +msgstr "" + +#: kallithea/templates/base/base.html:164 +msgid "Unlock" +msgstr "" + +#: kallithea/templates/base/base.html:166 +msgid "Lock" +msgstr "" + +#: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 +msgid "Unfollow" +msgstr "" + +#: kallithea/templates/base/base.html:178 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 +msgid "Create Pull Request" +msgstr "" + +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:308 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:309 +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:313 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:315 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:316 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:321 +msgid "Search in repositories" +msgstr "" + +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:360 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:369 +msgid "Login to Your Account" +msgstr "" + +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:400 +msgid "Log Out" +msgstr "" + +#: kallithea/templates/base/base.html:524 +msgid "Parent rev." +msgstr "" + +#: kallithea/templates/base/base.html:533 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 +msgid "Inherit defaults" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:15 +#, python-format +msgid "" +"Select to inherit global settings, IP whitelist and permissions from the " +"%s." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:23 +msgid "Create repositories" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:33 +msgid "Create user groups" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:37 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:43 +msgid "Fork repositories" +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:47 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:13 +#: kallithea/templates/changelog/changelog.html:41 +msgid "Show" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:22 +msgid "No permissions defined yet" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:30 +#: kallithea/templates/base/perms_summary.html:55 +msgid "Permission" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:32 +#: kallithea/templates/base/perms_summary.html:57 +msgid "Edit Permission" +msgstr "" + +#: kallithea/templates/base/perms_summary.html:92 +msgid "No permission defined" +msgstr "" + +#: kallithea/templates/base/root.html:28 +msgid "Retry" +msgstr "" + +#: kallithea/templates/base/root.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." +msgstr "" + +#: kallithea/templates/base/root.html:30 +msgid "Unable to post" +msgstr "" + +#: kallithea/templates/base/root.html:31 +msgid "Add Another Comment" +msgstr "" + +#: kallithea/templates/base/root.html:32 +msgid "Stop following this repository" +msgstr "" + +#: kallithea/templates/base/root.html:33 +msgid "Start following this repository" +msgstr "" + +#: kallithea/templates/base/root.html:34 +msgid "Group" +msgstr "" + +#: kallithea/templates/base/root.html:35 +msgid "Loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:36 +msgid "loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:37 +msgid "Search truncated" +msgstr "" + +#: kallithea/templates/base/root.html:38 +msgid "No matching files" +msgstr "" + +#: kallithea/templates/base/root.html:39 +msgid "Open New Pull Request from {0}" +msgstr "" + +#: kallithea/templates/base/root.html:40 +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +msgid "Show Selected Changesets {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "Seleccionar cambios" + +#: kallithea/templates/base/root.html:52 +msgid "Specify changeset" +msgstr "" + +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 +#, python-format +msgid "%s Changelog" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:23 +#, python-format +msgid "showing %d out of %d revision" +msgid_plural "showing %d out of %d revisions" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changelog/changelog.html:47 +msgid "Clear selection" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:54 +msgid "Go to tip of repository" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 +#, python-format +msgid "Compare fork with %s" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:61 +#, python-format +msgid "Compare fork with parent repository (%s)" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:65 +#: kallithea/templates/files/files.html:29 +msgid "Branch filter:" +msgstr "" + +#: kallithea/templates/changelog/changelog.html:221 +msgid "There are no changes yet" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:4 +#: kallithea/templates/changeset/changeset.html:77 +msgid "Removed" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:5 +#: kallithea/templates/changeset/changeset.html:78 +msgid "Changed" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:6 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:38 +msgid "Added" +msgstr "" + +#: kallithea/templates/changelog/changelog_details.html:8 +#: kallithea/templates/changelog/changelog_details.html:9 +#: kallithea/templates/changelog/changelog_details.html:10 +#: kallithea/templates/changeset/changeset.html:81 +#: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 +#, python-format +msgid "Affected %s files" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%s committed on %s" +msgid "%s comments" +msgstr "%s anotó en %s" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:8 +#, python-format +msgid "%s Changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:34 +msgid "Changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 +msgid "Raw diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:46 +msgid "Patch diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 +msgid "Download diff" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 +msgid "Merge" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:96 +msgid "Grafted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:102 +msgid "Transplanted from:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:108 +msgid "Replaced by:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:122 +msgid "Preceded by:" +msgstr "" + +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 +#, python-format +msgid "%s file changed" +msgid_plural "%s files changed" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 +#, python-format +msgid "%s file changed with %s insertions and %s deletions" +msgid_plural "%s files changed with %s insertions and %s deletions" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Show full diff anyway" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#, fuzzy +#| msgid "%s committed on %s" +msgid "comment" +msgstr "%s anotó en %s" + +#: kallithea/templates/changeset/changeset_file_comment.html:21 +msgid "on pull request" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:22 +msgid "No title" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:24 +msgid "on this changeset" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:30 +msgid "Delete comment?" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 +msgid "Status change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +msgid "Finish pull request" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 +msgid "Comment" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:137 +msgid "You need to be logged in to comment." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:137 +msgid "Login now" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:141 +msgid "Hide" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:153 +#, python-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:154 +#, python-format +msgid "%d inline" +msgid_plural "%d inline" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_file_comment.html:155 +#, python-format +msgid "%d general" +msgid_plural "%d general" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/changeset/changeset_range.html:5 +#, python-format +msgid "%s Changesets" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 +msgid "Files affected" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Sin modificar" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Revisión desconocida %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Sin nombre de archivo" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:43 +msgid "Show full diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 +msgid "Show full side-by-side diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:72 +msgid "Show inline comments" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:5 +msgid "No changesets" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 +msgid "Show merge diff" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:54 +msgid "is" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:55 +#, python-format +msgid "%s changesets" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:56 +msgid "behind" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:6 +#: kallithea/templates/compare/compare_diff.html:8 +#, python-format +msgid "%s Compare" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:13 +#: kallithea/templates/compare/compare_diff.html:41 +msgid "Compare Revisions" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:39 +msgid "Swap" +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:48 +msgid "Compare revisions, branches, bookmarks, or tags." +msgstr "" + +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 +#, python-format +msgid "Showing %s commit" +msgid_plural "Showing %s commits" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/compare/compare_diff.html:95 +msgid "Show full diff" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:23 +msgid "Public repository" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:29 +msgid "Repository creation in progress..." +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:42 +msgid "No changesets yet" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 +#, python-format +msgid "Subscribe to %s rss feed" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 +#, python-format +msgid "Subscribe to %s atom feed" +msgstr "" + +#: kallithea/templates/data_table/_dt_elements.html:76 +msgid "Creating" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset on" +msgstr "Cambio" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Rama" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +msgid "Status change:" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "La petición pull esta cerrada y no se puede actualizar." + +#: kallithea/templates/email_templates/password_reset.html:9 +#, python-format +msgid "Hello %s" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:16 +msgid "We have received a request to reset the password for your account." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 +msgid "To set a new password, click the following link" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:33 +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:44 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Pull request updated" +msgid "Pull request" +msgstr "Petición pull actualizada" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "Error al crear la petición de pull: %s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Error creating pull request: %s" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Error al crear la petición de pull: %s" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" +msgstr "" + +#: kallithea/templates/files/diff_2way.html:15 +#, python-format +msgid "%s File side-by-side diff" +msgstr "" + +#: kallithea/templates/files/diff_2way.html:19 +#: kallithea/templates/files/file_diff.html:8 +msgid "File diff" +msgstr "" + +#: kallithea/templates/files/file_diff.html:4 +#, python-format +msgid "%s File Diff" +msgstr "" + +#: kallithea/templates/files/files.html:4 +#: kallithea/templates/files/files.html:77 +#, python-format +msgid "%s Files" +msgstr "" + +#: kallithea/templates/files/files_add.html:4 +#, python-format +msgid "%s Files Add" +msgstr "" + +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 +#: kallithea/templates/files/files_ypjax.html:3 +msgid "Location" +msgstr "" + +#: kallithea/templates/files/files_add.html:41 +msgid "Enter filename..." +msgstr "" + +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 +msgid "or" +msgstr "" + +#: kallithea/templates/files/files_add.html:43 +msgid "Upload File" +msgstr "" + +#: kallithea/templates/files/files_add.html:47 +msgid "Create New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:53 +msgid "New file type" +msgstr "" + +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:34 +#: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 +msgid "Commit Changes" +msgstr "" + +#: kallithea/templates/files/files_browser.html:37 +msgid "Search File List" +msgstr "" + +#: kallithea/templates/files/files_browser.html:42 +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 +msgid "Last Committer" +msgstr "" + +#: kallithea/templates/files/files_delete.html:4 +#, python-format +msgid "%s Files Delete" +msgstr "" + +#: kallithea/templates/files/files_delete.html:12 +#: kallithea/templates/files/files_delete.html:30 +msgid "Delete file" +msgstr "" + +#: kallithea/templates/files/files_edit.html:4 +#, python-format +msgid "%s File Edit" +msgstr "" + +#: kallithea/templates/files/files_edit.html:21 +msgid "Edit file" +msgstr "" + +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 +msgid "Show Annotation" +msgstr "" + +#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 +msgid "Source" +msgstr "" + +#: kallithea/templates/files/files_history_box.html:2 +#, python-format +msgid "%s author" +msgid_plural "%s authors" +msgstr[0] "" +msgstr[1] "" + +#: kallithea/templates/files/files_source.html:6 +msgid "Diff to Revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:7 +msgid "Show at Revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + +#: kallithea/templates/files/files_source.html:10 +msgid "Show Authors" +msgstr "" + +#: kallithea/templates/files/files_source.html:26 +msgid "Show Source" +msgstr "" + +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:41 +msgid "Deleting files allowed only when on branch head revision" +msgstr "" + +#: kallithea/templates/files/files_source.html:58 +#, python-format +msgid "Binary file (%s)" +msgstr "" + +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + +#: kallithea/templates/files/files_source.html:73 +msgid "Show as raw." +msgstr "" + +#: kallithea/templates/files/files_ypjax.html:5 +msgid "annotation" +msgstr "" + +#: kallithea/templates/files/files_ypjax.html:23 +msgid "Go Back" +msgstr "" + +#: kallithea/templates/files/files_ypjax.html:24 +msgid "No files at given path" +msgstr "" + +#: kallithea/templates/followers/followers.html:5 +#, python-format +msgid "%s Followers" +msgstr "" + +#: kallithea/templates/followers/followers.html:9 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 +msgid "Followers" +msgstr "" + +#: kallithea/templates/followers/followers_data.html:9 +msgid "Started following -" +msgstr "" + +#: kallithea/templates/forks/fork.html:5 +#, python-format +msgid "Fork repository %s" +msgstr "" + +#: kallithea/templates/forks/fork.html:25 +msgid "Fork name" +msgstr "" + +#: kallithea/templates/forks/fork.html:53 +msgid "Default revision for files page, downloads, whoosh, and readme." +msgstr "" + +#: kallithea/templates/forks/fork.html:58 +msgid "Private" +msgstr "" + +#: kallithea/templates/forks/fork.html:66 +msgid "Copy permissions" +msgstr "" + +#: kallithea/templates/forks/fork.html:69 +msgid "Copy permissions from forked repository" +msgstr "" + +#: kallithea/templates/forks/fork.html:75 +msgid "Update after clone" +msgstr "" + +#: kallithea/templates/forks/fork.html:78 +msgid "Checkout source after making a clone" +msgstr "" + +#: kallithea/templates/forks/fork.html:85 +msgid "Fork this Repository" +msgstr "" + +#: kallithea/templates/forks/forks.html:5 +#, python-format +msgid "%s Forks" +msgstr "" + +#: kallithea/templates/forks/forks.html:9 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 +msgid "Forks" +msgstr "" + +#: kallithea/templates/forks/forks_data.html:14 +msgid "Forked" +msgstr "" + +#: kallithea/templates/forks/forks_data.html:24 +msgid "There are no forks yet" +msgstr "" + +#: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 +msgid "RSS journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:34 +msgid "My Repositories" +msgstr "" + +#: kallithea/templates/journal/journal_data.html:42 +msgid "No entries yet" +msgstr "" + +#: kallithea/templates/journal/public_journal.html:10 +msgid "ATOM public journal feed" +msgstr "" + +#: kallithea/templates/journal/public_journal.html:11 +msgid "RSS public journal feed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:4 +#: kallithea/templates/pullrequests/pullrequest.html:8 +msgid "New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:26 +#: kallithea/templates/pullrequests/pullrequest_data.html:15 +#: kallithea/templates/pullrequests/pullrequest_show.html:29 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 +msgid "Title" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:28 +msgid "Summarize the changes - or leave empty" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 +msgid "Write a short description on this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:40 +msgid "Changeset flow" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:46 +msgid "Origin repository" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:62 +msgid "Destination repository" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:6 +msgid "No entries" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:14 +msgid "Vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:18 +msgid "From" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:19 +msgid "To" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:28 +#, python-format +msgid "You voted: %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:30 +msgid "You didn't vote" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:35 +msgid "(no title)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:37 +#: kallithea/templates/pullrequests/pullrequest_show.html:31 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 +msgid "Closed" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:67 +msgid "Delete Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:68 +msgid "Confirm to delete this pull request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_data.html:70 +#, python-format +msgid "Confirm again to delete this pull request with %s comments" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:6 +#, python-format +msgid "%s Pull Request %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:10 +#, python-format +msgid "Pull request %s from %s#%s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:54 +msgid "Summarize the changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 +msgid "Pull request status calculated from votes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:81 +msgid "Origin" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:86 +msgid "on" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:92 +msgid "Target" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:95 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:103 +msgid "Pull changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:234 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:240 +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:243 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:268 +msgid "Pull Request Content" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:6 +#, python-format +msgid "%s Pull Requests" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:11 +#, python-format +msgid "Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:13 +#, python-format +msgid "Pull Requests to '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 +msgid "Open New Pull Request" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 +#, python-format +msgid "Show Pull Requests to %s" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 +#, python-format +msgid "Show Pull Requests from '%s'" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:28 +msgid "Hide closed pull requests (only show open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:30 +msgid "Show closed pull requests (in addition to open pull requests)" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 +msgid "Pull Requests Created by Me" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 +msgid "Pull Requests I Participate In" +msgstr "" + +#: kallithea/templates/search/search.html:6 +#, python-format +msgid "%s Search" +msgstr "" + +#: kallithea/templates/search/search.html:8 +#: kallithea/templates/search/search.html:16 +msgid "Search in All Repositories" +msgstr "" + +#: kallithea/templates/search/search.html:47 +msgid "Search term" +msgstr "" + +#: kallithea/templates/search/search.html:54 +msgid "Search in" +msgstr "" + +#: kallithea/templates/search/search.html:56 +msgid "File contents" +msgstr "" + +#: kallithea/templates/search/search.html:57 +msgid "Commit messages" +msgstr "" + +#: kallithea/templates/search/search.html:58 +msgid "File names" +msgstr "" + +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 +msgid "Permission denied" +msgstr "" + +#: kallithea/templates/summary/statistics.html:4 +#, python-format +msgid "%s Statistics" +msgstr "" + +#: kallithea/templates/summary/statistics.html:16 +#: kallithea/templates/summary/summary.html:36 +#, python-format +msgid "%s ATOM feed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:17 +#: kallithea/templates/summary/summary.html:37 +#, python-format +msgid "%s RSS feed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 +msgid "Enable" +msgstr "" + +#: kallithea/templates/summary/statistics.html:38 +msgid "Stats gathered: " +msgstr "" + +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 +msgid "files" +msgstr "" + +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 +msgid "Show more" +msgstr "" + +#: kallithea/templates/summary/statistics.html:405 +msgid "commits" +msgstr "" + +#: kallithea/templates/summary/statistics.html:406 +msgid "files added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:407 +msgid "files changed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:408 +msgid "files removed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:410 +msgid "commit" +msgstr "" + +#: kallithea/templates/summary/statistics.html:411 +msgid "file added" +msgstr "" + +#: kallithea/templates/summary/statistics.html:412 +msgid "file changed" +msgstr "" + +#: kallithea/templates/summary/statistics.html:413 +msgid "file removed" +msgstr "" + +#: kallithea/templates/summary/summary.html:5 +#, python-format +msgid "%s Summary" +msgstr "" + +#: kallithea/templates/summary/summary.html:14 +#, python-format +msgid "Repository locked by %s" +msgstr "" + +#: kallithea/templates/summary/summary.html:16 +msgid "Repository unlocked" +msgstr "" + +#: kallithea/templates/summary/summary.html:22 +msgid "Fork of" +msgstr "" + +#: kallithea/templates/summary/summary.html:27 +msgid "Clone from" +msgstr "" + +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:73 +msgid "Show by Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:84 +msgid "Trending files" +msgstr "" + +#: kallithea/templates/summary/summary.html:98 +msgid "Download" +msgstr "" + +#: kallithea/templates/summary/summary.html:101 +msgid "There are no downloads yet" +msgstr "" + +#: kallithea/templates/summary/summary.html:103 +msgid "Downloads are disabled for this repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:109 +msgid "Download as zip" +msgstr "" + +#: kallithea/templates/summary/summary.html:113 +msgid "Check this to download archive with subrepos" +msgstr "" + +#: kallithea/templates/summary/summary.html:115 +msgid "With subrepos" +msgstr "" + +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 +msgid "Feed" +msgstr "" + +#: kallithea/templates/summary/summary.html:175 +msgid "Latest Changes" +msgstr "" + +#: kallithea/templates/summary/summary.html:177 +msgid "Quick Start" +msgstr "" + +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 +#, python-format +msgid "Readme file from revision %s:%s" +msgstr "" + +#: kallithea/templates/summary/summary.html:298 +#, python-format +msgid "Download %s as %s" +msgstr "" + +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "" +#~ "No hay ningún indice para buscar. Por favor, ejecute el indexador " +#~ "whoosh" + +#, fuzzy +#~| msgid "Empty repository" +#~ msgid "Repository Group" +#~ msgstr "Repositorio vacío" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Cerrado, reemplazado por %s." + +#~ msgid "Closing." +#~ msgstr "Cerrado." diff --git a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po @@ -7,101 +7,121 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" -"PO-Revision-Date: 2017-07-26 06:43+0000\n" -"Last-Translator: Étienne Gilli \n" -"Language-Team: French " -"\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 \n" +"Language-Team: French \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 2.16-dev\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +"X-Generator: Weblate 3.6-dev\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Aucun" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(fermé)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "Afficher les espaces et tabulations" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorer les espaces et tabulations" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Augmenter le contexte du diff à %(num)s lignes" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +msgid "No permission to change status" +msgstr "Permission manquante pour changer le statut" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 msgid "Such revision does not exist for this repository" msgstr "Une telle révision n'existe pas pour ce dépôt" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" -"La modification de l'état sur un ensemble de modifications associé à une " -"demande de tirage fermé n'est pas autorisé" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Sélectionner le changeset" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, python-format +msgid "Could not find other repository %s" +msgstr "Impossible de trouver l'autre dépôt %s" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "Impossible de comparer des dépôts de types différents" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "Impossible d'afficher un diff vide" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "Aucun ancêtre trouvé pour le diff de fusion" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "Plusieurs ancêtres de fusion trouvés pour la comparaison de fusion" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "Impossible de comparer des dépôts sans utiliser un ancêtre commun" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "Pas de réponse" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "Erreur inconnue" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." msgstr "" "Le serveur n’a pas pu interpréter la requête à cause d’une erreur de " "syntaxe." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Accès interdit à cette ressource" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Vous n’avez pas la permission de voir cette page" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Ressource introuvable" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -109,370 +129,363 @@ msgstr "" "La requête n’a pu être traitée en raison d’une erreur survenue sur le " "serveur." -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Changements sur le dépôt %s" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "%s a commité, le %s" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "Cet ensemble de changements était trop important et a été découpé…" + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 #, python-format msgid "%s %s feed" msgstr "Flux %s de %s" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "Cet ensemble de changements était trop important et a été découpé…" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s a commité, le %s" - -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" +msgstr "Changements sur le dépôt %s" + +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Ajouter un nouveau fichier" -#: kallithea/controllers/files.py:92 +#: 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:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "%s à %s" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, 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:317 +#: kallithea/controllers/files.py:312 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:328 +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Le fichier %s a été supprimé via Kallithea" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "Suppression du fichier %s effectuée avec succès" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 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:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "%s édité via Kallithea" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "Aucun changement" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "%s ajouté par Kallithea" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "Aucun contenu" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "Aucun nom de fichier" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 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:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "Dépôt vide" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Tags" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "Groupes" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Dépôts" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Branche" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Branches fermées" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "Étiquette" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "Signet" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Journal public" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Historique" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "Mauvais captcha" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "Vous vous êtes inscrits avec succès à Kallithea" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "Vous vous êtes inscrit avec succès avec %s" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" -msgstr "Un lien de confirmation de réinitialisation de mot de passe a été envoyé" - -#: kallithea/controllers/login.py:246 +msgstr "" +"Un lien de confirmation de réinitialisation de mot de passe a été envoyé" + +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" msgstr "Clé de réinitialisation de mot de passe invalide" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "Mot de passe mis à jour avec succès" -#: kallithea/controllers/pullrequests.py:124 -#, python-format -msgid "%s (closed)" -msgstr "%s (fermé)" - -#: kallithea/controllers/pullrequests.py:152 -#: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 -msgid "Changeset" -msgstr "Changements" - -#: kallithea/controllers/pullrequests.py:173 -msgid "Special" -msgstr "Spécial" - -#: kallithea/controllers/pullrequests.py:174 -msgid "Peer branches" -msgstr "Branches appairées" - -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 -msgid "Bookmarks" -msgstr "Signets" - -#: kallithea/controllers/pullrequests.py:310 -#, python-format -msgid "Error creating pull request: %s" -msgstr "Erreur de création de la demande de pull : %s" - -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "Aucune description" - -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "La requête de pull a été ouverte avec succès" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 +#: kallithea/controllers/pullrequests.py:71 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "Reviewer spécifié \"%s\" non valide" -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:133 +#, python-format +msgid "%s (closed)" +msgstr "%s (fermé)" + +#: kallithea/controllers/pullrequests.py:160 +#: kallithea/templates/changeset/changeset.html:12 +msgid "Changeset" +msgstr "Changements" + +#: kallithea/controllers/pullrequests.py:181 +msgid "Special" +msgstr "Spécial" + +#: kallithea/controllers/pullrequests.py:182 +msgid "Peer branches" +msgstr "Branches appairées" + +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +msgid "Bookmarks" +msgstr "Signets" + +#: kallithea/controllers/pullrequests.py:320 +#, python-format +msgid "Error creating pull request: %s" +msgstr "Erreur de création de la demande de pull : %s" + +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 msgid "Error occurred while creating pull request" msgstr "Une erreur est survenue durant la création de la pull request" -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "Changeset manquant depuis la précédente pull request :" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Nouveau changeset sur %s %s depuis la précédente pull request :" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" -"L'ancêtre n'a pas changé - montrer les différences avec la version " -"précédente :" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" -"Cette demande de pull est basée sur une autre révision %s et il n'y a pas" -" de diff simple." - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Aucun changement constaté sur %s %s depuis la version précédente." - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Fermé, remplacé par %s." - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "Mise à jour de la pull request créée" - -#: kallithea/controllers/pullrequests.py:514 +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "La requête de pull a été ouverte avec succès" + +#: kallithea/controllers/pullrequests.py:375 +msgid "New pull request iteration created" +msgstr "Nouvelle itération de requête de pull créée" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "Entretemps, les relecteurs suivants on été ajoutés : %s" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "Entretemps, les relecteurs suivants ont été supprimés : %s" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Aucune description" + +#: kallithea/controllers/pullrequests.py:432 msgid "Pull request updated" msgstr "Pull request mise à jour" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "Révision %s non trouvée dans %s" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" +"Erreur : Pas de changeset trouvé lors de l'affichage la requête de pull " +"de %s." + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." msgstr "Cette pull request a déjà été fusionnée à %s." -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "Cette pull request a été fermée et ne peut pas être mise à jour." -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "Cette demande de pull peut être mise à jour avec les modifications de %s :" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "Pas de changeset trouvé pour ce pull request." - -#: kallithea/controllers/pullrequests.py:627 +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" +"Les modifications additionnelles suivantes sont disponibles sur %s :" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "Pas de changeset additionnel trouvé pour cette requête de pull." + +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." -msgstr "Note: La branche %s a une autre tête: %s." - -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "Le smises à jour des Git pull requests ne sont pas encore supportées." - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "Permission manquante pour changer le statut du pull request" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "Fermeture." - -#: kallithea/controllers/search.py:135 +msgstr "Note: La branche %s a une autre tête : %s." + +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" +"Les itérations des requêtes de pull Git ne sont pas encore supportées." + +#: kallithea/controllers/pullrequests.py:566 +#, python-format +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "" +"Erreur : certains changesets n'ont pas été trouvés lors de l'affichage la " +"requête de pull depuis %s." + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" +"Le diff ne peut pas être affiché : révisions des requêtes de pull " +"introuvables." + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." -msgstr "Requête invalide. Essayer de la mettre entre guillemets." +msgstr "Requête invalide. Essayez de la mettre entre guillemets." #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "" -"L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de " -"code Whoosh" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "Le serveur n'a pas d'index de recherche." + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Une erreur est survenue pendant la recherche." -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "Aucune donnée actuellement disponible" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt" @@ -486,153 +499,156 @@ msgstr "" "une erreur est survenue pendant la mise à jour des réglages " "d'authentification" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Mise à jour des réglages par défaut effectuée avec succès" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" -msgstr "Une erreur est survenue durant la mise à jour des réglages par défaut" +msgstr "" +"Une erreur est survenue durant la mise à jour des réglages par défaut" + +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "Pour toujours" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" -msgstr "Pour toujours" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 minute" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "5 minute" - -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 heure" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 jour" -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 mois" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Toujours" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "Une erreur est survenue lors de la création du gist" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "Gist %s supprimé" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:196 msgid "Unmodified" msgstr "Non modifié" -#: kallithea/controllers/admin/gists.py:262 +#: kallithea/controllers/admin/gists.py:225 msgid "Successfully updated gist content" msgstr "Le contenu du gist a été mis à jour avec succès" -#: kallithea/controllers/admin/gists.py:267 +#: kallithea/controllers/admin/gists.py:230 msgid "Successfully updated gist data" msgstr "Les données du gist on été mises à jour avec succès" -#: kallithea/controllers/admin/gists.py:270 +#: kallithea/controllers/admin/gists.py:233 #, python-format msgid "Error occurred during update of gist %s" msgstr "Une erreur est survenue durant la mise à jour du gist %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" -" fonctionnement de l’application" - -#: kallithea/controllers/admin/my_account.py:129 +"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon " +"fonctionnement de l’application" + +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "Une erreur est survenue durant la mise à jour de l'utilisateur %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "" "Une erreur est survenue durant la mise à jour du mot de passe de " "l'utilisateur" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "L’e-mail « %s » a été ajouté à l’utilisateur" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "L’e-mail a été enlevé de l’utilisateur" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "Clé d'API créée avec succès" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "Clé d'API remise à zéro avec succès" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "Clé d'API supprimée avec succès" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Lire" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Écrire" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -640,279 +656,273 @@ msgstr "Écrire" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Administration" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Interdite" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Autorisé avec activation de compte manuelle" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Autorisé avec activation de compte automatique" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "Activation manuelle du compte externe" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "Activation automatique du compte externe" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "Interdite" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Autorisé avec activation de compte manuelle" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Autorisé avec activation de compte automatique" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "Activation manuelle du compte externe" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "Activation automatique du compte externe" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Autorisée" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Permissions globales mises à jour avec succès" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Une erreur est survenue durant la mise à jour des permissions" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Une erreur est survenue durant la création du groupe de dépôts %s" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "Groupe de dépôts %s créé" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "Groupe de dépôts %s mis à jour" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" -msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s" - -#: kallithea/controllers/admin/repo_groups.py:284 +msgstr "" +"Une erreur est survenue durant la mise à jour du groupe de dépôts %s" + +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Ce groupe contient %s dépôts et ne peut être supprimé" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Ce groupe contient %s sous-groupes et ne peut pas être supprimé" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Groupe de dépôts %s supprimé" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" -msgstr "Une erreur est survenue durant la suppression du groupe de dépôts %s" - -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +msgstr "" +"Une erreur est survenue durant la suppression du groupe de dépôts %s" + +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "Impossible de révoquer votre permission d'administrateur" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Permissions du groupe de dépôts mises à jour" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "Une erreur est survenue durant la révocation de la permission" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "Erreur de création du dépôt %s" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Dépôt %s créé depuis %s" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "dépôt %s forké en tant que %s" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Dépôt %s créé" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Une erreur est survenue durant la mise à jour du dépôt %s" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "%s forks détachés" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "%s forks supprimés" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Dépôt %s supprimé" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Impossible de supprimer le dépôt %s : des forks y sont attachés" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Permissions du dépôt mises à jour" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "Une erreur est survenue durant la création du champ" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "Erreur de validation du champ : %s" + +#: kallithea/controllers/admin/repos.py:390 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "Une erreur est survenue durant la création du champ : %r" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "Une erreur est survenue durant la suppression du champ" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "-- Pas un fork --" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:446 msgid "Updated repository visibility in public journal" msgstr "La visibilité du dépôt dans le journal public a été mise à jour" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:450 msgid "An error occurred during setting this repository in public journal" msgstr "" -"Une erreur est survenue durant la configuration du journal public pour ce" -" dépôt" - -#: kallithea/controllers/admin/repos.py:512 +"Une erreur est survenue durant la configuration du journal public pour ce " +"dépôt" + +#: kallithea/controllers/admin/repos.py:466 msgid "Nothing" msgstr "[Aucun dépôt]" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:468 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:475 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération" -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 msgid "Repository has been locked" msgstr "Ce dépôt a été verrouillé" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" msgstr "Ce dépôt a été déverrouillé" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "Une erreur est survenue durant le déverrouillage" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "Invalidation du cache réalisée avec succès" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "Une erreur est survenue durant le pull depuis la source distante" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" -msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt" - -#: kallithea/controllers/admin/settings.py:170 +msgstr "" +"Une erreur est survenue durant la suppression des statistiques du dépôt" + +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "Réglages des gestionnaires de versions mis à jour" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -920,351 +930,363 @@ msgstr "" "Impossible d'activer la prise en charge de hgsubversion. La bibliothèque " "« hgsubversion » est manquante" -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 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:211 +#: kallithea/controllers/admin/settings.py:174 #, 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:226 +#: kallithea/controllers/admin/settings.py:189 #, python-format msgid "Invalidated %s repositories" msgstr "%s dépôts invalidés" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 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:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Veuillez entrer votre adresse e-mail" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Tâche d'envoi d'e-mail créée" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +msgid "Hook already exists" +msgstr "Le hook existe déjà" + +#: kallithea/controllers/admin/settings.py:357 +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 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "Groupe d'utilisateurs %s créé" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" -msgstr "Une erreur est survenue durant la création du groupe d'utilisateurs %s" - -#: kallithea/controllers/admin/user_groups.py:201 +msgstr "" +"Une erreur est survenue durant la création du groupe d'utilisateurs %s" + +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "Groupe d'utilisateurs %s mis à jour" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" -msgstr "Une erreur est survenue durant la mise à jour du groupe d'utilisateurs %s" - -#: kallithea/controllers/admin/user_groups.py:242 +msgstr "" +"Une erreur est survenue durant la mise à jour du groupe d'utilisateurs %s" + +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "Groupe d'utilisateurs supprimé avec succès" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" -msgstr "Une erreur est survenue durant la suppression du groupe d'utilisateurs" - -#: kallithea/controllers/admin/user_groups.py:314 +msgstr "" +"Une erreur est survenue durant la suppression du groupe d'utilisateurs" + +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "Le groupe cible ne peut pas être le même" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "Permissions du groupe d'utilisateurs mises à jour" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "Permissions mises à jour" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "Utilisateur %s créé" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "Une erreur est survenue durant la création de l'utilisateur %s" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "Utilisateur supprimé avec succès" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "L'utilisateur par défaut ne peut pas être modifié" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "L'adresse IP %s a été ajoutée à la liste blanche" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "Une erreur est survenue durant la sauvegarde d'IP" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "L'adresse IP a été supprimée de la liste blanche" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "IP %s non autorisée" - -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" +"Vous devez être un utilisateur enregistré pour effectuer cette action" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "Vous devez être connecté pour visualiser cette page" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "Clé d'API invalide" -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" msgstr "" -"Une fuite de jeton CSRF a été détectée - tous les jetons de formulaire sont " -"considérés comme expirés" - -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "Vous devez être connecté pour visualiser cette page" - -#: kallithea/lib/base.py:490 +"Une fuite de jeton CSRF a été détectée - tous les jetons de formulaire " +"sont considérés comme expirés" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "Dépôt non trouvé sur le système de fichiers" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "Ensemble de changements pour %s %s non trouvé dans %s" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "Fichier binaire" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Cet ensemble de changements était trop gros pour être affiché et a été " "découpé, utilisez le menu « diff » pour afficher les différences" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "Aucun changement détecté" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Deleted branch: %s" msgstr "Branche supprimée : %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:614 #, python-format msgid "Created tag: %s" msgstr "Étiquette créée : %s" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, python-format msgid "Changeset %s not found" msgstr "Ensemble de changements %s non trouvé" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "Vue de comparaison" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "et" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "%s de plus" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "révisions" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "Nom du fork %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "Requête de pull %s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "[téléchargée] archive depuis le dépôt" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "[créé] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "[mis à jour] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "[a pushé] dans" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "[a commité via Kallithea] dans le dépôt" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr " et %s de plus" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Aucun fichier" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "nouveau fichier" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "suppr." -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "renommer" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1275,760 +1297,363 @@ msgstr "" "probablement été créé ou renommé manuellement. Veuillez relancer " "l’application pour rescanner les dépôts" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "dans %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "Il y a %s" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "dans %s et %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "Il y a %s et %s" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "à l’instant" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Aucun accès au dépôt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Accès en lecture au dépôt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Accès en écriture au dépôt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Accès administrateur au dépôt" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Aucun accès au groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Accès en lecture au groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Accès en écriture au groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Accès administrateur au groupe de dépôts" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "Administrateur Kallithea" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Création de dépôt désactivée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Création de dépôt activée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Fork de dépôt désactivé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Fork de dépôt activé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Enregistrement désactivé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Enregistrer un nouvel utilisateur Kallithea auto-activé" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Pas encore relue" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "Approuvée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "Rejetée" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "En cours de relecture" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "niveau supérieur" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Groupe de dépôts, pas d'accès" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Groupe de dépôts, accès en lecture" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Groupe de dépôts, accès en écriture" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Groupe de dépôts, accès d'administration" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Groupe d'utilisateurs, pas d'accès" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Groupe d'utilisateurs, accès en lecture" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Groupe d'utilisateurs, accès en écriture" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Groupe d'utilisateurs, accès d'administration" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Création de groupes de dépôts désactivée" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Création de groupes de dépôts activée" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Création de groupes d'utilisateurs désactivée" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Création de groupes d'utilisateurs activée" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "Enregistrement désactivé" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Enregistrement des utilisateurs avec activation de compte automatique" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" -"Création de dépôts activée avec l'accès en écriture vers un groupe de " -"dépôts" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" -"Création de dépôts désactivée avec l'accès en écriture vers un groupe de " -"dépôts" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "à la ligne %s" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "niveau supérieur" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "Administrateur Kallithea" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux dépôts" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" msgstr "L'utilisateur par défaut a un accès en lecture aux nouveaux dépôts" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" msgstr "L'utilisateur par défaut a un accès en écriture aux nouveaux dépôts" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" -msgstr "L'utilisateur par défaut a un accès administrateur aux nouveaux dépôts" - -#: kallithea/model/db.py:1673 +msgstr "" +"L'utilisateur par défaut a un accès administrateur aux nouveaux dépôts" + +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" -msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes de dépôts" - -#: kallithea/model/db.py:1674 +msgstr "" +"L'utilisateur par défaut n'a pas accès aux nouveaux groupes de dépôts" + +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes de" -" dépôts" - -#: kallithea/model/db.py:1675 +"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes de " +"dépôts" + +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" "L'utilisateur par défaut a accès en écriture aux nouveaux groupes de " "dépôts" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" "L'utilisateur par défaut a accès administrateur aux nouveaux groupes de " "dépôts" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" -msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes d'utilisateurs" - -#: kallithea/model/db.py:1679 +msgstr "" +"L'utilisateur par défaut n'a pas accès aux nouveaux groupes d'utilisateurs" + +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" "L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes " "d'utilisateurs" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" "L'utilisateur par défaut a accès en écriture aux nouveaux groupes " "d'utilisateurs" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" "L'utilisateur par défaut a un accès administrateur aux nouveaux groupes " "d'utilisateurs" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "Seul un administrateur peut créer un groupe de dépôts" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" -msgstr "Les utilisateurs non-administrateurs peuvent créer des groupes de dépôts" - -#: kallithea/model/db.py:1686 +msgstr "" +"Les utilisateurs non-administrateurs peuvent créer des groupes de dépôts" + +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "Seul un administrateur peut créer des groupes d'utilisateurs" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "" "Les utilisateurs non-administrateurs peuvent créer des groupes " "d'utilisateurs" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "Seul un administrateur peut créer des dépôts de niveau supérieur" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" "Les utilisateurs non-administrateurs peuvent créer des dépôts de niveau " "supérieur" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" +"Création de dépôts activée avec l'accès en écriture vers un groupe de " +"dépôts" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" +"Création de dépôts désactivée avec l'accès en écriture vers un groupe de " +"dépôts" + +#: kallithea/model/db.py:1732 msgid "Only admins can fork repositories" msgstr "Seul un administrateur peut faire un fork de dépôt" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 msgid "Non-admins can fork repositories" msgstr "Les utilisateurs non-administrateurs peuvent faire un fork de dépôt" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "Enregistrement désactivé" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" -msgstr "Enregistrement des utilisateurs avec activation de compte automatique" - -#: kallithea/model/db.py:2238 +msgstr "" +"Enregistrement des utilisateurs avec activation de compte automatique" + +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "Pas encore relue" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "En cours de relecture" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "Non approuvée" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "Approuvée" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Veuillez entrer un identifiant" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Entrez une valeur d’au moins %(min)i caractères de long" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Veuillez entrer un mot de passe" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Entrez au moins %(min)i caractères" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "Le nom ne doit pas contenir seulement des chiffres" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "%(user)s a commenté sur le changeset %(age)s" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "%(user)s a envoyé un message %(age)s" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "%(user)s vous a mentionné %(age)s" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "%(user)s s'est enregistré sur Kallithea %(age)s" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "%(user)s a ouvert une nouvelle demande de pull %(age)s" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "%(user)s a commenté la demande de pull %(age)s" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "%(user)s a commenté sur le changeset à %(when)s" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "%(user)s a envoyé un message à %(when)s" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "%(user)s vous a mentionné à %(when)s" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "%(user)s s'est enregistré sur Kallithea à %(when)s" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "%(user)s a ouvert une nouvelle demande de pull à %(when)s" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "%(user)s a commenté la demande de pull à %(when)s" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "[Commentaire] Changeset %(short_id)s de %(repo_name)s dans %(branch)s" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" +"[Commentaire] Changeset %(short_id)s « %(message_short)s » de " +"%(repo_name)s dans %(branch)s" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "Nouvel utilisateur %(new_username)s enregistré" -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" msgstr "" -"[Ajouté] Demande de pull %(pr_nice_id)s à partir de %(ref)s pour " -"%(repo_name)s" - -#: kallithea/model/notification.py:309 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +"[Revue] %(repo_name)s PR %(pr_nice_id)s « %(pr_title_short)s » depuis " +"%(pr_source_branch)s par %(pr_owner_username)s" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" msgstr "" -"[Commentaire] Demande de pull %(pr_nice_id)s à partir de %(ref)s pour " -"%(repo_name)s" - -#: kallithea/model/notification.py:322 +"[Commentaire] %(repo_name)s PR %(pr_nice_id)s « %(pr_title_short)s » " +"depuis %(pr_source_branch)s par %(pr_owner_username)s" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "Fermeture" -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" "%(user)s veut que vous regardiez la demande de pull %(pr_nice_id)s : " "%(pr_title)s" -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "Impossible de créer une requête de pull vide" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" +"Impossible de créer la requête de pull : fusion croisée détectée, merci " +"de fusionner une révision plus vieille de %s vers %s" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "Vous n'êtes pas autorisé à créer cette requête de pull" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "Changeset manquant depuis la précédente itération :" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Nouveau changeset sur %s %s depuis la précédente itération :" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "L'ancêtre n'a pas changé - diff depuis l'itération précédente :" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" +"Cette itération est basée sur une autre révision %s et il n'y a pas de " +"diff simple." + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "Aucun changement constaté sur %s %s depuis l'itération précédente." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "Fermé, itération suivante : %s." + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "Dernier sommet" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "Nouveau enregistrement d'utilisateur" -#: kallithea/model/user.py:256 -msgid "You can't remove this user since it is crucial for the entire application" +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" msgstr "" "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " "bon fonctionnement de l’application" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2037,34 +1662,34 @@ msgstr "" "L’utilisateur \"%s\" possède %s dépôts et ne peut être supprimé. Changez " "les propriétaires ou supprimez ces dépôts : %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" msgstr "" "L’utilisateur \"%s\" possède %s groupes de dépôt et ne peut être " "supprimé. Changez les propriétaires ou supprimez ces dépôts : %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" "L’utilisateur « %s » possède %s groupes d'utilisateurs et ne peut pas " -"être supprimé. Changez les propriétaires de ces groupes d'utilisateurs ou" -" supprimez-les : %s" - -#: kallithea/model/user.py:360 +"être supprimé. Changez les propriétaires de ces groupes d'utilisateurs ou " +"supprimez-les : %s" + +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "Lien de remise à zéro du mot de passe" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "Notification de réinitialisation du mot de passe" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " @@ -2073,48 +1698,48 @@ msgstr "" "Le mot de passe de votre compte %s a été changé via le formulaire de " "réinitialisation du mot de passe." -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "Cette valeur ne peut être une liste vide" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Le nom d’utilisateur « %(username)s » existe déjà" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" msgstr "" -"Le nom d'utilisateur ne peut contenir que des caractères alphanumériques," -" des underscores (_), points, traits d'union et doit commencer avec un " +"Le nom d'utilisateur ne peut contenir que des caractères alphanumériques, " +"des underscores (_), points, traits d'union et doit commencer avec un " "caractère alphanumérique ou un underscore" -#: kallithea/model/validators.py:126 +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "L'entrée n'est pas valide" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:112 #, python-format msgid "Username %(username)s is not valid" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" -#: kallithea/model/validators.py:152 +#: kallithea/model/validators.py:133 msgid "Invalid user group name" msgstr "Nom de groupe d'utilisateurs invalide" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Le groupe d'utilisateurs « %(usergroup)s » existe déjà" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2123,65 +1748,65 @@ msgstr "" "alphanumériques, des tirets, des points, des traits d'union et doit " "commencer avec un caractère alphanumérique" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "Impossible d’assigner ce groupe en tant que parent" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Le groupe « %(group_name)s » existe déjà" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Un dépôt portant le nom « %(group_name)s » existe déjà" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "Caractères incorrects (non-ASCII) dans le mot de passe" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "Ancien mot de passe invalide" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 msgid "Invalid username or password" msgstr "Nom d'utilisateur ou mot de passe invalide" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:312 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect" -#: kallithea/model/validators.py:345 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé" -#: kallithea/model/validators.py:347 +#: kallithea/model/validators.py:330 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Un dépôt portant le nom « %(repo)s » existe déjà" -#: kallithea/model/validators.py:348 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Le dépôt « %(repo)s » existe déjà dans le groupe « %(group)s »" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Un groupe de dépôts avec le nom « %(repo)s » existe déjà" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 msgid "Invalid repository URL" msgstr "URL de dépôt invalide" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -2189,293 +1814,201 @@ msgstr "" "URL de dépôt invalide. Ce doit être une URL valide de type http, https, " "ssh, svn+http ou svn+https" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "Le fork doit être du même type que le parent" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "Vous n’avez pas la permission de créer un dépôt dans ce" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "pas de permission de créer un dépôt dans la racine" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" -msgstr "Vous n'avez pas les permissions pour créer un groupe dans cet endroit" - -#: kallithea/model/validators.py:597 +msgstr "" +"Vous n'avez pas les permissions pour créer un groupe dans cet endroit" + +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" -msgstr "Ce nom d'utilisateur ou nom de groupe d'utilisateurs n'est pas valide" - -#: kallithea/model/validators.py:690 +msgstr "" +"Ce nom d'utilisateur ou nom de groupe d'utilisateurs n'est pas valide" + +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "Ceci n’est pas un chemin valide" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 msgid "This email address is already in use" msgstr "Cette adresse e-mail est déjà enregistrée" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "L’adresse e-mail « %(email)s » n’existe pas" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -"L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" -" d’utilisateur" - -#: kallithea/model/validators.py:774 +"L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom " +"d’utilisateur" + +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Veuillez entrer une adresse IPv4 ou IPv6 valide" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "La taille du réseau (bits) doit être entre 0 et 32 (et non %(bits)r)" - -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" +"La taille du réseau (bits) doit être entre 0 et 32 (et non %(bits)r)" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Le nom de la clé ne peut consister que de letters, de traits d'union, de " "tirets ou de nombres" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "Le nom du fichier ne peut être à l'intérieur d'un répertoire" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" "Les greffons %(loaded)s et %(next_to_load)s exportent tous les deux vers " "le même nom" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "À propos" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Tableau de bord" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "Filtre rapide…" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "Dépôts" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "Ajouter un dépôt" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 msgid "Add Repository Group" msgstr "Ajouter un groupe de dépôts" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" -msgstr "Vous avez les droits d'administration sur ce groupe, et pouvez l'éditer" - -#: kallithea/templates/index_base.html:32 +msgstr "" +"Vous avez les droits d'administration sur ce groupe, et pouvez l'éditer" + +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "Modifier le groupe de dépôts" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "Nom du groupe" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "Dépôt" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "Description" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Nom" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "Dernière modification" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "Sommet" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "Propriétaire" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "Tri ascendant" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "Tri descendant" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Pas de dépôts trouvés." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Erreur d’intégrité des données." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Chargement…" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "Connexion" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "Se connecter à %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "Nom d’utilisateur" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "Mot de passe" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Se souvenir de moi" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "Rester connecté après un redémarrage du navigateur" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "Vous n’avez pas de compte ?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "Connexion" @@ -2483,47 +2016,47 @@ msgstr "Connexion" msgid "Password Reset" msgstr "Remettre le mot de passe à zéro" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" msgstr "Réinitialiser votre mot de passe à %s" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "Réinitialiser votre mot de passe" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "Adresse e-mail" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "Captcha" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:47 msgid "Send Password Reset Email" msgstr "Envoyer l'E-mail de réinitialisation du mot de passe" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:52 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -"Un lien de réinitialisation du mot de passe sera envoyé à l'adresse " -"e-mail indiquée si elle est enregistrée dans le système." - -#: kallithea/templates/password_reset_confirmation.html:19 +"Un lien de réinitialisation du mot de passe sera envoyé à l'adresse e-" +"mail indiquée si elle est enregistrée dans le système." + +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" "Vous êtes sur le point de changer le mot de passe pour l'adresse e-mail " "%s." -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." @@ -2531,106 +2064,89 @@ msgstr "" "Vous devez utiliser la même session de navigateur pour cette opération " "que celle utilisée pour la demande de réinitialisation de mot de passe." -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "Le code que vous avez reçu dans l'e-mail" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 msgid "New Password" msgstr "Nouveau mot de passe" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 msgid "Confirm New Password" msgstr "Confirmer le nouveau mot de passe" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "Confirmation" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "Inscription" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "S'inscrire sur %s" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "Confirmation" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "Prénom" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "Nom" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" "Les comptes enregistrés sont prêts à être utilisés, et ne nécessitent " "aucune autre action." -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "Merci d'attendre qu'un administrateur active votre compte." -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Aucune branche n’a été créée pour le moment" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "Branches fermées" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Aucun tag n’a été créé pour le moment" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Aucun signet n’a été créé" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "Historique d’administration" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "filtre du journal…" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "Filtre" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2638,30 +2154,16 @@ msgstr[0] "%s entrée" msgstr[1] "%s entrées" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Action" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Dépôt" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Date" @@ -2669,7 +2171,7 @@ msgstr "Date" msgid "From IP" msgstr "Depuis l’adresse IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "Aucune action n’a été enregistrée pour le moment" @@ -2678,19 +2180,19 @@ msgid "Authentication Settings" msgstr "Réglages d'authentification" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "Authentification" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "Greffons d'authentification" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "Greffons activés" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" @@ -2699,57 +2201,57 @@ msgstr "" "est aussi celui dans lequel Kallithea va essayer d'authentifier un " "utilisateur" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "Greffons inclus disponibles" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "Greffon" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "Enregistrer" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 msgid "Repository Defaults" msgstr "Réglages par défaut du dépôt" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Type" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Dépôt privé" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2757,34 +2259,34 @@ msgstr "" "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés " "comme collaborateurs." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 msgid "Enable statistics" msgstr "Activer les statistiques" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 msgid "Enable statistics window on summary page." msgstr "Afficher les statistiques sur la page du dépôt." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 msgid "Enable downloads" msgstr "Activer les téléchargements" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "Afficher le menu de téléchargements sur la page du dépôt." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "Activer le verrouillage" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "Activer le verrouillage lors d’un pull sur le dépôt." @@ -2793,7 +2295,7 @@ msgstr "Activer le verrouillage lors d’un pull sur le dépôt." msgid "Edit Gist" msgstr "Modifier le gist" -#: kallithea/templates/admin/gists/edit.html:36 +#: kallithea/templates/admin/gists/edit.html:35 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " @@ -2802,38 +2304,38 @@ 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:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "Description du gist…" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "Durée de vie du gist" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "Expire le" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 msgid "Never" msgstr "Jamais" @@ -2842,7 +2344,8 @@ msgid "Update Gist" msgstr "Mettre à jour le gist" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "Annuler" @@ -2865,16 +2368,16 @@ msgstr "Gists publics" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "Créer un nouveau gist" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "Créé" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "Il n'y a actuellement pas de gists" @@ -2883,45 +2386,45 @@ msgstr "Il n'y a actuellement pas de gis msgid "New Gist" msgstr "Nouveau gist" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "nommez ce fichier…" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "Nommer ce gist…" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "Créer un gist privé" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "Créer un gist public" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "Réinitialiser" @@ -2931,182 +2434,207 @@ msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/templates/admin/gists/show.html:35 msgid "Public Gist" msgstr "Gist public" -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/templates/admin/gists/show.html:37 msgid "Private Gist" msgstr "Gist privé" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "Supprimer" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "Confirmer la supprisson de ce gist" -#: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 #: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 #: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 #: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Modifier" -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "Montrer en brut" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "créé" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "Montrer en brut" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "Mon compte" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "Profil" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" msgstr "Adresses e-mail" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "Clés de l'API" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 msgid "Owned Repositories" msgstr "Dépôts possédés" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "Dépôts surveillés" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 msgid "Show Permissions" msgstr "Afficher les permissions" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "Inclus" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, python-format msgid "Confirm to reset this API key: %s" msgstr "Confirmer la remise à zéro de cette clé d'API : %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "a expiré" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, python-format msgid "Confirm to remove this API key: %s" msgstr "Confirmer la suppression de cette clé d'API : %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" msgstr "Supprimer" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "Pas de clés d'API supplémentaires spécifiées" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "Nouvelle clé d'API" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "Ajouter" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" +"\n" +"Les clés API sont utilisées pour permettre à des scripts et des services " +"d'accéder à %s en utilisant votre compte, comme si vous aviez fourni " +"votre mot de passe à ces scripts ou services.\n" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" +"\n" +"Comme les mots de passe, les clés API ne devraient donc jamais être " +"diffusées à des tiers, ni passés à des scripts ou services auxquels vous " +"ne faites pas confiance. Si cette diffusion a tout de même lieu, vous " +"pouvez réinitialiser la clé API sur cette page pour qu'elle ne puisse " +"plus être utilisée.\n" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "Primaire" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "Veuillez confirmer la suppression de l’e-mail : %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "Pas d'adresse email supplémentaires spécifiées." -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "Nouvelle adrese" @@ -3114,105 +2642,69 @@ msgstr "Nouvelle adrese" msgid "Change Your Account Password" msgstr "Changer le mot de passe de votre compte" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "Mot de passe actuel" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "Nouveau mot de passe" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "Confirmer le nouveau mot de passe" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "Ce compte est géré avec %s et le mot de passe ne peut pas être changé ici" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" -msgstr "Vous pouvez changer votre avatar sur" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" +"Ce compte est géré avec %s et le mot de passe ne peut pas être changé ici" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "Adresse IP actuelle" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "Gravatar" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" +msgstr "Changer l'avatar de %s sur" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "en utilisant l’adresse" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "Les avatars sont désactivés" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "Adresse courriel manquante, veuillez mettre à jour votre adresse courriel." - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "Adresse IP actuelle" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" msgstr "Dépôts dont vous êtes le propriétaire" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Aucun élément n’a été trouvé." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "Nom" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Dépôts que vous surveillez" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "Mes notifications" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "Tous" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "Commentaires" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "Demandes de pull" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "Tout marquer comme lu" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "Aucune notification pour le moment" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "Montrer Notification" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "Notifications" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "Permissions par défaut" @@ -3226,11 +2718,15 @@ msgstr "Global" msgid "IP Whitelist" msgstr "Liste blanche d'adresses IP" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "Accès anonyme" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "Permettre l'accès anonyme" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " @@ -3239,58 +2735,58 @@ msgstr "" "Autoriser l'accès à Kallithea sans le besoin de se connecter. Les " "utilisateurs anonymes ont les permissions de l'utilisateur %s." -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" "Toutes les permissions par défaut de chaque dépôt vont être " -"réinitialisées aux valeurs choisies. Notez que toutes les permissions par" -" défaut personnalisées sur les dépôts seront perdues" - -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +"réinitialisées aux valeurs choisies. Notez que toutes les permissions par " +"défaut personnalisées sur les dépôts seront perdues" + +#: kallithea/templates/admin/permissions/permissions_globals.html:20 msgid "Apply to all existing repositories" msgstr "Appliquer à tous les dépôts existants" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 msgid "Permissions for the Default user on new repositories." msgstr "Permissions pour l'utilisateur par défaut sur les nouveaux dépôts." -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 msgid "Repository group" msgstr "Groupe de dépôt" -#: kallithea/templates/admin/permissions/permissions_globals.html:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" "Toutes les permissions par défaut de chaque groupe de dépôts vont être " -"réinitialisées aux valeurs choisies. Notez que toutes les permissions par" -" défaut personnalisées sur les groupes de dépôts seront perdues" - -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +"réinitialisées aux valeurs choisies. Notez que toutes les permissions par " +"défaut personnalisées sur les groupes de dépôts seront perdues" + +#: kallithea/templates/admin/permissions/permissions_globals.html:33 msgid "Apply to all existing repository groups" msgstr "Appliquer à tous les groupes de dépôts existants" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" "Permissions pour l'utilisateur par défaut sur les nouveaux groupes de " "dépôts." -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "Groupe d'utilisateurs" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " @@ -3301,27 +2797,28 @@ msgstr "" "permissions par défaut personnalisées sur les groupes d'utilisateurs " "seront perdues" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "Appliquer à tous les groupes d'utilisateurs existants" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" "Permissions pour l'utilisateur par défaut sur les nouveaux groupes " "d'utilisateurs." -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 msgid "Top level repository creation" msgstr "Création de dépôt de niveau supérieur" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." msgstr "" "Activer pour autoriser les non-administrateurs à créer des dépôts au " "niveau supérieur." -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:57 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." @@ -3330,11 +2827,11 @@ msgstr "" "pour créer des dépôts partout. Ce comportement peut changer dans des " "versions futures." -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:61 msgid "Repository creation with group write access" msgstr "Création de dépôts avec l'accès en écriture du groupe" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:64 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " @@ -3344,75 +2841,77 @@ msgstr "" "créer des dépôts dans ce groupe. Sans ceci, le droit d'écriture pour les " "groupes n'a pas d'impact." -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "Création de groupes d'utilisateurs" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" "Activer pour autoriser les non-administrateurs à créer des groupes " "d'utilisateurs." -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:75 msgid "Repository forking" msgstr "Fork de dépôt" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:78 msgid "Enable this to allow non-admins to fork repositories." -msgstr "Activer pour autoriser les non-administrateurs à faire des fork de dépôt." - -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +msgstr "" +"Activer pour autoriser les non-administrateurs à faire des fork de dépôt." + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 msgid "Registration" msgstr "Enregistrement" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:88 msgid "External auth account activation" msgstr "Activation de l'authentification externe" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "Confirmer la suppression de cette adresse IP : %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "Toutes les adresses IP sont autorisées." -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "Nouvelle adresse IP" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "Groupes de dépôts" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "Nom de groupe" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "Parent du groupe" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "Copier les permissions du groupe parent" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "Copier les permissions à partir du groupe de dépôts parent." @@ -3421,30 +2920,29 @@ msgstr "Copier les permissions à partir du groupe de dépôts parent." msgid "%s Repository Group Settings" msgstr "Options du groupe de dépôts %s" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "Ajouter un groupe enfant" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "Options" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "Avancé" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "Permissions" @@ -3469,12 +2967,12 @@ msgstr "Groupes enfants" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "Créé le" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3485,16 +2983,32 @@ msgstr[1] "Confirmer la suppression de ce groupe : %s avec %s dépôts" msgid "Delete this repository group" msgstr "Supprimer ce groupe de dépôts" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "Non visible" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "Visible" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +msgid "Add repos" +msgstr "Ajouter un dépôt" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "Ajouter/Modifier les groupes d'utilisateurs" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "Utilisateur/groupe d'utilisateurs" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3502,28 +3016,28 @@ msgstr "Par défaut" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "Révoquer" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "Ajouter un nouveau" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "Appliquer aux enfants" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "Les deux" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." @@ -3531,48 +3045,40 @@ msgstr "" "Ajouter ou révoquer la permission pour tous les enfants de ce groupe, y " "compris les dépôts non-privés et les autres groupes si sélectionné." -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" msgstr "" "Activer le verrou lors d’un pull sur le groupe. Cette option sera " "appliquée à tous les sous-groupes et dépôts de ce groupe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "Supprimer ce groupe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "Confirmer la suppression de ce groupe" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format -msgid "%s Repository group dashboard" -msgstr "Tableau de bord du groupe de dépôts %s" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "Accueil" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "comprenant" +msgid "Repository group %s" +msgstr "Groupe de dépôts %s" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "Administration des groupes de dépôts" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "Nombre de dépôts de niveau supérieur" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 msgid "Clone remote repository" msgstr "Cloner le dépôt distant" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." @@ -3580,31 +3086,32 @@ msgstr "" "Optionnel : URL d'un dépôt distant. Si renseigné, le dépôt sera créé " "comme un clone à partir de cette URL." -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Gardez cette description précise et concise. Utilisez un fichier README " "pour des descriptions plus détaillées." -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "Type de dépôt à créer." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Révision d’arrivée" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3644,22 +3151,22 @@ msgstr "" msgid "%s Repository Settings" msgstr "Réglages du dépôt %s" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "Champs supplémentaires" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "Caches" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "Dépôt distant" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "Statistiques" @@ -3668,28 +3175,27 @@ msgid "Parent" msgstr "Parent" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "Appliquer" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." -msgstr "Marquer manuellement ce dépôt comme fork d’un autre dépôt de la liste." - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +msgstr "" +"Marquer manuellement ce dépôt comme fork d’un autre dépôt de la liste." + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "Visibilité du journal public" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "Supprimer du journal public" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "Ajouter au journal public" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." @@ -3697,36 +3203,36 @@ msgstr "" "Les actions réalisées sur ce dépôt seront visibles à tous depuis le " "journal public." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "Changer le verrouillage" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 msgid "Confirm to unlock repository." msgstr "Veuillez confirmer le déverrouillage de ce dépôt." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 msgid "Unlock Repository" msgstr "Déverrouiller le dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 #, python-format msgid "Locked by %s on %s" msgstr "Verrouillé par %s sur %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 msgid "Confirm to lock repository." msgstr "Veuillez confirmer le verrouillage de ce dépôt." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Lock Repository" msgstr "Verrouiller le dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "Ce dépôt n’est pas verrouillé" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3738,32 +3244,32 @@ msgstr "" "L'utilisateur qui fait le pull verrouille le dépôt ; seul l'utilisateur " "qui a fait le pull et a verrouillé peut déverrouiller en faisant un push." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Voulez-vous vraiment supprimer le dépôt %s ?" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "Supprimer ce dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "Ce dépôt a %s fork" msgstr[1] "Ce dépôt a %s forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "Détacher les forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "Supprimer les forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3777,11 +3283,7 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "Invalider le cache du dépôt" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." @@ -3789,95 +3291,100 @@ msgstr "" "Invalider manuellement le cache de ce dépôt. Au prochain accès sur ce " "dépôt, il sera à nouveau mis en cache." -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 msgid "List of Cached Values" msgstr "Liste des valeurs en cache" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "Préfixe" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Clé" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "Actif" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "Libellé" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Voulez-vous vraiment supprimer ce champ : %s ?" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "Clé du nouveau champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "Libellé du nouveau champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "Saisir un libellé court" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "Description du nouveau champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "Saisir la description du champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "Les champs supplémentaires sont désactivés." -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "Dépôt privé" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +msgid "Fork of repository" +msgstr "Forker du dépôt" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "URL du dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "Récupérer les modifications depuis le dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 msgid "Confirm to pull changes from remote repository." -msgstr "Voulez-vous vraiment récupérer les changements depuis le dépôt distant ?" - -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgstr "" +"Voulez-vous vraiment récupérer les changements depuis le dépôt distant ?" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "Ce dépôt n'a pas d'URL de dépôt distant." -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "ID permanent du dépôt" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "Qu'est-ce que c'est ?" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "URL par id" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3894,15 +3401,15 @@ msgstr "" "d'intégration continue, ou dans tous les cas où vous devez saisir l'URL " "« en dur » dans un service tiers." -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "Dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "URL du dépôt" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3910,21 +3417,26 @@ msgstr "" "Optionel : URL d'un dépôt distant. Si renseigné, le dépôt sera pullé à " "partir de cette URL." -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" "Révision par défaut pour les pages de fichiers, de téléchargements, de " "recherche et de documentation" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "Saisir le nom de l'utilisateur" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "Changer le propriétaire de ce dépôt." +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "Commits traités" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "Commits traités" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "Avancement" @@ -3934,13 +3446,14 @@ msgstr "Remettre les statistiques à zéro" #: kallithea/templates/admin/repos/repo_edit_statistics.html:10 msgid "Confirm to remove current statistics." -msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?" +msgstr "" +"Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?" #: kallithea/templates/admin/repos/repos.html:5 msgid "Repositories Administration" msgstr "Administration des dépôts" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "État" @@ -3961,7 +3474,7 @@ msgid "Visual" msgstr "Visuel" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "Hooks" @@ -3973,51 +3486,56 @@ msgstr "Recherche dans le texte complet" msgid "System Info" msgstr "Informations sytème" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "Envoyer un courriel de test à" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "Envoyer" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "Nom du site" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "Mettez un title personnalisé pour votre service Kallithea." + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "Mettez un title personnalisé pour votre service Kallithea." - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "Domaine d'authentification HTTP (realm)" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "Bloc HTML pour l'analytique" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "Bloc de personnalisation HTML/JavaScript/CSS" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." msgstr "" -"HTML avec du JavaScript pour les systèmes d'analyse Web comme Google " -"Analytics ou Piwik. Ceci sera ajouté en bas de chaque page." - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (potentiellement avec du JavaScript et/ou du CSS) qui sera ajouté en " +"bas de chaque page. Cela peut être utilisé pour les systèmes d'analyse de " +"trafic Web, mais aussi pour effectuer des personnalisations spécifiques à " +"une instance, comme ajouter une bannière de projet en haut de chaque page." + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "Clé publique ReCaptcha" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "Clé publique pour le système reCaptcha." -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "Clé privée ReCaptcha" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." @@ -4025,17 +3543,21 @@ msgstr "" "Clé privée pour le système reCaptcha. Définir cette valeur activera le " "captcha à l'enregistrement." -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "Enregistrer les options" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "Hooks Mercurial intégrés (lecture seule)" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "Hooks personnalisés" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." @@ -4044,44 +3566,41 @@ msgstr "" "certains évènements comme le push et le pull. Ils peuvent déclencher des " "fonctions Python ou des applications externes." -#: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom Hooks" -msgstr "Hooks personnalisés" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "Erreur lors de la suppression du hook" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "Option de scan" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "Options de scan" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "Supprimer les enregistrements de dépôts manquants" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" -"Cocher cette option pour supprimer tous les commentaires, les requêtes de" -" pull et d'autres informations liées aux dépôts qui n'existent plus sur " -"le système de fichiers." +"Cocher cette option pour supprimer tous les commentaires, les requêtes de " +"pull et d'autres informations liées aux dépôts qui n'existent plus sur le " +"système de fichiers." #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "Invalider le cache pour tous les dépôts" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." -msgstr "Cocher pour recharger les données et vider le cache pour tous les dépôts." - -#: kallithea/templates/admin/settings/settings_mapping.html:23 +msgstr "" +"Cocher pour recharger les données et vider le cache pour tous les dépôts." + +#: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "Install Git hooks" msgstr "Installer des hooks Git" -#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/templates/admin/settings/settings_mapping.html:28 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." @@ -4089,33 +3608,33 @@ msgstr "" "Vérifier si les hooks Git de Kallithea sont installés pour chaque dépôt. " "Les hooks actuels seront mis à jour vers la dernière version." -#: kallithea/templates/admin/settings/settings_mapping.html:28 +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "Écraser les hooks Git existants" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" msgstr "" "Lors de l'installation des hooks Git, écraser tous les hooks existants, " "même s'ils ne semblent pas provenir de Kallithea. ATTENTION : cette " "opération détruira tous les hooks Git que vous avez déployés à la main !" -#: kallithea/templates/admin/settings/settings_mapping.html:35 +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "Relancer le scan des dépôts" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "Option de construction de l'index" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 msgid "Build from scratch" msgstr "Construire ex nihilo" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." @@ -4123,100 +3642,83 @@ msgstr "" "Cette option ré-indexe complètement tous les dépôts pour pouvoir faire " "des recherches dans le texte complet." -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "Mettre à jour l’index" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "Vérification des mises à jour…" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "Version de Kallithea" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "Vérifier les mises à jour" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "Fichier de configuration de Kallithea" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "Version de Python" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" -msgstr "Plateforme" +msgid "Check for updates" +msgstr "Vérifier les mises à jour" #: kallithea/templates/admin/settings/settings_system.html:8 +msgid "Kallithea configuration file" +msgstr "Fichier de configuration de Kallithea" + +#: kallithea/templates/admin/settings/settings_system.html:9 +msgid "Python version" +msgstr "Version de Python" + +#: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "Plateforme" + +#: kallithea/templates/admin/settings/settings_system.html:11 msgid "Git version" msgstr "Version de Git" -#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/templates/admin/settings/settings_system.html:12 msgid "Git path" msgstr "Chemin de Git" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "Point d'accès aux informations de mise à jour" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "Note : vérifiez que le serveur peut accéder cette URL" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "Vérification des mises à jour…" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "Paquets Python" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Web" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "Nécessiter SSL pour les opérations de VCS" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" -"Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour" -" pousser ou tirer. Si le certificat SSL est manquant, une erreur « HTTP " -"406: Not Acceptable » sera renvoyée." - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "Afficher la taille du dépôt après un push" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "Journaliser les commandes de push" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "Journaliser les commandes de pull" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "Mettre à jour les dépôts après un push (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "Extensions Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 msgid "Enable largefiles extension" msgstr "Activer l'extension largefiles" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 msgid "Enable hgsubversion extension" msgstr "Activer l'extension hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." @@ -4224,54 +3726,55 @@ msgstr "" "La bibliothèque hgsubversion doit être installée. Elle permet de cloner " "des dépôts SVN distants et de les migrer vers Mercurial." -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 msgid "Location of repositories" msgstr "Emplacement des dépôts" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." msgstr "" "Cliquez pour déverrouiller. Vous devez redémarrer Kallithea pour ce que " "réglage prenne effet." -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" "Emplacement où les dépôts sont stockés sur le système de fichiers. La " -"modification de cette valeur nécessite un re-démarrage et un nouveau " -"scan." - -#: kallithea/templates/admin/settings/settings_visual.html:8 +"modification de cette valeur nécessite un re-démarrage et un nouveau scan." + +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "Général" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "Activer les champs supplémentaires sur les dépôts" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" "Permet d'enregistrer des champs personnalisés additionnels pour chaque " "dépôt." -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "Afficher la version de Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "Afficher ou cacher le numéro de version de Kallithea dans le pied de page." - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "Utiliser Gravatar sur Kallithea" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" +"Afficher ou cacher le numéro de version de Kallithea dans le pied de page." + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "Afficher les Gravatars des utilisateurs" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4303,56 +3806,61 @@ msgstr "" " {netloc} " "emplacement réseau/hôte du serveur Kallithea en cours d'utilisation." -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "URL de clone" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" msgstr "" -"Modèle de construction d'URL de clone. Par exemple : " -"'{scheme}://{user}@{netloc}/{repo}'.\n" +"Modèle de construction d'URL de clone. Par exemple : '{scheme}://{user}" +"@{netloc}/{repo}'.\n" " Les variables " "suivantes sont disponibles :\n" " {scheme} " "'http' ou 'https' envoyé à partir du serveur Kallithea en cours " "d'utilisation,\n" -" {user} nom de" -" l'utilisateur courant,\n" +" {user} nom de " +"l'utilisateur courant,\n" " {netloc} " "emplacement réseau/hôte du serveur Kallithea en cours d'utilisation,\n" " {repo} nom " "complet du dépôt,\n" -" {repoid} ID du" -" dépôt, peut être utilisé pour cloner par ID." - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "Élements du tableau de bord" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID du " +"dépôt, peut être utilisé pour cloner par ID." + +#: kallithea/templates/admin/settings/settings_visual.html:54 +msgid "Repository page size" +msgstr "Taille de la page du dépôt" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." msgstr "" -"Nombre d'éléments affichés dans la page principale du tableau de bord " -"avant d'afficher la pagination." +"Nombre d'éléments affichés dans les pages des dépôts avant d'afficher la " +"pagination." + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" +msgstr "Taille de la page d'admin" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "Élements des pages admin" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." @@ -4360,31 +3868,27 @@ msgstr "" "Nombre d'éléments affichés dans les grilles des pages admin avant " "d'afficher la pagination." -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "Icônes" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "Afficher l’icône de dépôt public sur les dépôts" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Show private repository icon on repositories" msgstr "Afficher l’icône de dépôt privé sur les dépôts" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show public/private icons next to repository names." msgstr "Afficher l’icône « public/privé » à côté du nom des dépôts." -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 msgid "Meta Tagging" msgstr "Meta-tagging" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "Styliser les méta-tags reconnus :" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." @@ -4392,24 +3896,29 @@ msgstr "" "Analyser les méta-tags dans le champ de description du dépôt et les " "transformer en tags colorés." +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "Styliser les méta-tags reconnus :" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Ajouter un groupe d'utilisateurs" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "Groupes d'utilisateurs" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "Ajouter un groupe d'utilisateurs" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "Description courte pour ce groupe d'utilisateur (optionnel)." @@ -4428,13 +3937,13 @@ msgid "User Group: %s" msgstr "Groupe d'utilisateurs : %s" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "Membres" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Voulez-vous vraiment supprimer ce groupe utilisateur : %s ?" @@ -4443,15 +3952,15 @@ msgstr "Voulez-vous vraiment supprimer ce groupe utilisateur : %s ?" msgid "Delete this user group" msgstr "Supprimer ce groupe d'utilisateurs" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Aucun membre pour l'instant" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Membres de groupe sélectionnés" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Membres disponibles" @@ -4465,17 +3974,17 @@ msgstr "Ajouter un utilisateur" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "Utilisateurs" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "Ajouter un utilisateur" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "Confirmation" @@ -4494,12 +4003,12 @@ msgid "User: %s" msgstr "Utilisateur : %s" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "Source de l'enregistrement" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "Dernière connexion" @@ -4508,7 +4017,7 @@ msgid "Member of User Groups" msgstr "Membre des groupes d'utilisateurs" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" @@ -4517,26 +4026,16 @@ msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" msgid "Delete this user" msgstr "Supprimer cet utilisateur" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "Hérité de %s" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "Changer l'avatar sur" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" -"E-mail manquant, veuillez mettre à jour l'adresse e-mail de cet " -"utilisateur." - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "Nom dans la source de l'enregistrement" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "Confirmation du nouveau mot de passe" @@ -4544,230 +4043,227 @@ msgstr "Confirmation du nouveau mot de p msgid "Users Administration" msgstr "Administration des utilisateurs" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "Type d'authentification" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "Instance de serveur : %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "Support" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "Dépôt Mercurial" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "Dépôt Git" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "Créer un fork" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "Résumé" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "Historique" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Fichiers" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "Basculer vers" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "Afficher les requêtes de pull pour %s" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "Demandes de pull" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "Options" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "Comparer le fork" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "Comparer" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "Rechercher" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "Déverrouiller" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "Verrouiller" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:174 msgid "Follow" msgstr "Suivre" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "Arrêter de suivre" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Fork" -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "Créer une requête de pull" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "Afficher les requêtes de pull pour %s" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "Basculer vers" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "Aucune correspondance trouvée" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "Afficher l'activité récente" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "Journal public" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "Afficher les gists publics" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "Tous les Gists publics" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "Mes Gists publics" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "Mes Gist privés" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "Recherche dans les dépôts" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Mes requêtes de pull" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "Non connecté" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "Connexion à votre compte" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "Vous n’avez pas de compte ?" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "Se déconnecter" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "Aucune correspondance trouvée" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" -msgstr "Raccourcis clavier" +msgid "Parent rev." +msgstr "Révision parente" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "Raccourcis globaux" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "Révision fille" + +#: kallithea/templates/base/default_perms_box.html:11 msgid "Inherit defaults" msgstr "Hériter des réglages par défaut" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -"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:28 +"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:23 msgid "Create repositories" msgstr "Création de dépôts" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" "Sélectionner cette option pour autoriser cet utilisateur à créer des " "dépôts" -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/templates/base/default_perms_box.html:33 msgid "Create user groups" msgstr "Créer des groupes d'utilisateurs" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" "Sélectionner cette option pour autoriser cet utilisateur à créer des " "groupes d'utilisateurs" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "Forker les dépôts" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" "Sélectionner cette option pour autoriser cet utilisateur à forker des " "dépôts" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "Afficher" @@ -4776,229 +4272,172 @@ msgid "No permissions defined yet" msgstr "Aucune permission définie pour l'instant" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "Permission" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "Éditer" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "Aucune permission définie" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:28 +msgid "Retry" +msgstr "Réessayer" + +#: kallithea/templates/base/root.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." +msgstr "Envoi…" + +#: kallithea/templates/base/root.html:30 +msgid "Unable to post" +msgstr "Impossible de publier" + +#: kallithea/templates/base/root.html:31 msgid "Add Another Comment" msgstr "Ajouter un autre commentaire" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:32 msgid "Stop following this repository" msgstr "Arrêter de suivre ce dépôt" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:33 msgid "Start following this repository" msgstr "Suivre ce dépôt" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:34 msgid "Group" msgstr "Groupe" -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "Membres" - -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:35 msgid "Loading ..." msgstr "Chargement..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:36 msgid "loading ..." msgstr "chargement..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:37 msgid "Search truncated" msgstr "Recherche tronquée" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:38 msgid "No matching files" msgstr "Aucun fichier correspondant" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:39 msgid "Open New Pull Request from {0}" msgstr "Ouvrir une nouvelle requête de pull à partir de {0}" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:40 msgid "Open New Pull Request for {0} → {1}" msgstr "Ouvrir une nouvelle requête de pull pour {0} → {1}" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:41 msgid "Show Selected Changesets {0} → {1}" msgstr "Afficher les changesets sélectionnés {0} → {1}" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:42 msgid "Selection Link" msgstr "Lien vers la sélection" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 msgid "Collapse Diff" msgstr "Replier le Diff" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:44 msgid "Expand Diff" msgstr "Déplier le Diff" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "Aucune révision" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" +"Saisir le nom de l'utilisateur ou du membre à qui donner l'autorisation" + +#: kallithea/templates/base/root.html:47 msgid "Failed to revoke permission" msgstr "Échec de la révocation de permission" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:48 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "Voulez-vous vraiment révoquer la permission pour {0} : {1} ?" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "activé" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "désactivé" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "Sélectionner le changeset" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "Sélectionner le changeset" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "Signets de %s" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "Comparer les marque-pages" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Auteur" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Révision" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "Branches de %s" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "Comparer les branches" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "Tri ascendant" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "Tri descendant" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "Aucun élément n’a été trouvé." + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "Erreur d’intégrité des données." + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "Chargement…" + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "Historique de %s" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "Affichage de %d révision sur %d" msgstr[1] "Affichage de %d révisions sur %d" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "Vider la sélection" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 msgid "Go to tip of repository" msgstr "Aller au sommet (tip) du dépôt" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "Comparer le fork avec %s" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "Comparer le fork avec le dépôt parent (%s)" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "Filtre de branche :" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" -"Statut du changeset : %s\n" -"Cliquer pour ouvrir la requête de pull %s associée" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "Statut de changeset : %s" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "Développer le message de commit" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "Le changeset a des commentaires" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "Marque-page %s" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "Tag %s" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "Branche %s" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" @@ -5014,7 +4453,7 @@ msgstr "Modifié" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "Ajouté" @@ -5028,125 +4467,138 @@ msgstr "Ajouté" msgid "Affected %s files" msgstr "%s fichiers affectés" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "Message de commit" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "Âge" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "Refs" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "Ajouter ou téléverser des fichiers directement via Kallithea" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "Ajouter un nouveau fichier" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -msgid "Push new repository" -msgstr "Pusher le nouveau dépôt" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" -msgstr "Le dépôt existe déjà ?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "Premier changeset dans cette liste (le plus vieux)" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "Dernier changeset dans cette liste (le plus récent)" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "Position dans cette liste de changesets" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" +"Statut du changeset : %s par %s\n" +"Cliquer pour ouvrir la requête de pull %s associée" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "Statut de changeset : %s par %s" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "Développer le message de commit" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, python-format +msgid "%s comments" +msgstr "%s commentaires" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "Marque-page %s" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "Tag %s" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "Branche %s" #: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "Changeset de %s" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "Révision parente" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "Révision fille" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "Statut du changeset" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "Diff brut" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "Diff patch" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "Télécharger le diff" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 msgid "Merge" msgstr "Fusion" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "Grafté depuis :" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "Transplanté depuis :" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 msgid "Replaced by:" msgstr "Remplacé par :" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 msgid "Preceded by:" msgstr "Précédé par :" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s fichier changé" msgstr[1] "%s fichiers changés" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s fichier changé avec %s insertions et %s suppressions" msgstr[1] "%s fichiers changés avec %s insertions et %s suppressions" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "Afficher le diff complet quand même" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -msgid "No revisions" -msgstr "Aucune révision" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +msgid "comment" +msgstr "commentaire" #: kallithea/templates/changeset/changeset_file_comment.html:21 msgid "on pull request" @@ -5164,177 +4616,170 @@ msgstr "sur ce changeset" msgid "Delete comment?" msgstr "Supprimer le commentaire ?" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 msgid "Status change" msgstr "Changement de statut" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "Commentaire sur la ligne {1}." - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" -"Les commentaires sont analysés avec la syntaxe %s, avec le support de la " -"commande %s." - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." msgstr "" -"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à un" -" autre utilisateur" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "Aperçu du commentaire" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "Envoi…" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +"Les commentaires sont en texte brut. Utilisez @nomutilisateur pour " +"envoyer une notification à un autre utilisateur." + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "Modifier le statut du changeset" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "Voter pour le statut de la requête de pull" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "Aucun changement" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +msgid "Finish pull request" +msgstr "Terminer la requête de pull" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "Fermer" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "Commentaire" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "Aperçu" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "Vous devez être connecté pour poster des commentaires." -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "Se connecter maintenant" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "Masquer" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d commentaire" msgstr[1] "%d commentaires" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "%d de ligne" msgstr[1] "%d de ligne" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "%d général" msgstr[1] "%d généraux" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" -"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à un" -" autre utilisateur." - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "Voter pour le statut de la requête de pull" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "Modifier le statut du changeset" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "Aucun changement" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "Fermer" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "Changesets de %s" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "Statut de changeset : %s" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "Fichiers affectés" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "Pas de fichier précédent" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "Fichier précédent" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "Modifié" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "Supprimé" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "Renommé" + +#: kallithea/templates/changeset/diff_block.html:48 +#, python-format +msgid "Unknown operation: %r" +msgstr "Opération inconnue : %r" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "Aucun fichier suivant" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "Fichier suivant" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "Afficher le diff complet pour ce fichier" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "Afficher le diff complet côte-à-côte pour ce fichier" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "Afficher les commentaires de ligne" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "Supprimé" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "Renommé" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "Aucun changeset" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "Ancêtre" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "Premier changeset dans cette liste (le plus vieux)" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "Dernier changeset dans cette liste (le plus récent)" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "Position dans cette liste de changesets" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "Fusion croisée avec plusieurs ancêtres de fusion détectée !" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" +"Merci de fusionner la branche cible dans votre branche avant de créer une " +"requête de pull." + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "Ancêtre de fusion" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "Afficher le diff de fusion" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "Ancêtre commun" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "Aucun ancêtre commun trouvé - les dépôts n'ont aucun lien entre eux" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "est" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, python-format msgid "%s changesets" msgstr "Changesets de %s" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "derrière" @@ -5345,101 +4790,126 @@ msgid "%s Compare" msgstr "Comparaison de %s" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "Comparer les révisions" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "Échanger" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "Comparer les révisions, les branches, les marque-pages ou les tags." -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "Affichage de %s commit" msgstr[1] "Affichage de %s commits" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "Afficher le diff complet" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "Dépôt public" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "Création du dépôt en cours..." -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "Dépôt vide" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "S’abonner au flux RSS de %s" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "S’abonner au flux ATOM de %s" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "En cours de création" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "Le commentaire de %s sur le changeset de %s (%s) mentionne votre nom" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "Commentaire de %s sur le changeset de %s (%s)" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "Le statut du changeset a été changé en" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "Ceci est une notification automatique. Ne pas répondre à cet e-mail." - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "Mention dans le commentaire sur le changeset « %s »" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "Commentaire sur le changeset « %s »" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +msgid "Changeset on" +msgstr "Changeset sur" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +msgid "branch" +msgstr "branche" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "par" + +#: kallithea/templates/email_templates/comment.html:27 +msgid "Status change:" +msgstr "Changement de statut :" + +#: kallithea/templates/email_templates/comment.html:33 +msgid "The pull request has been closed." +msgstr "La requête de pull a été fermée." + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "Bonjour %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." msgstr "" "Nous avons reçu une demande de réinitialisation du mot de passe de votre " "compte." -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" +"Cependant, ce compte est géré hors de ce système et le mot de passe ne " +"peut pas être changé ici." + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "Pour choisir un nouveau mot de passe, cliquez sur le lien suivant" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -"Si vous ne pouvez pas utiliser le lien ci-dessus, merci de saisir le code" -" suivant dans le formulaire de réinitialisation de mot de passe" - -#: kallithea/templates/email_templates/password_reset.html:12 +"Si vous ne pouvez pas utiliser le lien ci-dessus, merci de saisir le code " +"suivant dans le formulaire de réinitialisation de mot de passe" + +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." @@ -5447,32 +4917,49 @@ msgstr "" "Si vous n'avez pas demandé la réinitialisation de votre mot de passe, ne " "tenez pas compte de ce message." -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "%s a mentionné votre nom dans la requête de pull %s « %s »" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" -msgstr "%s vous demande de vérifier la requête de pull %s « %s »" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "Mention sur la requête de pull %s « %s » par %s" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "Ajouté comme relecteur de la requête de pull %s « %s » par %s" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +msgid "Pull request" +msgstr "Requête de pull" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "depuis" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" +msgstr "vers" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "Commentaire de %s sur la requête de pull %s « %s »" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "Le commentaire a fermé la requête de pull avec le statut" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "Le commentaire a été fait avec le statut" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "Visualiser cet utilisateur ici" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "Mention dans le commentaire sur la requête de pull %s « %s »" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "Requête de pull %s « %s » fermée" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Commentaire sur la requête de pull %s « %s »" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" +msgstr "Nom complet" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5490,7 +4977,7 @@ msgid "%s File Diff" msgstr "Diff de fichier pour %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "Fichiers de %s" @@ -5500,72 +4987,73 @@ msgstr "Fichiers de %s" msgid "%s Files Add" msgstr "Ajout de fichiers pour %s" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "Ajouter un nouveau fichier" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Emplacement" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "Saisir le nom du fichier..." -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "ou" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "Uploader un fichier" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "Créer un nouveau fichier" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "Mode du nouveau fichier" +msgid "New file type" +msgstr "Type du nouveau fichier" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "Message de commit" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 msgid "Commit Changes" msgstr "Commiter les changements" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "Révision précédente" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "Révision suivante" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "Suivre la branche courante" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "Rechercher dans la liste des fichiers" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "Chargement de la liste des fichiers…" -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Taille" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "Dernière révision" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "Dernière modification" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "Dernier commiteur" @@ -5575,7 +5063,7 @@ msgid "%s Files Delete" msgstr "Suppression de fichiers pour %s" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "Supprimer le fichier" @@ -5588,24 +5076,20 @@ msgstr "Édition de fichier pour %s" msgid "Edit file" msgstr "Éditer le fichier" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "Afficher l'annotation" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 msgid "Download as Raw" msgstr "Télécharger au format brut" -#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Source" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "Édition du fichier" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5613,55 +5097,63 @@ msgid_plural "%s authors" msgstr[0] "%s auteur" msgstr[1] "%s auteurs" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "Diff par rapport à une révision" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "Afficher à une révision" -#: kallithea/templates/files/files_source.html:10 +#: kallithea/templates/files/files_source.html:9 msgid "Show Full History" msgstr "Afficher l'historique complet" -#: kallithea/templates/files/files_source.html:11 +#: kallithea/templates/files/files_source.html:10 msgid "Show Authors" msgstr "Afficher les auteurs" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "Afficher la source" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" msgstr "Éditer sur la branche : %s" -#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/files/files_source.html:37 msgid "Editing binary files not allowed" msgstr "Édition de fichiers binaires interdite" -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:40 msgid "Editing files allowed only when on branch head revision" msgstr "" "Édition de fichiers autorisée uniquement sur la révision de tête (head) " "de la branche" -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/files/files_source.html:41 msgid "Deleting files allowed only when on branch head revision" msgstr "" "Suppression de fichiers autorisée uniquement sur la révision de tête " "(head) de la branche" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "Fichier binaire (%s)" +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "Ce fichier est trop gros pour être affiché." + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "Afficher l'annotation complète quand même." + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" -msgstr "Ce fichier est trop gros pour être affiché" +msgid "Show as raw." +msgstr "Montrer en texte brut." #: kallithea/templates/files/files_ypjax.html:5 msgid "annotation" @@ -5681,12 +5173,12 @@ msgid "%s Followers" msgstr "Followers de %s" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "Followers" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "A commencé à suivre le dépôt :" @@ -5695,37 +5187,37 @@ msgstr "A commencé à suivre le dépôt :" msgid "Fork repository %s" msgstr "Forker le dépôt %s" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "Nom du fork" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" "Révision par défaut pour les pages de fichiers, de téléchargements, de " "recherche et de documentation." -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Privé" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Copier les permissions" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "Copier les permissions depuis le dépôt forké" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "MÀJ après le clonage" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "Mettre à jour depuis la source après clonage" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "Forker ce dépôt" @@ -5735,40 +5227,40 @@ msgid "%s Forks" msgstr "Forks de %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "Forks" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "Forké" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "Il n’y a pas encore de forks" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 msgid "ATOM journal feed" msgstr "Flux ATOM du journal" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "Flux RSS du journal" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "Mes dépôts" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "Aucune entrée pour le moment" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "Flux ATOM du journal public" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "Flux RSS du journal public" @@ -5777,31 +5269,36 @@ msgstr "Flux RSS du journal public" msgid "New Pull Request" msgstr "Nouvelle requête de pull" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "Titre" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "Résumer les modifications - ou laisser vide" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "Saisir une courte description de cette requête de pull" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "Flux des changesets" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "Dépôt d'origine" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "Révision" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "Dépôt de destination" @@ -5813,6 +5310,10 @@ msgstr "Aucune entrée" msgid "Vote" msgstr "Voter" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "Âge" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "Depuis" @@ -5836,7 +5337,7 @@ msgstr "(sans titre)" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "Fermée" @@ -5865,51 +5366,32 @@ msgstr "%s Requête de pull %s" msgid "Pull request %s from %s#%s" msgstr "Requête de pull %s depuis %s#%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "Résumer les changements" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "Résultat du vote des relecteurs" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "Résultat du vote" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "Statut de la requête de pull calculé à partir des votes" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "Pas encore relue par" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "%d relecteur" -msgstr[1] "%d relecteurs" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "La requête de pull a été relue par tous les relecteurs" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -msgid "There are no reviewers" -msgstr "Il n'y a aucun relecteur" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "Origine" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "sur" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "Cible" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." @@ -5917,54 +5399,67 @@ msgstr "" "Ceci est juste une série de changesets, et n'a pas de cible ou de " "véritable ancêtre de fusion." -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "Puller les modifications" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "Mettre à jour" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "Prochaine itération" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "Révision courante - aucun changement" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "Relecteurs de la requête de pull" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" +"Les itérations de requête de pull ne modifient pas de contenu une fois " +"qu'elles sont créées. Sélectionnez une révision pour créer une nouvelle " +"itération." + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "Enregistrer les changements" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "Créer une nouvelle itération avec ces modifications" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "Annuler les modifications" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "Relecteurs" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 msgid "Remove reviewer" msgstr "Supprimer le relecteur" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "Saisir le nom du relecteur à ajouter" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 msgid "Potential Reviewers" msgstr "Relecteurs potentiels" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "Cliquer pour ajouter le propriétaire du dépôt comme relecteur :" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "Enregistrer les changements" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "Sauvegarder en tant que nouvelle requête de pull" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" -msgstr "Annuler les modifications" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "Contenu de la requête de pull" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "Ancêtre commun" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5980,39 +5475,43 @@ msgstr "Requêtes de pull depuis '%s'" msgid "Pull Requests to '%s'" msgstr "Requête de pull vers '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "Ouvrir une nouvelle requête de pull" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "Afficher les requêtes de pull vers %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "Afficher les requêtes de pull depuis '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" "Cacher les requêtes de pull fermées (afficher uniquement les requêtes de " "pull ouvertes)" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" "Afficher les requêtes de pull fermées (en plus des requêtes de pull " "ouvertes)" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "Requêtes de pull créées par moi" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "Requêtes de pull nécessitant ma relecture" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "Requêtes de pull auxquelles je participe" @@ -6026,29 +5525,29 @@ msgstr "Recherche pour %s" msgid "Search in All Repositories" msgstr "Rechercher dans tous les dépôts" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "Termes de la recherches" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "Rechercher dans" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "Le contenu des fichiers" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "Les messages de commit" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "Les noms de fichiers" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "Permission refusée" @@ -6058,80 +5557,80 @@ msgid "%s Statistics" msgstr "Statistiques pour %s" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "Flux ATOM pour %s" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "Flux RSS pour %s" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "Activer" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "Statistiques obtenues : " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "Fichiers" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "Afficher plus" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "commits" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "fichiers ajoutés" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "fichiers modifiés" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "fichiers supprimés" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "commit" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "fichier ajouté" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "fichié modifié" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "fichier supprimé" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "Résumé de %s" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "Dépôt verrouillé par %s" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "Dépôt déverrouillé" @@ -6139,85 +5638,476 @@ msgstr "Dépôt déverrouillé" msgid "Fork of" msgstr "Fork de" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "Cloner depuis" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "URL de clone" - -#: kallithea/templates/summary/summary.html:78 -msgid "Show by Name" -msgstr "Afficher par nom" - -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:68 msgid "Show by ID" msgstr "Afficher par ID" -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:73 +msgid "Show by Name" +msgstr "Afficher par nom" + +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "Populaires" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "Téléchargements" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "Il n’y a pas encore de téléchargements proposés" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "Les téléchargements sont désactivés pour ce dépôt" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "Télécharger en ZIP" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" -msgstr "Télécharger une archive contenant également les sous-dépôts éventuels" - -#: kallithea/templates/summary/summary.html:125 +msgstr "" +"Télécharger une archive contenant également les sous-dépôts éventuels" + +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "Avec les sous-dépôts" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Taille du dépôt" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "Flux" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 msgid "Latest Changes" msgstr "Derniers changements" +#: kallithea/templates/summary/summary.html:177 +msgid "Quick Start" +msgstr "Démarrage rapide" + #: kallithea/templates/summary/summary.html:188 -msgid "Quick Start" -msgstr "Démarrage rapide" - -#: kallithea/templates/summary/summary.html:202 +msgid "Add or upload files directly via Kallithea" +msgstr "Ajouter ou téléverser des fichiers directement via Kallithea" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "Pusher le nouveau dépôt" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "Le dépôt existe déjà ?" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "Fichier Lisez-moi de la revision %s:%s" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "Télécharge %s comme %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "Tags de %s" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "Comparer les tags" +#~ msgid "" +#~ "Changing status on a changeset associated with a closed pull request " +#~ "is not allowed" +#~ msgstr "" +#~ "La modification de l'état sur un ensemble de modifications associé à " +#~ "une demande de tirage fermé n'est pas autorisé" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Fermé, remplacé par %s." + +#~ msgid "This pull request can be updated with changes on %s:" +#~ msgstr "" +#~ "Cette demande de pull peut être mise à jour avec les modifications de " +#~ "%s :" + +#~ msgid "Closing." +#~ msgstr "Fermeture." + +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "" +#~ "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur " +#~ "de code Whoosh" + +#~ msgid "IP %s not allowed" +#~ msgstr "IP %s non autorisée" + +#~ msgid "Repository no access" +#~ msgstr "Aucun accès au dépôt" + +#~ msgid "Repository read access" +#~ msgstr "Accès en lecture au dépôt" + +#~ msgid "Repository write access" +#~ msgstr "Accès en écriture au dépôt" + +#~ msgid "Repository admin access" +#~ msgstr "Accès administrateur au dépôt" + +#~ msgid "Repository Group no access" +#~ msgstr "Aucun accès au groupe de dépôts" + +#~ msgid "Repository Group read access" +#~ msgstr "Accès en lecture au groupe de dépôts" + +#~ msgid "Repository Group write access" +#~ msgstr "Accès en écriture au groupe de dépôts" + +#~ msgid "Repository Group admin access" +#~ msgstr "Accès administrateur au groupe de dépôts" + +#~ msgid "Repository creation disabled" +#~ msgstr "Création de dépôt désactivée" + +#~ msgid "Repository creation enabled" +#~ msgstr "Création de dépôt activée" + +#~ msgid "Repository forking disabled" +#~ msgstr "Fork de dépôt désactivé" + +#~ msgid "Repository forking enabled" +#~ msgstr "Fork de dépôt activé" + +#~ msgid "Register disabled" +#~ msgstr "Enregistrement désactivé" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "Enregistrer un nouvel utilisateur Kallithea auto-activé" + +#~ msgid "Rejected" +#~ msgstr "Rejetée" + +#~ msgid "Under Review" +#~ msgstr "En cours de relecture" + +#~ msgid "Repository group no access" +#~ msgstr "Groupe de dépôts, pas d'accès" + +#~ msgid "Repository group read access" +#~ msgstr "Groupe de dépôts, accès en lecture" + +#~ msgid "Repository group write access" +#~ msgstr "Groupe de dépôts, accès en écriture" + +#~ msgid "Repository group admin access" +#~ msgstr "Groupe de dépôts, accès d'administration" + +#~ msgid "User group no access" +#~ msgstr "Groupe d'utilisateurs, pas d'accès" + +#~ msgid "User group read access" +#~ msgstr "Groupe d'utilisateurs, accès en lecture" + +#~ msgid "User group write access" +#~ msgstr "Groupe d'utilisateurs, accès en écriture" + +#~ msgid "User group admin access" +#~ msgstr "Groupe d'utilisateurs, accès d'administration" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Création de groupes de dépôts désactivée" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Création de groupes de dépôts activée" + +#~ msgid "User Group creation disabled" +#~ msgstr "Création de groupes d'utilisateurs désactivée" + +#~ msgid "User Group creation enabled" +#~ msgstr "Création de groupes d'utilisateurs activée" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "" +#~ "Enregistrement des utilisateurs avec activation de compte manuelle" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "" +#~ "Enregistrement des utilisateurs avec activation de compte automatique" + +#~ msgid "%(user)s commented on changeset %(age)s" +#~ msgstr "%(user)s a commenté sur le changeset %(age)s" + +#~ msgid "%(user)s sent message %(age)s" +#~ msgstr "%(user)s a envoyé un message %(age)s" + +#~ msgid "%(user)s mentioned you %(age)s" +#~ msgstr "%(user)s vous a mentionné %(age)s" + +#~ msgid "%(user)s registered in Kallithea %(age)s" +#~ msgstr "%(user)s s'est enregistré sur Kallithea %(age)s" + +#~ msgid "%(user)s opened new pull request %(age)s" +#~ msgstr "%(user)s a ouvert une nouvelle demande de pull %(age)s" + +#~ msgid "%(user)s commented on pull request %(age)s" +#~ msgstr "%(user)s a commenté la demande de pull %(age)s" + +#~ msgid "%(user)s commented on changeset at %(when)s" +#~ msgstr "%(user)s a commenté sur le changeset à %(when)s" + +#~ msgid "%(user)s sent message at %(when)s" +#~ msgstr "%(user)s a envoyé un message à %(when)s" + +#~ msgid "%(user)s mentioned you at %(when)s" +#~ msgstr "%(user)s vous a mentionné à %(when)s" + +#~ msgid "%(user)s registered in Kallithea at %(when)s" +#~ msgstr "%(user)s s'est enregistré sur Kallithea à %(when)s" + +#~ msgid "%(user)s opened new pull request at %(when)s" +#~ msgstr "%(user)s a ouvert une nouvelle demande de pull à %(when)s" + +#~ msgid "%(user)s commented on pull request at %(when)s" +#~ msgstr "%(user)s a commenté la demande de pull à %(when)s" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "[Ajouté] Demande de pull %(pr_nice_id)s à partir de %(ref)s pour " +#~ "%(repo_name)s" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "[Commentaire] Demande de pull %(pr_nice_id)s à partir de %(ref)s pour " +#~ "%(repo_name)s" + +#~ msgid "Dashboard" +#~ msgstr "Tableau de bord" + +#~ msgid "quick filter..." +#~ msgstr "Filtre rapide…" + +#~ msgid "repositories" +#~ msgstr "Dépôts" + +#~ msgid "No repositories found." +#~ msgstr "Pas de dépôts trouvés." + +#~ msgid "Remember me" +#~ msgstr "Se souvenir de moi" + +#~ msgid "There are no branches yet" +#~ msgstr "Aucune branche n’a été créée pour le moment" + +#~ msgid "There are no tags yet" +#~ msgstr "Aucun tag n’a été créé pour le moment" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Aucun signet n’a été créé" + +#~ msgid "Change your avatar at" +#~ msgstr "Vous pouvez changer votre avatar sur" + +#~ msgid "Using" +#~ msgstr "en utilisant l’adresse" + +#~ msgid "Missing email, please update your user email address." +#~ msgstr "" +#~ "Adresse courriel manquante, veuillez mettre à jour votre adresse " +#~ "courriel." + +#~ msgid "My Notifications" +#~ msgstr "Mes notifications" + +#~ msgid "All" +#~ msgstr "Tous" + +#~ msgid "Comments" +#~ msgstr "Commentaires" + +#~ msgid "Mark All Read" +#~ msgstr "Tout marquer comme lu" + +#~ msgid "No notifications here yet" +#~ msgstr "Aucune notification pour le moment" + +#~ msgid "Show Notification" +#~ msgstr "Montrer Notification" + +#~ msgid "Notifications" +#~ msgstr "Notifications" + +#~ msgid "%s Repository group dashboard" +#~ msgstr "Tableau de bord du groupe de dépôts %s" + +#~ msgid "Home" +#~ msgstr "Accueil" + +#~ msgid "with" +#~ msgstr "comprenant" + +#~ msgid "Confirm to invalidate repository cache." +#~ msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" + +#~ msgid "Analytics HTML block" +#~ msgstr "Bloc HTML pour l'analytique" + +#~ msgid "" +#~ "HTML with JavaScript for web analytics systems like Google Analytics " +#~ "or Piwik. This will be added at the bottom of every page." +#~ msgstr "" +#~ "HTML avec du JavaScript pour les systèmes d'analyse Web comme Google " +#~ "Analytics ou Piwik. Ceci sera ajouté en bas de chaque page." + +#~ msgid "Web" +#~ msgstr "Web" + +#~ msgid "Require SSL for vcs operations" +#~ msgstr "Nécessiter SSL pour les opérations de VCS" + +#~ msgid "" +#~ "Activate to require SSL both pushing and pulling. If SSL certificate " +#~ "is missing, it will return an HTTP Error 406: Not Acceptable." +#~ msgstr "" +#~ "Activez pour faire en sorte que Kallithea force l'utilisation de SSL " +#~ "pour pousser ou tirer. Si le certificat SSL est manquant, une erreur " +#~ "« HTTP 406: Not Acceptable » sera renvoyée." + +#~ msgid "Use Gravatars in Kallithea" +#~ msgstr "Utiliser Gravatar sur Kallithea" + +#~ msgid "Dashboard items" +#~ msgstr "Élements du tableau de bord" + +#~ msgid "" +#~ "Number of items displayed in the main page dashboard before pagination " +#~ "is shown." +#~ msgstr "" +#~ "Nombre d'éléments affichés dans la page principale du tableau de bord " +#~ "avant d'afficher la pagination." + +#~ msgid "Missing email, please update this user email address." +#~ msgstr "" +#~ "E-mail manquant, veuillez mettre à jour l'adresse e-mail de cet " +#~ "utilisateur." + +#~ msgid "Keyboard shortcuts" +#~ msgstr "Raccourcis clavier" + +#~ msgid "Site-wide shortcuts" +#~ msgstr "Raccourcis globaux" + +#~ msgid "members" +#~ msgstr "Membres" + +#~ msgid "enabled" +#~ msgstr "activé" + +#~ msgid "disabled" +#~ msgstr "désactivé" + +#~ msgid "%s Bookmarks" +#~ msgstr "Signets de %s" + +#~ msgid "Compare Bookmarks" +#~ msgstr "Comparer les marque-pages" + +#~ msgid "Author" +#~ msgstr "Auteur" + +#~ msgid "%s Branches" +#~ msgstr "Branches de %s" + +#~ msgid "Compare Branches" +#~ msgstr "Comparer les branches" + +#~ msgid "Changeset has comments" +#~ msgstr "Le changeset a des commentaires" + +#~ msgid "Refs" +#~ msgstr "Refs" + +#~ msgid "Commenting on line {1}." +#~ msgstr "Commentaire sur la ligne {1}." + +#~ msgid "Comments parsed using %s syntax with %s support." +#~ msgstr "" +#~ "Les commentaires sont analysés avec la syntaxe %s, avec le support de " +#~ "la commande %s." + +#~ msgid "Use @username inside this text to notify another user" +#~ msgstr "" +#~ "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à " +#~ "un autre utilisateur" + +#~ msgid "Comment preview" +#~ msgstr "Aperçu du commentaire" + +#~ msgid "Preview" +#~ msgstr "Aperçu" + +#~ msgid "No common ancestor found - repositories are unrelated" +#~ msgstr "" +#~ "Aucun ancêtre commun trouvé - les dépôts n'ont aucun lien entre eux" + +#~ msgid "Comment from %s on %s changeset %s mentioned you" +#~ msgstr "" +#~ "Le commentaire de %s sur le changeset de %s (%s) mentionne votre nom" + +#~ msgid "The changeset status was changed to" +#~ msgstr "Le statut du changeset a été changé en" + +#~ msgid "This is an automatic notification. Don't reply to this mail." +#~ msgstr "" +#~ "Ceci est une notification automatique. Ne pas répondre à cet e-mail." + +#~ msgid "%s requested your review of %s pull request \"%s\"" +#~ msgstr "%s vous demande de vérifier la requête de pull %s « %s »" + +#~ msgid "The comment closed the pull request with status" +#~ msgstr "Le commentaire a fermé la requête de pull avec le statut" + +#~ msgid "The comment was made with status" +#~ msgstr "Le commentaire a été fait avec le statut" + +#~ msgid "View this user here" +#~ msgstr "Visualiser cet utilisateur ici" + +#~ msgid "Previous revision" +#~ msgstr "Révision précédente" + +#~ msgid "Next revision" +#~ msgstr "Révision suivante" + +#~ msgid "Follow current branch" +#~ msgstr "Suivre la branche courante" + +#~ msgid "Editing file" +#~ msgstr "Édition du fichier" + +#~ msgid "Still not reviewed by" +#~ msgstr "Pas encore relue par" + +#~ msgid "Pull request was reviewed by all reviewers" +#~ msgstr "La requête de pull a été relue par tous les relecteurs" + +#~ msgid "There are no reviewers" +#~ msgstr "Il n'y a aucun relecteur" + +#~ msgid "Update" +#~ msgstr "Mettre à jour" + +#~ msgid "Pull Request Reviewers" +#~ msgstr "Relecteurs de la requête de pull" + +#~ msgid "Save as New Pull Request" +#~ msgstr "Sauvegarder en tant que nouvelle requête de pull" + +#~ msgid "%s Tags" +#~ msgstr "Tags de %s" + +#~ msgid "Compare Tags" +#~ msgstr "Comparer les tags" #~ msgid "No comments." #~ msgstr "Aucun commentaire." @@ -6249,9 +6139,6 @@ msgstr "Comparer les tags" #~ msgid "No Files" #~ msgstr "Aucun fichier" -#~ msgid "" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé" @@ -6264,12 +6151,6 @@ msgstr "Comparer les tags" #~ msgid "invalid clone URL" #~ msgstr "URL de clonage invalide" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "Par défaut" @@ -6301,7 +6182,8 @@ msgstr "Comparer les tags" #~ msgstr "Écraser les paramètres existants" #~ msgid "Default IP Whitelist for All Users" -#~ msgstr "Liste blanche d'adresses IP par défaut pour tous les utilisateurs" +#~ msgstr "" +#~ "Liste blanche d'adresses IP par défaut pour tous les utilisateurs" #~ msgid "Default User Permissions Overview" #~ msgstr "Vue d'ensemble des permissions utilisateur par défaut" @@ -6330,21 +6212,9 @@ msgstr "Comparer les tags" #~ msgid "Pull Changes from Remote Location" #~ msgstr "Récupérer les changements depuis le site distant" -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - -#~ msgid "Non-changeable id" -#~ msgstr "" - #~ msgid "edit" #~ msgstr "éditer" -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - #~ msgid "Email prefix" #~ msgstr "Préfixe courriel" @@ -6384,60 +6254,15 @@ msgstr "Comparer les tags" #~ msgid "Default permissions" #~ msgstr "Permissions par défaut" -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - -#~ msgid "Status change from pull request" -#~ msgstr "Changement de statut -> %s" - -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - #~ msgid "Mimetype" #~ msgstr "Type MIME" #~ msgid "My Repos" #~ msgstr "Mes dépôts" -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "%s Pull Request #%s" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - #~ msgid "owner" #~ msgstr "Propriétaire" -#~ msgid "reviewer" -#~ msgstr "" - #~ msgid "Your new password" #~ msgstr "Votre nouveau mot de passe" @@ -6447,17 +6272,5 @@ msgstr "Comparer les tags" #~ msgid "Open New Pull Request for Selected Changesets" #~ msgstr "Nouvelle requête de pull" -#~ msgid "Show Selected Changesets __S → __E" -#~ msgstr "" - -#~ msgid "We received a request to create a new password for your account." -#~ msgstr "" - -#~ msgid "You can generate it by clicking following URL" -#~ msgstr "" - -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - #~ msgid "Created by" #~ msgstr "créé" diff --git a/kallithea/i18n/how_to b/kallithea/i18n/how_to --- a/kallithea/i18n/how_to +++ b/kallithea/i18n/how_to @@ -18,25 +18,26 @@ translation, suggestions based on simila automatic checks etc. Weblate imports the source code tree directly from the version control system, and commits edits back from time to time. -When registering at Weblate, make sure you name and email address you prefer to -be used when your changes are committed. We can and probably will amend changesets -coming from Weblate, but having things right from the beginning makes things easier. +When registering at Weblate, make sure you use the name and email address you +prefer to be used when your changes are committed. We can and probably will +amend changesets coming from Weblate, but having things right from the beginning +makes things easier. Weblate performs sanity checks all the time and tries to prevent you from ignoring -them. Most common mistakes are inconsistent punctuation, whitespaces, missing or extra +them. Most common mistakes are inconsistent punctuation, whitespace, missing or extra format parameters, untranslated strings copied into the translation. Please perform necessary corrections when they're needed, or override the false positives. -Merging translations from Weblate ---------------------------------- +Merging translations from Weblate (admin-only) +---------------------------------------------- Weblate rebases its changes every time it pulls from our repository. Pulls are triggered by a web hook from Our Own Kallithea every time it receives new commits. Usually merging -the new translations is a straightforward process consisting of a pull from Weblate-hosted -repository which is available under Data Exports tab in Weblate interface. +the new translations is a straightforward process consisting of a pull from the Weblate-hosted +repository which is available under the Data Exports tab in the Weblate interface. -Weblate tries to minimise the number of commits, but that's not always work, especially +Weblate tries to minimise the number of commits, but that doesn't always work, especially when two translators work with different languages at more or less the same time. It makes sense sometimes to re-order or fold commits by the same author when they touch just the same language translation. That, however, may confuse Weblate sometimes, in @@ -44,6 +45,28 @@ which case it should be manually convinc using its administrative interface. +Regenerating translatations after source code changes (admin-only) +------------------------------------------------------------------ + +When the Kallithea source code changes, both the location as the content of +translation strings can change. It is therefore necessary to regularly +regenerate the `kallithea.pot` file containing these strings, as well as aligning +the translation files (`*.po`). + +First update the translation strings:: + + python2 setup.py extract_messages + +Then regenerate the translation files. This could either be done with `python2 +setup.py update_catalog` or with `msgmerge` from the `gettext` package. As +Weblate is also touching these translation files, it is preferred to use the +same tools (`msgmerge`) and settings as Weblate to minimize the diff:: + + find kallithea/i18n -name kallithea.po | xargs -I '{}' \ + msgmerge --width=76 --backup=none --previous --update '{}' \ + kallithea/i18n/kallithea.pot + + Manual creation of a new language translation --------------------------------------------- @@ -70,8 +93,8 @@ Finally, compile the translations:: python2 setup.py compile_catalog -l -Updating translations ---------------------- +Manually updating translations +------------------------------ Extract the latest versions of strings for translation by running:: @@ -81,17 +104,17 @@ Update the PO file by doing:: python2 setup.py update_catalog -l -Edit the new updated translation file. Repeat all steps after `init_catalog` step from -new translation instructions +Edit the newly updated translation file. Repeat all steps after the +`init_catalog` step from the 'new translation' instructions above. Testing translations -------------------- -Edit kallithea/tests/test.ini file and set lang attribute to:: - - lang= +Edit `kallithea/tests/conftest.py` and set `i18n.lang` to `` +and run Kallithea tests by executing:: -Run Kallithea tests by executing:: + py.test - nosetests + +.. _Weblate: http://weblate.org/ diff --git a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/hu/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/hu/LC_MESSAGES/kallithea.po @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" "PO-Revision-Date: 2015-04-11 00:59+0200\n" "Last-Translator: Balázs Úr \n" -"Language-Team: Hungarian " -"\n" +"Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,442 +19,454 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.3-dev\n" -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +msgid "No permission to change status" +msgstr "" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, python-format +msgid "Could not find other repository %s" +msgstr "" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "" + #: kallithea/controllers/error.py:71 -msgid "No response" -msgstr "" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 #, python-format msgid "%s %s feed" msgstr "" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:91 -msgid "Click here to add new file" +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" msgstr "" #: kallithea/controllers/files.py:92 +msgid "Click here to add new file" +msgstr "" + +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:317 +#: kallithea/controllers/files.py:312 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:328 +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:124 -#, python-format -msgid "%s (closed)" -msgstr "" - -#: kallithea/controllers/pullrequests.py:152 -#: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 -msgid "Changeset" -msgstr "" - -#: kallithea/controllers/pullrequests.py:173 -msgid "Special" -msgstr "" - -#: kallithea/controllers/pullrequests.py:174 -msgid "Peer branches" -msgstr "" - -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 -msgid "Bookmarks" -msgstr "" - -#: kallithea/controllers/pullrequests.py:310 -#, python-format -msgid "Error creating pull request: %s" -msgstr "" - -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "" - -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 +#: kallithea/controllers/pullrequests.py:71 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:133 +#, python-format +msgid "%s (closed)" +msgstr "" + +#: kallithea/controllers/pullrequests.py:160 +#: kallithea/templates/changeset/changeset.html:12 +msgid "Changeset" +msgstr "" + +#: kallithea/controllers/pullrequests.py:181 +msgid "Special" +msgstr "" + +#: kallithea/controllers/pullrequests.py:182 +msgid "Peer branches" +msgstr "" + +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +msgid "Bookmarks" +msgstr "" + +#: kallithea/controllers/pullrequests.py:320 +#, python-format +msgid "Error creating pull request: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:375 +msgid "New pull request iteration created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:432 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:445 +msgid "Successfully deleted pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:524 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:557 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:514 -msgid "Pull request updated" -msgstr "" - -#: kallithea/controllers/pullrequests.py:529 -msgid "Successfully deleted pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:595 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:597 -msgid "This pull request has been closed and can not be updated." -msgstr "" - -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 -#, python-format -msgid "Note: Branch %s has another head: %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +"Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "" #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "" @@ -466,149 +478,151 @@ msgstr "" msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "" +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "" + #: kallithea/controllers/admin/gists.py:233 -msgid "Unmodified" -msgstr "" - -#: kallithea/controllers/admin/gists.py:262 -msgid "Successfully updated gist content" -msgstr "" - -#: kallithea/controllers/admin/gists.py:267 -msgid "Successfully updated gist data" -msgstr "" - -#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "" +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "" + #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -616,622 +630,619 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "" +#: kallithea/controllers/admin/repos.py:446 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:450 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:466 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:468 +#, python-format +msgid "Marked repository %s as fork of %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:475 +msgid "An error occurred during this operation" +msgstr "" + #: kallithea/controllers/admin/repos.py:491 -msgid "Updated repository visibility in public journal" -msgstr "" - -#: kallithea/controllers/admin/repos.py:495 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:512 -msgid "Nothing" -msgstr "" - -#: kallithea/controllers/admin/repos.py:514 -#, python-format -msgid "Marked repository %s as fork of %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:521 -msgid "An error occurred during this operation" -msgstr "" - -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 #, fuzzy msgid "Repository has been locked" msgstr "Ennek a tárolónak %s elágazása van" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 #, fuzzy msgid "Repository has been unlocked" msgstr "Ennek a tárolónak %s elágazása van" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" +msgstr "" + #: kallithea/controllers/admin/settings.py:174 -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" - -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 -msgid "Error occurred while updating application settings" -msgstr "" - -#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, fuzzy, python-format #| msgid "Private Repository" msgid "Invalidated %s repositories" msgstr "Tároló törlése" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +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 "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "" - -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" - -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 -#, python-format -msgid "Deleted branch: %s" -msgstr "" - #: kallithea/lib/helpers.py:612 #, python-format +msgid "Deleted branch: %s" +msgstr "" + +#: kallithea/lib/helpers.py:614 +#, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1239,1158 +1250,652 @@ msgid "" "repositories" msgstr "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2238 -#, fuzzy +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2241 -#, fuzzy +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2266 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:309 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "" - -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" + +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 -msgid "You can't remove this user since it is crucial for the entire application" -msgstr "" - -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" + +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" - -#: kallithea/model/user.py:273 +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:126 +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:133 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:152 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 msgid "Invalid username or password" msgstr "" +#: kallithea/model/validators.py:312 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:330 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + #: kallithea/model/validators.py:331 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:345 -#, python-format -msgid "Repository name %(repo)s is not allowed" -msgstr "" - -#: kallithea/model/validators.py:347 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - -#: kallithea/model/validators.py:348 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" - -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 -msgid "Add Repository Group" -msgstr "" - +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 #: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "" @@ -2398,146 +1903,129 @@ msgstr "" msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" msgstr "" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 -msgid "Send Password Reset Email" -msgstr "" - #: kallithea/templates/password_reset.html:47 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2545,30 +2033,16 @@ msgstr[0] "%s bejegyzés" msgstr[1] "%s bejegyzés" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2576,7 +2050,7 @@ msgstr "" msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "" @@ -2585,108 +2059,108 @@ msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2695,45 +2169,45 @@ msgstr "" msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 msgid "Never" msgstr "" @@ -2742,7 +2216,8 @@ msgid "Update Gist" msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "" @@ -2765,16 +2240,16 @@ msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "" @@ -2783,45 +2258,45 @@ msgstr "" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "" @@ -2831,182 +2306,197 @@ msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 msgid "Owned Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "A csoport törlésének megerősítése" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "A csoport törlésének megerősítése" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "" @@ -3014,105 +2504,68 @@ msgstr "" msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" msgstr "" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "" @@ -3126,167 +2579,173 @@ msgstr "" msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:20 msgid "Apply to all existing repositories" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:33 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 msgid "Top level repository creation" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:61 +msgid "Repository creation with group write access" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 -msgid "Repository creation with group write access" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:75 +msgid "Repository forking" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:78 +msgid "Enable this to allow non-admins to fork repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 +msgid "Registration" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:88 -msgid "Repository forking" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:92 -msgid "Enable this to allow non-admins to fork repositories." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:97 -msgid "Registration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:105 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "A csoport törlésének megerősítése" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" @@ -3295,30 +2754,29 @@ msgstr "" msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "" @@ -3343,12 +2801,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3359,16 +2817,32 @@ msgstr[1] "" msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +msgid "Add repos" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3376,102 +2850,97 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "A csoport törlésének megerősítése" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "" +#, fuzzy, python-format +#| msgid "This repository has %s fork" +#| msgid_plural "This repository has %s forks" +msgid "Repository group %s" +msgstr "Ennek a tárolónak %s elágazása van" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 #, fuzzy msgid "Clone remote repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3504,22 +2973,22 @@ msgstr "" msgid "%s Repository Settings" msgstr "%s tároló beállítások" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "" @@ -3528,63 +2997,61 @@ msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3592,32 +3059,32 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "Ennek a tárolónak %s elágazása van" msgstr[1] "Ennek a tárolónak %s elágazása van" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3628,107 +3095,109 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Remote repository" +msgid "Fork of repository" +msgstr "Tároló törlése" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3738,34 +3207,39 @@ msgid "" "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "Tároló törlése" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3781,7 +3255,7 @@ msgstr "" msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3802,7 +3276,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "" @@ -3814,276 +3288,266 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom Hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. " -"Current hooks will be updated to the latest version." +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:59 +msgid "Location of repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Location of repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4100,92 +3564,98 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +msgid "Repository page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4204,13 +3674,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4219,15 +3689,15 @@ msgstr "" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" @@ -4241,17 +3711,17 @@ msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "" @@ -4270,12 +3740,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4284,7 +3754,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4293,24 +3763,16 @@ msgstr "" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "" @@ -4318,222 +3780,219 @@ msgstr "" msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "" - #: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" -msgstr "" - #: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "" @@ -4542,227 +4001,171 @@ msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "Egy másik hozzászólás hozzáadása" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "" - -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "" - -#: kallithea/templates/base/root.html:27 -msgid "Loading ..." -msgstr "" - #: kallithea/templates/base/root.html:28 -msgid "loading ..." +msgid "Retry" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +msgid "Unable to post" msgstr "" #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" -msgstr "" +msgid "Add Another Comment" +msgstr "Egy másik hozzászólás hozzáadása" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "" @@ -4778,7 +4181,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "" @@ -4792,38 +4195,60 @@ msgstr "" msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -msgid "Push new repository" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "No comments." +msgid "%s comments" +msgstr "Nincsenek hozzászólások." + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" msgstr "" #: kallithea/templates/changeset/changeset.html:8 @@ -4831,86 +4256,78 @@ msgstr "" msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 msgid "Merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -msgid "No revisions" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#, fuzzy +#| msgid "No comments." +msgid "comment" +msgstr "Nincsenek hozzászólások." #: kallithea/templates/changeset/changeset_file_comment.html:21 msgid "on pull request" @@ -4929,172 +4346,167 @@ msgstr "%s módosításcsomag" msgid "Delete comment?" msgstr "Hozzászólás törlése?" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 #, fuzzy msgid "Status change" msgstr "%s módosításcsomag" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +msgid "Finish pull request" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "%d sorközi" msgstr[1] "%d sorközi" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, python-format +msgid "Unknown operation: %r" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, python-format msgid "%s changesets" msgstr "%s módosításcsomag" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "" @@ -5105,127 +4517,173 @@ msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "%s changesets" +msgid "Changeset on" +msgstr "%s módosításcsomag" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +msgid "branch" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "%s módosításcsomag" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "Ennek a tárolónak %s elágazása van" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +msgid "Pull request" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5244,7 +4702,7 @@ msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "" @@ -5254,72 +4712,73 @@ msgstr "" msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" +msgid "New file type" msgstr "" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "" @@ -5329,7 +4788,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5342,24 +4801,20 @@ msgstr "" msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5367,50 +4822,58 @@ msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "" +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" +msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 @@ -5431,12 +4894,12 @@ msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "" @@ -5445,35 +4908,35 @@ msgstr "" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5483,40 +4946,40 @@ msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "" @@ -5525,31 +4988,36 @@ msgstr "" msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "" @@ -5561,6 +5029,10 @@ msgstr "" msgid "Vote" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5584,7 +5056,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "" @@ -5597,7 +5069,7 @@ msgid "Confirm to delete this pull reque msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:70 -#, fuzzy, python-format +#, python-format msgid "Confirm again to delete this pull request with %s comments" msgstr "" @@ -5611,104 +5083,97 @@ msgstr "" msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -msgid "There are no reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#, fuzzy +#| msgid "Remove reviewer" +msgid "Reviewers" +msgstr "Átnéző eltávolítása" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 msgid "Remove reviewer" msgstr "Átnéző eltávolítása" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 msgid "Potential Reviewers" msgstr "Lehetséges átnézők" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5724,35 +5189,39 @@ msgstr "" msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" @@ -5766,29 +5235,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "" @@ -5798,80 +5267,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "" @@ -5879,458 +5348,82 @@ msgstr "" msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 msgid "Latest Changes" msgstr "" +#: kallithea/templates/summary/summary.html:177 +msgid "Quick Start" +msgstr "" + #: kallithea/templates/summary/summary.html:188 -msgid "Quick Start" -msgstr "" - -#: kallithea/templates/summary/summary.html:202 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" - -#~ msgid "increase diff context to %(num)s lines" -#~ msgstr "" - -#~ msgid "No comments." -#~ msgstr "Nincsenek hozzászólások." - -#~ msgid "public journal" -#~ msgstr "" - -#~ msgid "journal" -#~ msgstr "" - -#~ msgid "bad captcha" -#~ msgstr "" - -#~ msgid "forever" -#~ msgstr "" - -#~ msgid "unmodified" -#~ msgstr "" - -#~ msgid "Cannot delete %s it still contains attached forks" -#~ msgstr "" - -#~ msgid "Locked repository" -#~ msgstr "" - -#~ msgid "Unlocked repository" -#~ msgstr "" - -#~ msgid "Unlocked" -#~ msgstr "" - -#~ msgid "Locked" -#~ msgstr "" - -#~ msgid "Repository has been %s" -#~ msgstr "" - -#~ msgid "You can't edit this user" -#~ msgstr "" - -#~ msgid "compare view" -#~ msgstr "" - -#~ msgid "fork name %s" -#~ msgstr "" - -#~ msgid "Pull request #%s" -#~ msgstr "" - -#~ msgid "No Files" -#~ msgstr "" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -#~ msgstr "" - -#~ msgid "You can't remove this user since it's crucial for entire application" -#~ msgstr "" - -#~ msgid "Username \"%(username)s\" is forbidden" -#~ msgstr "" - -#~ msgid "invalid password" -#~ msgstr "" - -#~ msgid "invalid user name" -#~ msgstr "" - -#~ msgid "Your account is disabled" -#~ msgstr "" - -#~ msgid "Repository name %(repo)s is disallowed" -#~ msgstr "" - -#~ msgid "invalid clone URL" -#~ msgstr "" - -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "This email address is already taken" -#~ msgstr "" - -#~ msgid "email \"%(email)s\" does not exist." -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "" - -#~ msgid "Defaults" -#~ msgstr "" - -#~ msgid "never" -#~ msgstr "" - -#~ msgid "My Emails" -#~ msgstr "" - -#~ msgid "Watched" -#~ msgstr "" - -#~ msgid "My Permissions" -#~ msgstr "" - -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "Confirm to reset this api key: %s" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "Confirm to remove this api key: %s" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - -#~ msgid "delete" -#~ msgstr "" - -#~ msgid "current IP" -#~ msgstr "" - -#~ msgid "Permissions Administration" -#~ msgstr "" - -#~ msgid "Overview" -#~ msgstr "" - -#~ msgid "Overwrite existing settings" -#~ msgstr "" - -#~ msgid "Repository creation" -#~ msgstr "" - -#~ msgid "Default IP Whitelist for All Users" -#~ msgstr "" - -#~ msgid "Confirm to delete this ip: %s" -#~ msgstr "" - -#~ msgid "Default User Permissions Overview" -#~ msgstr "" - -#~ msgid "none" -#~ msgstr "" - -#~ msgid "read" -#~ msgstr "" - -#~ msgid "write" -#~ msgstr "" - -#~ msgid "admin" -#~ msgstr "" - -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "default" -#~ msgstr "" - -#~ msgid "revoke" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - -#~ msgid "apply to children" -#~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - -#~ msgid "Optional URL from which repository should be cloned." -#~ msgstr "" - -#~ msgid "private repository" -#~ msgstr "" - -#~ msgid "Remote URL" -#~ msgstr "" - -#~ msgid "Pull Changes from Remote Location" -#~ msgstr "" - -#~ msgid "Confirm to pull changes from remote side." -#~ msgstr "" - -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - -#~ msgid "Non-changeable id" -#~ msgstr "" - -#~ msgid "edit" -#~ msgstr "" - -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - -#~ msgid "Destroy old data" -#~ msgstr "" - -#~ msgid "check for updates" -#~ msgstr "" - -#~ msgid "Meta-Tagging" -#~ msgstr "" - -#~ msgid "Default permissions" -#~ msgstr "" - -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "Push new repo" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "merge" -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - -#~ msgid "Status change from pull request" -#~ msgstr "" - -#~ msgid "Comment from pull request" -#~ msgstr "" - -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - -#~ msgid "Mimetype" -#~ msgstr "" - -#~ msgid "My Repos" -#~ msgstr "" - -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "%s Pull Request #%s" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - -#~ msgid "owner" -#~ msgstr "" - -#~ msgid "reviewer" -#~ msgstr "" - -#~ msgid "with subrepos" -#~ msgstr "" - -#~ msgid "Your password reset link was sent" -#~ msgstr "" - -#~ msgid "Your new password" -#~ msgstr "" - -#~ msgid "Your new Kallithea password:%s" -#~ msgstr "" - -#~ msgid "Open New Pull Request for Selected Changesets" -#~ msgstr "" - -#~ msgid "Show Selected Changesets __S → __E" -#~ msgstr "" - -#~ msgid "Show Selected Changeset __S" -#~ msgstr "" - -#~ msgid "We received a request to create a new password for your account." -#~ msgstr "" - -#~ msgid "You can generate it by clicking following URL" -#~ msgstr "" - -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - -#~ msgid "Created by" -#~ msgstr "" - -#~ msgid "You can only delete files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "You can only edit files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "Changeset not found" -#~ msgstr "" - -#~ msgid "Non-admins can can fork repositories" -#~ msgstr "" - -#~ msgid "Pull Requests from %s'" -#~ msgstr "" - +#, fuzzy +#~| msgid "Remote repository" +#~ msgid "Repository Group" +#~ msgstr "Tároló törlése" diff --git a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ja/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ja/LC_MESSAGES/kallithea.po @@ -12,11 +12,11 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" "PO-Revision-Date: 2016-01-07 01:53+0000\n" "Last-Translator: Takumi IINO \n" -"Language-Team: Japanese " -"\n" +"Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,447 +24,473 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 2.5-dev\n" -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "まだチェンジセットがありません" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "なし" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(閉鎖済み)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "空白を表示" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "空白を無視" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "diff コンテキストを %(num)s 行増やす" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +#, fuzzy +#| msgid "No permission to change pull request status" +msgid "No permission to change status" +msgstr "プルリクエストステータスを変更する権限がありません" + +#: kallithea/controllers/changeset.py:214 +#, fuzzy, python-format +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 msgid "Such revision does not exist for this repository" msgstr "お探しのリビジョンはこのリポジトリにはありません" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "リビジョンを選択" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "リポジトリの最新のリビジョン(tip)に移動" + +#: kallithea/controllers/compare.py:72 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "共通の祖先を持たないのでリポジトリを比較できません" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "共通の祖先を持たないのでリポジトリを比較できません" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "応答がありません" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "不明なエラー" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "形式が間違っているため、サーバーはリクエストを処理できませんでした。" - -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" +"形式が間違っているため、サーバーはリクエストを処理できませんでした。" + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "リソースにアクセスする権限がありません" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "このページを閲覧する権限がありません" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "リソースが見つかりません" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." -msgstr "サーバーが不正な状態になったため、リクエストに答えることができませんでした。" - -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "%s リポジトリでの変更" - -#: kallithea/controllers/feed.py:56 +msgstr "" +"サーバーが不正な状態になったため、リクエストに答えることができませんでし" +"た。" + +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "%s が %s にコミット" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "チェンジセットが大きすぎるため、省略しました..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 #, python-format msgid "%s %s feed" msgstr "%s %s フィード" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "チェンジセットが大きすぎるため、省略しました..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s が %s にコミット" - -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" +msgstr "%s リポジトリでの変更" + +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "新しいファイルを追加" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "まだファイルがありません。 %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, fuzzy, python-format msgid "%s at %s" msgstr "%s と %s の間" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, python-format msgid "This repository has been locked by %s on %s" msgstr "このリポジトリは %s によって %s にロックされました" -#: kallithea/controllers/files.py:317 +#: kallithea/controllers/files.py:312 #, fuzzy -#| msgid "You can only delete files with revision being a valid branch " msgid "You can only delete files with revision being a valid branch" msgstr "有効なブランチ上のリビジョンからしかファイルを削除できません" -#: kallithea/controllers/files.py:328 +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Kallithea経由で %s を削除" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "%s ファイルの削除に成功しました" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 #, fuzzy -#| msgid "You can only edit files with revision being a valid branch " msgid "You can only edit files with revision being a valid branch" msgstr "有効なブランチを示すリビジョンでのみファイルを編集できます " -#: kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "Kallithea経由で %s を変更" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "変更点なし" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "Kallithea経由でファイルを追加" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "内容がありません" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "ファイル名がありません" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" msgstr "場所には相対パスかつ .. を含まないパスを入力してください" -#: kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "ダウンロードは無効化されています" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "空のリポジトリ" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "チェンジセット" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "ブランチ" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "タグ" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "グループ" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "リポジトリ" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "ブランチ" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "閉鎖済みブランチ" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "タグ" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "ブックマーク" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "公開ジャーナル" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "ジャーナル" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "キャプチャが一致しません" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "Kallitheaへの登録を受け付けました" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "%sへの登録を受け付けました" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" msgstr "パスワードリセットの確認コードが送信されました" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" msgstr "無効なパスワードリセットトークン" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "パスワードを更新しました" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" msgstr "%s (閉鎖済み)" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "チェンジセット" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" msgstr "スペシャル" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "相手のブランチ" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "ブックマーク" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "プルリクエスト作成中にエラーが発生しました: %s" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "説明がありません" - -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "新しいプルリクエストの作成に成功しました" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 msgid "Error occurred while creating pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "新しいプルリクエストの作成に成功しました" + +#: kallithea/controllers/pullrequests.py:375 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "プルリクエストレビュアー" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "%s で置き換えられたのでクローズします。" - -#: kallithea/controllers/pullrequests.py:470 -#, fuzzy -msgid "Pull request update created" -msgstr "プルリクエストレビュアー" - -#: kallithea/controllers/pullrequests.py:514 +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "説明がありません" + +#: kallithea/controllers/pullrequests.py:432 msgid "Pull request updated" msgstr "プルリクエストを更新しました" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "プルリクエストの削除に成功しました" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。" + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." -msgstr "このプルリクエストはすでにクローズされていて、更新することはできません。" - -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" +msgstr "" +"このプルリクエストはすでにクローズされていて、更新することはできません。" + +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" msgstr "" -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。" -#: kallithea/controllers/pullrequests.py:627 +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "ノート: ブランチ%sには別のヘッド%sがあります。" -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." +#: kallithea/controllers/pullrequests.py:564 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." msgstr "Gitのプルリクエストはまだ更新をサポートしていません。" -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "プルリクエストステータスを変更する権限がありません" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "クローズ。" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/pullrequests.py:566 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "プルリクエストを更新するためのチェンジセットが見つかりません。" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい。" #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "検索を実行する際にエラーが発生しました。" -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "まだデータの準備ができていません" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" @@ -476,149 +502,151 @@ msgstr "認証設定の更新に成功しました" msgid "error occurred during update of auth settings" msgstr "認証設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "デフォルト設定の更新に成功しました" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "デフォルト設定の更新中にエラーが発生しました" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "永久" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" -msgstr "永久" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 分" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "5 分" - -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "1 時間" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 日" -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 ヶ月" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "有効期間" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "gist の作成中にエラーが発生しました" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "gist %s を削除しました" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:196 msgid "Unmodified" msgstr "変更しない" -#: kallithea/controllers/admin/gists.py:262 +#: kallithea/controllers/admin/gists.py:225 msgid "Successfully updated gist content" msgstr "Gist の内容を更新しました" -#: kallithea/controllers/admin/gists.py:267 +#: kallithea/controllers/admin/gists.py:230 msgid "Successfully updated gist data" msgstr "Gist データを更新しました" -#: kallithea/controllers/admin/gists.py:270 +#: kallithea/controllers/admin/gists.py:233 #, python-format msgid "Error occurred during update of gist %s" msgstr "Gist %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーはアプリケーション全体で非常に重要なので編集できません" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "アカウントの更新に成功しました" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "パスワードの更新中にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメールアドレス %s を追加しました" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "ユーザーからメールアドレスを削除しました" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "APIキーの作成に成功しました" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "APIキーのリセットに成功しました" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "APIキーの削除に成功しました" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "読込" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "書込" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -626,1782 +654,1315 @@ msgstr "書込" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "無効" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "手動でアカウントをアクティベートする" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "自動でアカウントをアクティベートする" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "外部アカウントを手動でアクティベートする" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "外部アカウントを自動でアクティベートする" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "無効" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "手動でアカウントをアクティベートする" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "自動でアカウントをアクティベートする" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "外部アカウントを手動でアクティベートする" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "外部アカウントを自動でアクティベートする" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "有効" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "全般の権限の更新に成功しました" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "リポジトリグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "リポジトリグループ %s を作成しました" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "リポジトリグループ %s を更新しました" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "リポジトリグループ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "このグループは %s 個のリポジトリを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "このグループは %s 個のサブグループを含んでいるため削除できません" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "リポジトリグループ %s を削除しました" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "リポジトリグループ %s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "自分自身の管理者としての権限を取り消すことはできません" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "リポジトリグループ権限を更新しました" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "権限の取消中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "リポジトリ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "リポジトリ %s を %s から作成しました" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "リポジトリ %s を %s としてフォークしました" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "リポジトリ %s を作成しました" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "%s 個のフォークを切り離しました" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "%s 個のフォークを削除しました" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "リポジトリ %s を削除しました" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" -msgstr "フォークしたリポジトリが存在するため、 リポジトリ %s は削除できません" - -#: kallithea/controllers/admin/repos.py:326 +msgstr "" +"フォークしたリポジトリが存在するため、 リポジトリ %s は削除できません" + +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "%s の削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "リポジトリ権限を更新しました" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "フィールドの作成中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "フィールドの削除中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "-- フォークではありません --" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:446 msgid "Updated repository visibility in public journal" msgstr "公開ジャーナルでのリポジトリの可視性を更新しました" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:450 msgid "An error occurred during setting this repository in public journal" msgstr "このリポジトリの公開ジャーナルの設定中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:512 +#: kallithea/controllers/admin/repos.py:466 msgid "Nothing" msgstr "ありません" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:468 #, python-format msgid "Marked repository %s as fork of %s" msgstr "%s リポジトリを %s のフォークとする" -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:475 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 msgid "Repository has been locked" msgstr "リポジトリがロックされました" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" msgstr "リポジトリのロックが解除されました" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "アンロック中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "キャッシュの無効化に成功しました" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "リモートから取得" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "VCS設定を更新しました" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" -msgstr "\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に出来ません" - -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 +msgstr "" +"\"hgsubversion\"ライブラリが見つからないため、hgsubversionサポートを有効に" +"出来ません" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "アプリケーション設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:211 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "リポジトリの再スキャンに成功しました。 追加: %s 削除: %s。" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, fuzzy, python-format #| msgid "Invalidate cache for all repositories" msgid "Invalidated %s repositories" msgstr "すべてのリポジトリのキャッシュを無効化する" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "表示設定を更新しました" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "表示設定の更新中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "メールアドレスを入力してください" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "メール送信タスクを作成しました" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +#, fuzzy +#| msgid "No data ready yet" +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 "Added new hook" msgstr "新しいフックを追加しました" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "フックを更新しました" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "フックの作成中にエラーが発生しました" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "ユーザーグループ %s を作成しました" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "ユーザーグループ %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "ユーザーグループ %s を更新しました" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "ユーザーグループの削除に成功しました" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "対象に同じ物を選ぶことはできません" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "ユーザーグループ権限を更新しました" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "権限を更新しました" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "権限の保存時にエラーが発生しました" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "ユーザー %s を作成しました" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "ユーザーの削除に成功しました" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "デフォルト ユーザーを編集できません" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "ユーザーホワイトリストにIP %s を追加しました" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "IPアドレスの保存中にエラーが発生しました" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "ユーザーホワイトリストからIPアドレスを削除しました" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "IPアドレス %s は許可されません" - -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" +"このアクションを実行するためには登録済みのユーザーである必要があります" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "このページを閲覧するためにはサインインが必要です" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "APIキーが無効です" -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "このアクションを実行するためには登録済みのユーザーである必要があります" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "このページを閲覧するためにはサインインが必要です" - -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "ファイルシステム内にリポジトリが見つかりません" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset for %s %s not found in %s" msgstr "リビジョンが見つかりません" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "バイナリファイル" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メニューを使用してください" - -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" +"チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メ" +"ニューを使用してください" + +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "検出された変更はありません" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Deleted branch: %s" msgstr "削除されたブランチ: %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:614 #, python-format msgid "Created tag: %s" msgstr "作成したタグ: %s" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset %s not found" msgstr "リビジョンが見つかりません" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "比較ビュー" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "と" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "%s 以上" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "リビジョン" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "フォーク名 %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "プルリクエスト #%s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "リポジトリからアーカイブを[ダウンロード]" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "ユーザーを[作成]" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "ユーザーグループを[作成]" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "ユーザーグループを[更新]" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "プルリクエストを[クローズ]" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "[プッシュ]" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "リポジトリに[Kallithea経由でコミット]" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "[プル]" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "ファイルはありません" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "新しいファイル" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "変更" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "削除" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "リネーム" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " "the filesystem please run the application again in order to rescan " "repositories" msgstr "" -"%s " -"リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを再起動してください" - -#: kallithea/lib/utils2.py:415 +"%s リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作" +"られたか名前が変更されたためです。リポジトリをもう一度チェックするためにア" +"プリケーションを再起動してください" + +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d 年" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ヶ月" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時間" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d 秒" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "%s 以内" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "%s 前" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "%s と %s の間" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "%s と %s 前" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "たったいま" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "リポジトリへのアクセス権限無し" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "リポジトリに読込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "リポジトリに書込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "リポジトリに管理権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "リポジトリグループへのアクセス権限なし" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "リポジトリグループに読込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "リポジトリグループに書込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "リポジトリグループに管理権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "Kallithea 管理者" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "リポジトリの作成を有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "リポジトリの作成を有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "リポジトリのフォークを無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "リポジトリのフォークを有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "新規登録を無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Kallitheaに登録した新しいユーザーを手動でアクティベートする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Kallitheaに登録した新しいユーザーを自動でアクティベートする" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "未レビュー" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "承認" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "却下" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "レビュー中" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "top level" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "リポジトリグループへのアクセス権限なし" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "リポジトリグループに読込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "リポジトリグループに書込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "リポジトリグループに管理権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "ユーザーグループへのアクセス権限なし" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "ユーザーグループに読込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "ユーザーグループに書込権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "ユーザーグループに管理権限でアクセス" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "リポジトリグループの作成を無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "リポジトリグループの作成を有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "ユーザーグループの作成を無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "ユーザーグループの作成を有効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "新規登録を無効にする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "%s 行目" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Mention]" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "top level" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "Kallithea 管理者" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "デフォルトユーザーは新しいリポジトリにアクセスできません" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" -msgstr "デフォルトユーザーは新しいリポジトリに読み取りアクセスする権限があります" - -#: kallithea/model/db.py:1670 +msgstr "" +"デフォルトユーザーは新しいリポジトリに読み取りアクセスする権限があります" + +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" -msgstr "デフォルトユーザーは新しいリポジトリに書き込みアクセスする権限があります" - -#: kallithea/model/db.py:1671 +msgstr "" +"デフォルトユーザーは新しいリポジトリに書き込みアクセスする権限があります" + +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "管理者のみがリポジトリのグループを作成できます" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" msgstr "非管理者がリポジトリのグループを作成できます" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "管理者だけがユーザー グループを作成することができます" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "非管理者ユーザーがグループを作成することができます" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "管理者だけがトップレベルにリポジトリを作成することができます" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "非管理者がトップレベルにリポジトリを作成することができます" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" +"リポジトリグループの書き込みパーミッションを使ったリポジトリ作成が有効です" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" +"リポジトリグループの書き込みパーミッションを使ったリポジトリ作成は無効です" + +#: kallithea/model/db.py:1732 msgid "Only admins can fork repositories" msgstr "管理者のみがリポジトリをフォークすることができます" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 #, fuzzy -#| msgid "Non-admins can can fork repositories" msgid "Non-admins can fork repositories" msgstr "非管理者がリポジトリをフォークすることができます" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "新規登録を無効にする" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "未レビュー" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "レビュー中" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2265 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "承認" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "承認" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "ログイン名を入力してください" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "%(min)i 文字以上必要です" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "パスワードを入力してください" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "%(min)i 文字以上必要です" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "数字だけの名前は使えません" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "%(user)s がチェンジセットにコメント %(age)s" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "%(user)s がメッセージを送信 %(age)s" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "%(user)s がにあなたにメンション %(age)s" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "%(user)s がKallitheaに登録 %(age)s" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "%(user)s が新しいプルリクエストを作成 %(age)s" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "%(user)s がプルリクエストにコメント %(age)s" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "%(user)s がチェンジセットにコメント %(when)s" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "%(user)s がメッセージを送信 %(when)s" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "%(user)s がにあなたにメンション %(when)s" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "%(user)s がKallitheaに登録 %(when)s" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "%(user)s が新しいプルリクエストを作成 %(when)s" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "%(user)s がプルリクエストにコメント %(when)s" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, fuzzy, python-format +#| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "プルリクエストに[コメント]" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "新しいユーザー %(new_username)s が登録されました" -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めています" - -#: kallithea/model/notification.py:309 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "プルリクエストに[コメント]" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "クローズ" -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "%(user)s がプリリクエスト #%(pr_nice_id)s: %(pr_title)s のレビューを求めています" - -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" +"%(user)s がプリリクエスト #%(pr_nice_id)s: %(pr_title)s のレビューを求めて" +"います" + +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "プルリクエスト作成中にエラーが発生しました: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "このプルリクエストを削除してもよろしいですか？" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "最新のtip" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "新規ユーザー登録" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 #, fuzzy -msgid "You can't remove this user since it is crucial for the entire application" -msgstr "このユーザーを削除できません。このユーザーはアプリケーションにとって必要不可欠です。" - -#: kallithea/model/user.py:261 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" +"このユーザーを削除できません。このユーザーはアプリケーションにとって必要不" +"可欠です。" + +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" -msgstr "ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできません。リポジトリの所有者を変更するか削除してください： %s" - -#: kallithea/model/user.py:266 +msgstr "" +"ユーザー \"%s\" はまだ %s 個のリポジトリの所有者のため削除することはできま" +"せん。リポジトリの所有者を変更するか削除してください： %s" + +#: kallithea/model/user.py:263 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" msgstr "" -"ユーザー \"%s\" はまだ %s " -"個のリポジトリグループの所有者のため削除することはできません。リポジトリグループの所有者を変更するか削除してください： %s" - -#: kallithea/model/user.py:273 +"ユーザー \"%s\" はまだ %s 個のリポジトリグループの所有者のため削除すること" +"はできません。リポジトリグループの所有者を変更するか削除してください： %s" + +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -"ユーザー \"%s\" はまだ %s " -"個のユーザーグループの所有者のため削除することはできません。ユーザーグループの所有者を変更するか削除してください。 %s" - -#: kallithea/model/user.py:360 +"ユーザー \"%s\" はまだ %s 個のユーザーグループの所有者のため削除することは" +"できません。ユーザーグループの所有者を変更するか削除してください。 %s" + +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "パスワードリセットのリンク" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "パスワードの再設定通知" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "空のリストにはできません" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "ユーザー名 \"%(username)s\" はすでに使われています" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "ユーザー名 %(username)s は使用できません" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" -msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットまたはアンダースコア(_)から始まる必要があります" - -#: kallithea/model/validators.py:126 +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" +"ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)し" +"か使えません。また、アルファベットまたはアンダースコア(_)から始まる必要が" +"あります" + +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "入力が正しくありません" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:112 #, python-format msgid "Username %(username)s is not valid" msgstr "ユーザー名 %(username)s は不正です" -#: kallithea/model/validators.py:152 +#: kallithea/model/validators.py:133 msgid "Invalid user group name" msgstr "不正なユーザーグループ名です" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "ユーザーグループ \"%(usergroup)s\" はすでに存在します" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" - -#: kallithea/model/validators.py:193 +msgstr "" +"ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッ" +"シュ(-)しか使えません。また、アルファベットから始まる必要があります" + +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "このグループは親にできません" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "グループ \"%(group_name)s\" はすでに存在します" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "パスワードに利用出来ない文字列(non-ascii)です" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "古いpasswordが間違っています" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 msgid "Invalid username or password" msgstr "ユーザー名とパスワードの組み合わせが無効です" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:312 msgid "Token mismatch" msgstr "トークンが一致しません" -#: kallithea/model/validators.py:345 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "リポジトリ名 %(repo)s は許可されていません" -#: kallithea/model/validators.py:347 +#: kallithea/model/validators.py:330 #, python-format msgid "Repository named %(repo)s already exists" msgstr "リポジトリ %(repo)s はすでに存在します" -#: kallithea/model/validators.py:348 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" -msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" - -#: kallithea/model/validators.py:350 +msgstr "" +"リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" + +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 msgid "Invalid repository URL" msgstr "無効なリポジトリのURL" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "フォークは親と同じ種別の必要があります" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "このグループにリポジトリを作成する権限がありません" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "ルートにリポジトリを作成する権限がありません" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "この場所にグループを作成する権限がありません" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "不正なパスです" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 msgid "This email address is already in use" msgstr "このメールアドレスはすでに取得されています" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "メールアドレス \"%(email)s\" がみつかりません" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" -msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです" - -#: kallithea/model/validators.py:774 +msgstr "" +"LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同" +"じです" + +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "有効なIPv4かIPv6のアドレスを入力してください" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不正です)" - -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" +"ネットワークサイズ (bits) は0-32の範囲にする必要があります ( %(bits)r は不" +"正です)" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" -msgstr "キー名にはアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数字が使えます" - -#: kallithea/model/validators.py:822 +msgstr "" +"キー名にはアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)、数" +"字が使えます" + +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "ファイル名はディレクトリ内にすることはできません" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" -msgstr "%(loaded)s プラグインと %(next_to_load)s プラグインで同じ名前が使われています" - -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +msgstr "" +"%(loaded)s プラグインと %(next_to_load)s プラグインで同じ名前が使われてい" +"ます" + +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "ダッシュボード" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "クイックフィルタ..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "リポジトリ" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "リポジトリを追加" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 msgid "Add Repository Group" msgstr "リポジトリグループを追加" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "管理者権限をもっているため編集できます" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "リポジトリグループを編集" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "グループ名" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "リポジトリ" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "説明" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "名前" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "最後の変更点" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "Tip" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "所有者" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "昇順で並び換え" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "降順で並び替え" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "リポジトリが見つかりません。" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "データエラー" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "読み込み中..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "ログイン" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "%s へログイン" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "ユーザー名" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "パスワード" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "次回から自動的にサインイン" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "パスワードを忘れた?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "アカウントを持っていない?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "サインイン" @@ -2409,176 +1970,147 @@ msgstr "サインイン" msgid "Password Reset" msgstr "パスワードのリセット" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" msgstr "%sのパスワードをリセット" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "パスワードのリセット" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "メールアドレス" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "キャプチャ" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:47 msgid "Send Password Reset Email" msgstr "パスワードリセットメールを送信" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:52 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." -msgstr "システムに登録されている場合、パスワードリセットのリンクを指定されたメールアドレスに送信します。" - -#: kallithea/templates/password_reset_confirmation.html:19 +msgstr "" +"システムに登録されている場合、パスワードリセットのリンクを指定されたメール" +"アドレスに送信します。" + +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 msgid "New Password" msgstr "新しいパスワード" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 msgid "Confirm New Password" msgstr "新しいパスワードの確認" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "サインアップ" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "%s へサインアップ" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "パスワード再入力" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "名前" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "名字" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "メールアドレス" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "まだブランチがありません" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "閉鎖済みブランチ" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "まだタグがありません" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "まだブックマークがありません" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "管理ジャーナル" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "ジャーナルフィルタ..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "フィルター" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, python-format msgid "%s Entry" msgid_plural "%s Entries" msgstr[0] "%s 個のエントリ" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "アクション" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "リポジトリ" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "日時" @@ -2586,7 +2118,7 @@ msgstr "日時" msgid "From IP" msgstr "アクセス元IPアドレス" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "まだアクションがありません" @@ -2595,108 +2127,112 @@ msgid "Authentication Settings" msgstr "認証設定" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "認証" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "認証プラグイン" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "有効なプラグイン" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" -msgstr "カンマ区切りのプラグインの一覧です。Kallitheaはプラグインの並び順でユーザー認証を試みます" - -#: kallithea/templates/admin/auth/auth_settings.html:34 +msgstr "" +"カンマ区切りのプラグインの一覧です。Kallitheaはプラグインの並び順でユー" +"ザー認証を試みます" + +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "有効な組み込みプラグイン" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "プラグイン" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "保存" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 msgid "Repository Defaults" msgstr "リポジトリのデフォルト設定" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "リポジトリの種別" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "非公開リポジトリ" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." -msgstr "非公開リポジトリはコラボレーターとして明示的に追加された人のみ閲覧できます。" - -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +msgstr "" +"非公開リポジトリはコラボレーターとして明示的に追加された人のみ閲覧できま" +"す。" + +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 msgid "Enable statistics" msgstr "統計を有効にする" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 msgid "Enable statistics window on summary page." msgstr "概要ページの統計ウィンドウを有効にします。" -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 msgid "Enable downloads" msgstr "ダウンロードを有効にする" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "概要ページのダウンロードメニューを有効にします。" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "ロックを有効にする" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "リポジトリのpullのロックを有効にします。" @@ -2705,47 +2241,47 @@ msgstr "リポジトリのpullのロックを有効にします。" msgid "Edit Gist" msgstr "Gistを編集" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -"編集開始後にGistが更新されています。あなたの変更箇所をコピーしておき、 %(here)s " -"をクリックして新しいバージョンを読み込みなおしてください。" - -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +"編集開始後にGistが更新されています。あなたの変更箇所をコピーしておき、 " +"%(here)s をクリックして新しいバージョンを読み込みなおしてください。" + +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "Gist の説明..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "Gist 有効期間" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "失効" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 msgid "Never" msgstr "しない" @@ -2754,7 +2290,8 @@ msgid "Update Gist" msgstr "Gistを更新" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "キャンセル" @@ -2777,16 +2314,16 @@ msgstr "公開 Gists" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "新しい Gist を作成" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "作成日" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "まだgistがありません" @@ -2795,45 +2332,47 @@ msgstr "まだgistがありません" msgid "New Gist" msgstr "Gistを新規作成" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." +#: kallithea/templates/admin/gists/new.html:45 +#, fuzzy +#| msgid "name this file..." +msgid "Name this gist ..." msgstr "ファイルに名前をつける..." -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "非公開 Gist を作成" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "公開 Gist を作成" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "リセット" @@ -2843,182 +2382,197 @@ msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/templates/admin/gists/show.html:35 msgid "Public Gist" msgstr "公開 Gist" -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/templates/admin/gists/show.html:37 msgid "Private Gist" msgstr "非公開 Gist" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "削除" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "このGistを削除してもよろしいですか？" -#: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 #: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 #: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 #: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "編集" -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "Raw形式で表示" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "作成日" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "Raw形式で表示" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "アカウント" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "プロフィール" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" msgstr "メールアドレス" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "APIキー" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 msgid "Owned Repositories" msgstr "所有しているリポジトリ" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "ウォッチ中のリポジトリ" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 msgid "Show Permissions" msgstr "権限の表示" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "ビルトイン" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, python-format msgid "Confirm to reset this API key: %s" msgstr "このAPIキーをリセットしてもよろしいですか？: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "期限切れ" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, python-format msgid "Confirm to remove this API key: %s" msgstr "このAPIキーを削除してもよろしいですか？: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" msgstr "削除" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "API キーが指定されていません" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "新しいAPIキー" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "追加" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "プライマリ" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "このメールアドレスを削除してもよろしいですか？ : %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "追加のメールアドレスはありません。" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "新しいメールアドレス" @@ -3026,105 +2580,69 @@ msgstr "新しいメールアドレス" msgid "Change Your Account Password" msgstr "パスワードを変更してください" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "現在のパスワード" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "新しいパスワード" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "新しいパスワードの確認" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" -msgstr "アバターを変更できます : " +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "現在の IP アドレス" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change avatar at" +msgid "Change %s avatar at" +msgstr "アバターを変更:" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "メールアドレス:" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "アバターは無効です" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "メールアドレスがありません。更新してください。" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "現在の IP アドレス" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" msgstr "あなたが所有者のリポジトリ" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "レコードが見つかりません" +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "名前" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "あなたがウォッチしているリポジトリ" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "通知" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "すべて" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "コメント" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "プルリクエスト" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "すべて既読としてマーク" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "まだ通知がありません" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "通知を表示" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "通知" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "デフォルトの権限" @@ -3138,204 +2656,226 @@ msgstr "全般" msgid "IP Whitelist" msgstr "IPアドレスのホワイトリスト" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "匿名アクセス" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +#, fuzzy +#| msgid "Anonymous access" +msgid "Allow anonymous access" +msgstr "匿名アクセス" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, fuzzy, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." -msgstr "ログインしなくても Kallithea にアクセスできるようにします。匿名ユーザーは %s ユーザーパーミッションを使います" - -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +msgstr "" +"ログインしなくても Kallithea にアクセスできるようにします。匿名ユーザーは " +"%s ユーザーパーミッションを使います" + +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" -msgstr "選択したパーミッションで、各リポジトリのデフォルトパーミッションをリセットします。各リポジトリの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください" - -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +msgstr "" +"選択したパーミッションで、各リポジトリのデフォルトパーミッションをリセット" +"します。各リポジトリの既存のカスタムデフォルトパーミッション設定は無くなる" +"ので注意してください" + +#: kallithea/templates/admin/permissions/permissions_globals.html:20 #, fuzzy msgid "Apply to all existing repositories" msgstr "既存のリポジトリを import しますか？" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 msgid "Permissions for the Default user on new repositories." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "リポジトリグループ" + #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "リポジトリグループ" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "選択したパーミッションで、各リポジトリグループのデフォルトパーミッションをリセットします。各リポジトリグループの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください" - -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +msgstr "" +"選択したパーミッションで、各リポジトリグループのデフォルトパーミッションを" +"リセットします。各リポジトリグループの既存のカスタムデフォルトパーミッショ" +"ン設定は無くなるので注意してください" + +#: kallithea/templates/admin/permissions/permissions_globals.html:33 #, fuzzy msgid "Apply to all existing repository groups" msgstr "既存のリポジトリを import しますか？" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 #, fuzzy msgid "Permissions for the Default user on new repository groups." -msgstr "親のリポジトリグループにセットされているパーミッションをコピーします。" - -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +msgstr "" +"親のリポジトリグループにセットされているパーミッションをコピーします。" + +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "ユーザーグループ" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 #, fuzzy msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" -msgstr "選択したパーミッションで、各ユーザーグループのデフォルトパーミッションをリセットします。各ユーザーグループの既存のカスタムデフォルトパーミッション設定は無くなるので注意してください" - -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +msgstr "" +"選択したパーミッションで、各ユーザーグループのデフォルトパーミッションをリ" +"セットします。各ユーザーグループの既存のカスタムデフォルトパーミッション設" +"定は無くなるので注意してください" + +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 msgid "Top level repository creation" msgstr "トップレベルリポジトリの作成" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:57 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:61 msgid "Repository creation with group write access" msgstr "グループ書き込み権限でのリポジトリ作成" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:64 #, fuzzy msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." -msgstr "リポジトリグループに書き込みパーミッションを付与すると、グループ内にリポジトリを作成できるようになります" - -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +msgstr "" +"リポジトリグループに書き込みパーミッションを付与すると、グループ内にリポジ" +"トリを作成できるようになります" + +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "ユーザーグループ作成" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:75 msgid "Repository forking" msgstr "リポジトリのフォーク" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:78 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:82 msgid "Registration" msgstr "新規登録" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:88 msgid "External auth account activation" msgstr "外部認証アカウントのアクティベート" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "このIPアドレスを削除してもよろしいですか？ : %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "すべてのIPアドレスが許可されています。" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "新しいIPアドレス" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "リポジトリグループ" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "グループ名" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "親グループ" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "親グループのパーミッションをコピー" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." -msgstr "親のリポジトリグループにセットされているパーミッションをコピーします。" +msgstr "" +"親のリポジトリグループにセットされているパーミッションをコピーします。" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 #, python-format msgid "%s Repository Group Settings" msgstr "%s リポジトリグループ設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "子グループを追加" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "高度な設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "権限設定" @@ -3360,12 +2900,12 @@ msgstr "子グループ数" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "作成日" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3375,16 +2915,38 @@ msgstr[0] "このグループを削除してもよろしいですか？ : %s %s 個のリポジトリ" msgid "Delete this repository group" msgstr "このリポジトリグループを削除" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "disabled" +msgid "Visible" +msgstr "無効" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "リポジトリを追加" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "ユーザーグループを追加" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "ユーザー/ユーザーグループ" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3393,105 +2955,106 @@ msgstr "Default" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "取消" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "新規追加" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "子要素にも適用" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "両方" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." -msgstr "このグループに属する全ての子要素のパーミッションを設定または無効化します。選択されていれば、非公開でないリポジトリや他のリポジトリも対象に含みます。" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +msgstr "" +"このグループに属する全ての子要素のパーミッションを設定または無効化します。" +"選択されていれば、非公開でないリポジトリや他のリポジトリも対象に含みます。" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "グループに対してpullのロックを有効にします。このオプションはグループに含まれる全てのグループとリポジトリに適用されます。" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" +"グループに対してpullのロックを有効にします。このオプションはグループに含ま" +"れる全てのグループとリポジトリに適用されます。" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "このグループを削除" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "このグループを削除してもよろしいですか？: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "%s リポジトリグループダッシュボード" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "ホーム" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "と" +#, fuzzy, python-format +#| msgid "Repository Group: %s" +msgid "Repository group %s" +msgstr "リポジトリグループ: %s" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "リポジトリグループ管理" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "トップレベルリポジトリ数" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 msgid "Clone remote repository" msgstr "リモートリポジトリをクローン" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" - -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" +"短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "オプション：このリポジトリが属するグループを選択します" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "作成するリポジトリの種別を指定します" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "ランディングリビジョン" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" -msgstr "ファイルページ、ダウンロード、全文検索インデックス、READMEなどの生成に使うデフォルトのリビジョン" +msgstr "" +"ファイルページ、ダウンロード、全文検索インデックス、READMEなどの生成に使う" +"デフォルトのリビジョン" #: kallithea/templates/admin/repos/repo_creating.html:9 #, fuzzy, python-format @@ -3507,35 +3070,39 @@ msgstr "リポジトリを作成中" msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected " "when this process is finished.repo_name" -msgstr "リポジトリ \"%(repo_name)s\" を作成中です。処理を完了したらリダイレクトします。" +msgstr "" +"リポジトリ \"%(repo_name)s\" を作成中です。処理を完了したらリダイレクトし" +"ます。" #: kallithea/templates/admin/repos/repo_creating.html:39 msgid "" "We're sorry but error occurred during this operation. Please check your " "Kallithea server logs, or contact administrator." -msgstr "恐れいります。操作中にエラーが発生しました。 Kallithea サーバのログをチェックするか、管理者に問い合わせてください。" +msgstr "" +"恐れいります。操作中にエラーが発生しました。 Kallithea サーバのログを" +"チェックするか、管理者に問い合わせてください。" #: kallithea/templates/admin/repos/repo_edit.html:8 #, python-format msgid "%s Repository Settings" msgstr "%s リポジトリ設定" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "拡張フィールド" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "キャッシュ" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "リモート" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "統計" @@ -3544,63 +3111,62 @@ msgid "Parent" msgstr "Parent" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "保存" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "一覧から別のフォークとしてこのリポジトリを手動で設定します。" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "公開ジャーナルでの可視性" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "公開ジャーナルから削除する" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "公開ジャーナルへ追加" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." -msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +msgstr "" +"公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "ロック" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "このリポジトリのロックを解除しますか？" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "リポジトリのロックを解除" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "このリポジトリのロックを解除しますか？" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" -msgstr "リポジトリのロックを解除" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 msgid "Confirm to lock repository." msgstr "このリポジトリをロックしますか？" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Lock Repository" msgstr "リポジトリをロック" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "リポジトリはロックされていません" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3608,31 +3174,31 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "このリポジトリを削除してもよろしいですか？ : %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "このリポジトリを削除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "このリポジトリには %s 個のフォークがあります" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "フォークの切り離し" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "フォークも削除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3643,105 +3209,109 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "リポジトリのキャッシュを無効化" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "リポジトリのキャッシュを無効化してもよろしいですか？" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." -msgstr "このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス時に再びキャッシュされます。" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +msgstr "" +"このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス" +"時に再びキャッシュされます。" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 msgid "List of Cached Values" msgstr "キャッシュしている値の一覧" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "プレフィックス" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "キー" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "アクティブ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "ラベル" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "このフィールドを削除してもよろしいですか？ : %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "新しいフィールドのキー" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "新しいフィールドのラベル" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "ラベルを入力してください" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "新しいフィールドの説明" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "フィールドの説明を入力してください" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "拡張フィールドは無効化されています" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "非公開リポジトリ" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "リポジトリを[フォーク]" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "リモートリポジトリURL" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "リモートリポジトリから変更を取り込む" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 msgid "Confirm to pull changes from remote repository." msgstr "リモートリポジトリから変更を取り込んでもよろしいですか？" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "このリポジトリにリモートURLは設定されていません" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "リポジトリID" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "これは何？" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "id を使ってURLを表現" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3750,37 +3320,50 @@ msgid "" " This is useful for CI systems, or any " "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -"通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジトリのURLが変わります。\n" +"通常、リポジトリの名前を変更したり、別のグループに移動すると、リポジトリの" +"URLが変わります。\n" "上のURLを使えば、常にリポジトリにアクセスできます。\n" -"この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLを固定化したいときに便利です。" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +"この機能は、CIを使っている場合や、3rd pirtyのサービス向けにURLを固定化した" +"いときに便利です。" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "リモートリポジトリ" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "リポジトリURL" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." -msgstr "オプション: リモートリポジトリのURLです。設定した場合、このURLから変更を取得することができます。" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +msgstr "" +"オプション: リモートリポジトリのURLです。設定した場合、このURLから変更を取" +"得することができます。" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +msgstr "" +"ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定し" +"ます" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +#, fuzzy +#| msgid "Type name of reviewer to add" +msgid "Type name of user" +msgstr "追加するレビュアーの名前を入力" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "リポジトリの所有者を変更" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "処理済みコミット数" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "処理状況" @@ -3796,7 +3379,7 @@ msgstr "現在の統計情報をリセットしてもよろしいですか？" msgid "Repositories Administration" msgstr "リポジトリ管理" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "状態" @@ -3817,7 +3400,7 @@ msgid "Visual" msgstr "表示" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "フック" @@ -3829,281 +3412,287 @@ msgstr "全文検索" msgid "System Info" msgstr "システム情報" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "テストメールの送信" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "送信" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "サイト名" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "このKallitheaサービスのカスタムタイトルを設定します。" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "このKallitheaサービスのカスタムタイトルを設定します。" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "HTTP認証レルム" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:37 +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "ReCaptcha 公開鍵" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "reCaptchaの公開鍵。" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "ReCaptcha 秘密鍵" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." -msgstr "reCaptchaの秘密鍵。この値が設定されると登録時のキャプチャが有効になります。" - -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +msgstr "" +"reCaptchaの秘密鍵。この値が設定されると登録時のキャプチャが有効になりま" +"す。" + +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "設定を保存" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "組み込みのMercurialフック (編集不可)" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "カスタムフック" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." -msgstr "フックを使うと、リポジトリへのプッシュやプルといった特定のイベントに合わせて、何らかのアクションを実行できます。フック機能では、Pythonの関数を呼び出したり、外部アプリケーションを起動したりできます。" - -#: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom Hooks" -msgstr "カスタムフック" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +msgstr "" +"フックを使うと、リポジトリへのプッシュやプルといった特定のイベントに合わせ" +"て、何らかのアクションを実行できます。フック機能では、Pythonの関数を呼び出" +"したり、外部アプリケーションを起動したりできます。" + +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "フックの削除に失敗しました" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "再スキャンオプション" -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "見つからないリポジトリのレコードを削除" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "すべてのリポジトリのキャッシュを無効化する" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 #, fuzzy msgid "Check this to reload data and clear cache keys for all repositories." msgstr "すべてのリポジトリのキャッシュを無効化する" -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "Install Git hooks" msgstr "Gitフックをインストール" -#: kallithea/templates/admin/settings/settings_mapping.html:25 +#: kallithea/templates/admin/settings/settings_mapping.html:28 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." -msgstr "各リポジトリに Kallitheas の Gitフックがインストールされているか確認してください。現在のフックは最新版に更新されます" - -#: kallithea/templates/admin/settings/settings_mapping.html:28 +msgstr "" +"各リポジトリに Kallitheas の Gitフックがインストールされているか確認してく" +"ださい。現在のフックは最新版に更新されます" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "既存のGitフックを上書きする" -#: kallithea/templates/admin/settings/settings_mapping.html:30 +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" msgstr "" -"GitフックをインストールするとKallitheaから設定されたものであっても既存のフックは全て上書きされます。警告: " -"この操作はあなたが手動で配置したGitのカスタムフックを全て破壊します!" - -#: kallithea/templates/admin/settings/settings_mapping.html:35 +"GitフックをインストールするとKallitheaから設定されたものであっても既存の" +"フックは全て上書きされます。警告: この操作はあなたが手動で配置したGitのカ" +"スタムフックを全て破壊します!" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "リポジトリを再スキャン" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "インデックス作成時の設定" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "一度削除してから再度インデックスを作成" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "一度削除してから再度インデックスを作成" - -#: kallithea/templates/admin/settings/settings_search.html:15 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." -msgstr "このオプションを使うと、全文検索の機能が正しく発揮されるよう、 Kallithea 中の全てのファイルのインデックスを再生成します。" - -#: kallithea/templates/admin/settings/settings_search.html:21 +msgstr "" +"このオプションを使うと、全文検索の機能が正しく発揮されるよう、 Kallithea " +"中の全てのファイルのインデックスを再生成します。" + +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "再インデックス" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "更新を確認中..." + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "Kallithea バージョン" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "更新を確認" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "Kallithea の設定ファイル" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "Python バージョン" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" -msgstr "プラットフォーム" +msgid "Check for updates" +msgstr "更新を確認" #: kallithea/templates/admin/settings/settings_system.html:8 +msgid "Kallithea configuration file" +msgstr "Kallithea の設定ファイル" + +#: kallithea/templates/admin/settings/settings_system.html:9 +msgid "Python version" +msgstr "Python バージョン" + +#: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "プラットフォーム" + +#: kallithea/templates/admin/settings/settings_system.html:11 msgid "Git version" msgstr "Git バージョン" -#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/templates/admin/settings/settings_system.html:12 msgid "Git path" msgstr "Git パス" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "更新情報のエンドポイント" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "ノート: サーバーがこのURLにアクセスできることを確認して下さい" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "更新を確認中..." - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "Python パッケージ" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Web" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "VCSの操作にSSLを必須とする" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not Acceptableを返します。" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "プッシュ後にリポジトリのサイズを表示する" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "ユーザーのプッシュコマンドを記録する" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "ユーザーのプルコマンドを記録する" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "プッシュ後にリポジトリを更新する (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "Mercurialエクステンション" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 msgid "Enable largefiles extension" msgstr "largefilesエクステンションを有効にする" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 msgid "Enable hgsubversion extension" msgstr "hgsubversionエクステンションを有効にする" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -"hgsubversion " -"ライブラリのインストールが必要です。リモートのSVNリポジトリをクローンしてMercurialリポジトリに変換するすることが可能です。" - -#: kallithea/templates/admin/settings/settings_vcs.html:64 +"hgsubversion ライブラリのインストールが必要です。リモートのSVNリポジトリを" +"クローンしてMercurialリポジトリに変換するすることが可能です。" + +#: kallithea/templates/admin/settings/settings_vcs.html:59 msgid "Location of repositories" msgstr "リポジトリの場所" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." -msgstr "アンロックする。この設定を有効にするためにはKallitheaの再起動が必要です。" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" +"アンロックする。この設定を有効にするためにはKallitheaの再起動が必要です。" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." -msgstr "リポジトリを保存するファイルシステム上の場所。この値を変更した場合、サーバーの再起動とリポジトリフォルダの再スキャンが必要です。" - -#: kallithea/templates/admin/settings/settings_visual.html:8 +msgstr "" +"リポジトリを保存するファイルシステム上の場所。この値を変更した場合、サー" +"バーの再起動とリポジトリフォルダの再スキャンが必要です。" + +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "一般" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "リポジトリの拡張フィールドを使用する" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "追加のカスタムフィールドをリポジトリ毎に保存することを許可します。" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "Kallitheaのバージョンを表示する" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "フッターに表示されるKallitheaのバージョン番号の表示、非表示を設定します。" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "Gravatorsを利用する" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" +"フッターに表示されるKallitheaのバージョン番号の表示、非表示を設定します。" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 #, fuzzy msgid "" "Gravatar URL allows you to use another avatar server application.\n" @@ -4120,112 +3709,140 @@ msgid "" " {netloc} " "network location/server host of running Kallithea server" msgstr "" -"Gravatar URL を設定すると、外部のアバターサーバーアプリケーションを使用します。\n" +"Gravatar URL を設定すると、外部のアバターサーバーアプリケーションを使用し" +"ます。\n" "必要に応じて、 URL に以下の変数を使ってください。\n" -"{scheme} Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n" +"{scheme} Kallithea サーバからリクエストを送信するときに使うスキーム。 " +"'http' または 'https'\n" "{email} ユーザーのメールアドレス\n" -"{md5email} ユーザーのメールアドレスの md5 ハッシュ値 (gravatar.com で使っています)\n" +"{md5email} ユーザーのメールアドレスの md5 ハッシュ値 (gravatar.com で使っ" +"ています)\n" "{size} サーバーアプリケーションに要求する画像のサイズ\n" "{netloc} Kallithea サーバーのアドレスまたはホスト名" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "クローンURL" + +#: kallithea/templates/admin/settings/settings_visual.html:43 +#, fuzzy +#| msgid "" +#| "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +#| "{repo}'.\n" +#| "The following variables are available:\n" +#| "{scheme} 'http' or 'https' sent from running Kallithea server,\n" +#| "{user} current user username,\n" +#| "{netloc} network location/server host of running Kallithea server,\n" +#| "{repo} full repository name,\n" +#| "{repoid} ID of repository, can be used to contruct clone-by-id" msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" msgstr "" -"クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' " -"のような形式にします。使える変数は下記の通りです:\n" +"クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' のような形" +"式にします。使える変数は下記の通りです:\n" " {scheme} " -"Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' または 'https'\n" -" {user} " -"現在のユーザーのユーザー名\n" +"Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' また" +"は 'https'\n" +" {user} 現在の" +"ユーザーのユーザー名\n" " {netloc} " "Kallithea サーバーのアドレスまたはホスト名\n" -" {repo} " -"リポジトリの完全な名前\n" -" {repoid} リポジトリの " -"ID。 clone-by-id に使います。" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "ダッシュボードの項目" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repo} リポジト" +"リの完全な名前\n" +" {repoid} リポジト" +"リの ID。 clone-by-id に使います。" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "リポジトリサイズ" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +#, fuzzy +#| msgid "" +#| "Number of items displayed in the admin pages grids before pagination " +#| "is shown." msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." -msgstr "メインページダッシュボードで1ページに表示する要素数。" +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +#, fuzzy +#| msgid "Admin pages items" +msgid "Admin page size" +msgstr "管理ページの項目" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "管理ページの項目" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "管理ページで、ページ分割しないでグリッドに表示する項目の数" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "アイコン" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "公開リポジトリのアイコンを表示する" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Show private repository icon on repositories" msgstr "非公開リポジトリのアイコンを表示する" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show public/private icons next to repository names." msgstr "リポジトリ名の隣に公開/非公開アイコンを表示します。" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 msgid "Meta Tagging" msgstr "メタタグ" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "次のメタタグを変換する:" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "リポジトリの説明のメタタグを解析して色つきのタグに変換します。" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "次のメタタグを変換する:" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "ユーザーグループを追加" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "ユーザーグループ" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "ユーザーグループを追加" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "このユーザーグループの簡潔な説明を書いてください。" @@ -4244,13 +3861,13 @@ msgid "User Group: %s" msgstr "ユーサーグループ: %s" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "メンバー" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "このユーザーグループを削除してもよろしいですか？: %s" @@ -4259,15 +3876,15 @@ msgstr "このユーザーグループを削除してもよろしいですか？: %s" msgid "Delete this user group" msgstr "このユーザーグループを削除" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "まだメンバーがいません" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "グループメンバーを選ぶ" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "有効なメンバー" @@ -4281,17 +3898,17 @@ msgstr "ユーザーを追加" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "ユーザー" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "ユーザーを追加" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "パスワード再入力" @@ -4310,12 +3927,12 @@ msgid "User: %s" msgstr "ユーザー: %s" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "アカウントのソース" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "最終ログイン日時" @@ -4324,7 +3941,7 @@ msgid "Member of User Groups" msgstr "グループのメンバー数" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "このユーザーを削除してもよろしいですか？ : %s" @@ -4333,24 +3950,16 @@ msgstr "このユーザーを削除してもよろしいですか？ : %s" msgid "Delete this user" msgstr "このユーザーを削除" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "%s から継承" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "アバターを変更:" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "メールアドレスがありません。このユーザーのメールアドレスを更新してください。" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "アカウントのソースでの名前" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "新しいパスワード 再入力" @@ -4358,222 +3967,228 @@ msgstr "新しいパスワード 再入力" msgid "Users Administration" msgstr "ユーザー管理" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "認証タイプ" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "サーバーインスタンス: %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "サポート" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "Gitリポジトリ" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "フォークを作成" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "要約" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "履歴" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "ファイル" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "ブランチの切り替え" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "%s のプルリクエストを表示" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "プルリクエスト" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "オプション" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "フォークと比較" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "比較" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "検索" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "アンロック" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "ロック" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:174 msgid "Follow" msgstr "フォロー" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "アンフォロー" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "フォーク" -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "プルリクエストを作成" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "%s のプルリクエストを表示" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "ブランチの切り替え" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "一致するものが見つかりません" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "最近の活動を表示" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "公開ジャーナル" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "公開 gists を表示" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "すべての公開 Gists" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "公開 Gists" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "非公開 Gists" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "リポジトリから検索" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "私のプルリクエスト" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "ログインしていません" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "あなたのアカウントにログイン" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:379 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "パスワードを忘れた?" -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:383 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "アカウントを持っていない?" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "ログアウト" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "一致するものが見つかりません" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" -msgstr "キーボードショートカット" +msgid "Parent rev." +msgstr "親リビジョン" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "サイト全体" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "子リビジョン" + +#: kallithea/templates/base/default_perms_box.html:11 msgid "Inherit defaults" msgstr "デフォルト権限を継承" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "リポジトリを作成する" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" +"ユーザーにリポジトリ作成を許可する場合はこのオプションを選んでください" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "ユーザーにリポジトリ作成を許可する場合はこのオプションを選んでください" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "ユーザーグループを作成" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" -msgstr "ユーザーにユーザーグループの作成を許可する場合はこのオプションを選んでください" - -#: kallithea/templates/base/default_perms_box.html:52 +msgstr "" +"ユーザーにユーザーグループの作成を許可する場合はこのオプションを選んでくだ" +"さい" + +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "リポジトリをフォークする" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" -msgstr "ユーザーにリポジトリのフォークを許可する場合はこのオプションを選んでください" +msgstr "" +"ユーザーにリポジトリのフォークを許可する場合はこのオプションを選んでくださ" +"い" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "表示" @@ -4582,229 +4197,173 @@ msgid "No permissions defined yet" msgstr "まだ権限設定がありません" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "権限" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "権限を編集" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "権限が設定されていません" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:28 +msgid "Retry" +msgstr "" + +#: kallithea/templates/base/root.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." +msgstr "送信中..." + +#: kallithea/templates/base/root.html:30 +#, fuzzy +#| msgid "Enable downloads" +msgid "Unable to post" +msgstr "ダウンロードを有効にする" + +#: kallithea/templates/base/root.html:31 msgid "Add Another Comment" msgstr "別のコメントを追加" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:32 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:33 msgid "Start following this repository" msgstr "このリポジトリのフォローする" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:34 msgid "Group" msgstr "グループ" -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "メンバー" - -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:35 msgid "Loading ..." msgstr "読み込み中..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:36 msgid "loading ..." msgstr "読み込み中..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:37 msgid "Search truncated" msgstr "検索結果は省略されています" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:38 msgid "No matching files" msgstr "マッチするファイルはありません" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:39 msgid "Open New Pull Request from {0}" msgstr "新しいプルリクエストを{0}から作成" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:40 msgid "Open New Pull Request for {0} → {1}" msgstr "{0} → {1}から新しいプルリクエストを作成する" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:41 msgid "Show Selected Changesets {0} → {1}" msgstr "選択したチェンジセット{0} → {0}を表示" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:42 #, fuzzy msgid "Selection Link" msgstr "セレクション・リンク" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 msgid "Collapse Diff" msgstr "差分をたたむ" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:44 msgid "Expand Diff" msgstr "差分を表示" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "リビジョンなし" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 msgid "Failed to revoke permission" msgstr "権限の取消に失敗しました" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:48 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "権限 {0}: {1} を取り消してもよろしいですか？" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "有効" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "無効" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "リビジョンを選択" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "チェンジセットを指定" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "%s ブックマーク" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "ブックマークを比較" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "作成者" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "リビジョン" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "%s ブランチ" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "ブランチを比較" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "昇順で並び換え" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "降順で並び替え" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "レコードが見つかりません" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "データエラー" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "読み込み中..." + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "%s チェンジログ" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "%d / %d リビジョンを表示" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "選択を解除" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 msgid "Go to tip of repository" msgstr "リポジトリの最新のリビジョン(tip)に移動" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "%s とフォークを比較" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "フォーク元(%s)と比較" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "ブランチフィルタ:" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" -"チェンジセットステータス: %s\n" -"関連するプルリクエスト %s を開く" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "チェンジセットステータス: %s" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "コミットメッセージを展開" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "チェンジセットにコメントがあります" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "ブックマーク %s" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "タグ %s" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "ブランチ %s" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "まだ変更がありません" @@ -4820,7 +4379,7 @@ msgstr "変更" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "追加" @@ -4834,126 +4393,143 @@ msgstr "追加" msgid "Affected %s files" msgstr "%s ファイルに影響" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "コミットメッセージ" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "経過時間" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "Refs" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "Kallithea経由で直接ファイルを追加またはアップロード" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "新しいファイルを追加" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -msgid "Push new repository" -msgstr "新しいリポジトリをプッシュ" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" -msgstr "存在するリポジトリをプッシュ" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, fuzzy, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" +"チェンジセットステータス: %s\n" +"関連するプルリクエスト %s を開く" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, fuzzy, python-format +msgid "Changeset status: %s by %s" +msgstr "チェンジセットステータス: %s" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "コミットメッセージを展開" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%d comment" +#| msgid_plural "%d comments" +msgid "%s comments" +msgstr "%d 個のコメント" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "ブックマーク %s" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "タグ %s" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "ブランチ %s" #: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "%s チェンジセット" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "親リビジョン" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "子リビジョン" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "チェンジセットステータス" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "diffとして差分を表示" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "パッチとして差分を表示" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "差分をダウンロード" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 msgid "Merge" msgstr "マージ" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 #, fuzzy msgid "Grafted from:" msgstr "作成日" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 #, fuzzy msgid "Replaced by:" msgstr "作成日" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 #, fuzzy msgid "Preceded by:" msgstr "作成日" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s ファイルに影響" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s ファイルに影響。 %s 個の追加と %s 個の削除" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "とにかくすべての差分を表示" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -msgid "No revisions" -msgstr "リビジョンなし" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#, fuzzy +#| msgid "Comment" +msgid "comment" +msgstr "コメント" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy @@ -4973,169 +4549,177 @@ msgstr "チェンジセットはありません" msgid "Delete comment?" msgstr "コメントを削除しますか？" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 msgid "Status change" msgstr "ステータスを変更" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "{1} 行目にコメント" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "コメントには %s 構文 ( %s サポートつき ) が利用できます。" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "テキスト内で @username を使うと、そのユーザーに通知されます" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "コメントのプレビュー" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "送信中..." - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:87 +#, fuzzy +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "テキスト内で @username を使うと、そのユーザーに通知されます。" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "リビジョンステータスを設定" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "プルリクエストステータスの投票" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "変更なし" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "プルリクエスト #%s にコメント" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +#, fuzzy +msgid "Close" +msgstr "(閉鎖済み)" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "コメント" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "プレビュー" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "コメントにはログインする必要があります。" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "今すぐログインする" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "隠す" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d 個のコメント" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "%d inline" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "%d general" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "テキスト内で @username を使うと、そのユーザーに通知されます。" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "プルリクエストステータスの投票" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "リビジョンステータスを設定" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "変更なし" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -#, fuzzy -msgid "Close" -msgstr "(閉鎖済み)" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "%s チェンジセット" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "チェンジセットステータス: %s" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "影響のあるファイル" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "削除されたファイル" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "変更しない" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "削除" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "リネーム" + +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "%s は未知のリビジョンです" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "ファイル名がありません" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "追加されたファイル" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "このファイルのすべての差分を表示" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "このファイルの差分を並べて表示" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "インラインコメントを表示" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "削除" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "リネーム" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "チェンジセットはありません" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "祖先" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." msgstr "" -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:19 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "共通の祖先" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "マージの差分を表示" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "共通の祖先" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "共通の祖先が見つかりません - リポジトリ同士に関連がありません" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "is" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, python-format msgid "%s changesets" msgstr "%s チェンジセット" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "behind" @@ -5146,129 +4730,189 @@ msgid "%s Compare" msgstr "%s 比較" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "リビジョンを比較" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "入れ替え" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "リビジョン、ブランチ、ブックマークもしくはタグの比較を行います。" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "%s コミットを表示" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "すべての差分を表示" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "公開リポジトリ" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "リポジトリを作成しています..." -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "まだチェンジセットがありません" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "%s の RSS フィードを購読" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "%s の ATOM フィードを購読" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "作成中" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s がチェンジセットにコメント %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Comment from %s on %s changeset %s" +msgid "Comment on Changeset \"%s\"" msgstr "%sから%sのチェンジセット%sに対するコメント" -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "チェンジセットを次に変更" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "これは自動的に送信される通知です。このメールに返信しないでください。" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "変更の流れ" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "ブランチ" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "ステータスを変更" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "" +"このプルリクエストはすでにクローズされていて、更新することはできません。" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "こんにちは %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." msgstr "あなたのアカウントのパスワードリセットリクエストを受け取りました。" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "新しいパスワードを設定するために、次のリンクをクリックしてください" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." -msgstr "パスワードリセットのリクエストをしていない場合、このメッセージは無視してください。" - -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" +msgstr "" +"パスワードリセットのリクエストをしていない場合、このメッセージは無視してく" +"ださい。" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention on Pull Request %s \"%s\" by %s" msgstr "%sさんが%sへのプルリクエスト \"%s\"でメンションしました" -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s requested your review of %s pull request \"%s\"" +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" msgstr "%sさんが%sへのプルリクエスト \"%s\"でレビューを要求しています" +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Pull request %s" +msgid "Pull request" +msgstr "プルリクエスト #%s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" +msgstr "" + #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "%sから%sのプルリクエスト \"%s\"に対するコメント" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%sさんが%sへのプルリクエスト \"%s\"でメンションしました" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "%s からのプルリクエスト" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "プルリクエストに[コメント]" + +#: kallithea/templates/email_templates/registration.html:22 #, fuzzy -msgid "The comment closed the pull request with status" -msgstr "%s がプルリクエスト\"%s\" にコメントしました" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -#, fuzzy -msgid "The comment was made with status" -msgstr "プルリクエストを以下のステータスで閉じました：" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "このユーザを閲覧する" +#| msgid "Group name" +msgid "Full Name" +msgstr "グループ名" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5286,7 +4930,7 @@ msgid "%s File Diff" msgstr "%s ファイル差分" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "%s ファイル" @@ -5296,72 +4940,74 @@ msgstr "%s ファイル" msgid "%s Files Add" msgstr "%s ファイルを追加" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "新しいファイルを追加" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "場所" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "ファイル名..." -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "または" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "アップロードファイル" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "新しいファイルを作成" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "ファイルモード" +#, fuzzy +msgid "New file type" +msgstr "新しいファイル" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "コミットメッセージ" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 msgid "Commit Changes" msgstr "変更をコミット" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "前のリビジョン" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "次のリビジョン" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "このブランチで追跡" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "ファイル一覧を検索" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "ファイル一覧を読み込み中..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "サイズ" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "最後のリビジョン" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "最終更新日" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "最後の作成者" @@ -5371,7 +5017,7 @@ msgid "%s Files Delete" msgstr "%s のファイルを削除" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "ファイルを削除" @@ -5384,75 +5030,83 @@ msgstr "%s のファイルを編集" msgid "Edit file" msgstr "ファイルを編集" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "アノテーションを表示" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 msgid "Download as Raw" msgstr "Raw形式でダウンロード" -#: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "ソース" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "ファイルを編集" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s 人の作成者" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "このリビジョンとの差分" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "このリビジョンを表示" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "全ての履歴を表示" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "全ての履歴を表示" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "作成者を表示" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "ソースを表示" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Edit on Branch:%s" +msgid "Edit on Branch: %s" msgstr "ブランチ:%s で編集" -#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/files/files_source.html:37 msgid "Editing binary files not allowed" msgstr "バイナリファイルの編集は行えません" -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:40 msgid "Editing files allowed only when on branch head revision" msgstr "ファイル編集はブランチのヘッドリビジョンでのみ許可されています" -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/files/files_source.html:41 msgid "Deleting files allowed only when on branch head revision" msgstr "ファイルの削除はブランチのヘッドリビジョンでのみ行えます" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "バイナリファイル (%s)" +#: kallithea/templates/files/files_source.html:69 +#, fuzzy +msgid "File is too big to display." +msgstr "表示するには大きすぎるファイルです" + +#: kallithea/templates/files/files_source.html:71 +#, fuzzy +msgid "Show full annotation anyway." +msgstr "とにかくすべての差分を表示" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" -msgstr "表示するには大きすぎるファイルです" +#, fuzzy +msgid "Show as raw." +msgstr "Raw形式で表示" #: kallithea/templates/files/files_ypjax.html:5 msgid "annotation" @@ -5472,12 +5126,12 @@ msgid "%s Followers" msgstr "%s フォロワー" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "フォロワー" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "フォロー開始日 -" @@ -5486,35 +5140,37 @@ msgstr "フォロー開始日 -" msgid "Fork repository %s" msgstr "リポジトリ %s をフォーク" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "フォーク名" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." -msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します。" - -#: kallithea/templates/forks/fork.html:68 +msgstr "" +"ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定し" +"ます。" + +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "非公開" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "権限のコピー" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "フォーク元リポジトリから権限をコピーします" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "クローン後にupdateする" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "クローンした後にソースをチェックアウトします" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "このリポジトリをフォーク" @@ -5524,40 +5180,40 @@ msgid "%s Forks" msgstr "%s フォーク" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "フォーク" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "フォークしました" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "まだフォークがありません" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 msgid "ATOM journal feed" msgstr "ATOM ジャーナルフィード" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "RSS ジャーナルフィード" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "私のリポジトリ" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "まだエントリがありません" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "ATOM 公開ジャーナルフィード" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "RSS 公開ジャーナルフィード" @@ -5566,31 +5222,36 @@ msgstr "RSS 公開ジャーナルフィード" msgid "New Pull Request" msgstr "新しいプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "タイトル" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "このプルリクエストの簡潔な説明を書いてください" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "変更の流れ" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "元のリポジトリ" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "リビジョン" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "相手のリポジトリ" @@ -5602,6 +5263,10 @@ msgstr "まだエントリがありません" msgid "Vote" msgstr "投票" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "経過時間" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "From" @@ -5625,7 +5290,7 @@ msgstr "(no title)" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "クローズ" @@ -5640,7 +5305,9 @@ msgstr "このプルリクエストを削除してもよろしいですか？" #: kallithea/templates/pullrequests/pullrequest_data.html:70 #, python-format msgid "Confirm again to delete this pull request with %s comments" -msgstr "このプルリクエストには %s件のコメントがありますが削除してもよろしいですか？" +msgstr "" +"このプルリクエストには %s件のコメントがありますが削除してもよろしいです" +"か？" #: kallithea/templates/pullrequests/pullrequest_show.html:6 #, python-format @@ -5652,103 +5319,101 @@ msgstr "%s プルリクエスト %s" msgid "Pull request %s from %s#%s" msgstr "%s からのプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "変更の概要" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +#, fuzzy +#| msgid "Reviewer voting result" +msgid "Voting Result" msgstr "レビュアーの投票結果" -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "投票からプルリクエストのステータスを計算" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "未レビュー" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "%d 人のレビュアー" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "プルリクエストはすべてのレビュアーにレビューされました" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -msgid "There are no reviewers" -msgstr "レビュアーがいません" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "Origin" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "on" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "Target" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "変更を取得:" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "更新" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "新規登録" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "現在のリビジョン ｰ 変更なし" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "プルリクエストレビュアー" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "変更を保存" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "変更をキャンセル" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#, fuzzy +#| msgid "reviewer" +msgid "Reviewers" +msgstr "レビュアー" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 msgid "Remove reviewer" msgstr "レビュアーを削除" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "追加するレビュアーの名前を入力" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 msgid "Potential Reviewers" msgstr "レビュワー候補" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "クリックしてリポジトリの所有所をレビュアーに追加:" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "変更を保存" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "新しいプルリクエストとして保存" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" -msgstr "変更をキャンセル" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "プルリクエストの内容" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "共通の祖先" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5756,7 +5421,6 @@ msgstr "%s プルリクエスト" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull Requests from '%s'" msgstr "%s' からのプルリクエスト" @@ -5765,35 +5429,44 @@ msgstr "%s' からのプルリクエスト" msgid "Pull Requests to '%s'" msgstr "'%s' へのプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "新しいプルリクエストを作成" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "%s へのプルリクエストを表示" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "%s からのプルリクエストを表示" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" -msgstr "クローズしたプルリクエストを隠す（クローズしていないプルリクエストのみ表示する）" - -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +msgstr "" +"クローズしたプルリクエストを隠す（クローズしていないプルリクエストのみ表示" +"する）" + +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" -msgstr "クローズしたプルリクエストも表示(クローズしていないプルリクエストに加えて)" - -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +msgstr "" +"クローズしたプルリクエストも表示(クローズしていないプルリクエストに加えて)" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "作成したプルリクエスト" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "プルリクエストレビュアー" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "参加しているプルリクエスト" @@ -5807,29 +5480,29 @@ msgstr "%s 検索" msgid "Search in All Repositories" msgstr "全てのリポジトリから検索" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "検索キーワード" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "検索対象" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "ファイルの内容" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "コミットメッセージ" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "ファイル名" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "権限がありません" @@ -5839,80 +5512,80 @@ msgid "%s Statistics" msgstr "%s 統計情報" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM フィード" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "%s RSS フィード" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "有効にする" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "収集した統計情報: " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "ファイル" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "もっと表示" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "コミット" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "追加されたファイル" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "変更されたファイル" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "削除されたファイル" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "コミット" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "追加されたファイル" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "変更されたファイル" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "削除されたファイル" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "%s 要約" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "リポジトリは %s によってロックされました" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "リポジトリはロックされていません" @@ -5920,85 +5593,368 @@ msgstr "リポジトリはロックされていません" msgid "Fork of" msgstr "フォーク元" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "クローン元" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "クローンURL" - -#: kallithea/templates/summary/summary.html:78 -msgid "Show by Name" -msgstr "名前で表示" - -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:68 msgid "Show by ID" msgstr "IDで表示" -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:73 +msgid "Show by Name" +msgstr "名前で表示" + +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "トレンドファイル" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "ダウンロード" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "まだダウンロードがありません" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "ZIPでダウンロード" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "サブリポジトリを含める" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "リポジトリサイズ" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "フィード" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 msgid "Latest Changes" msgstr "最近の変更" +#: kallithea/templates/summary/summary.html:177 +msgid "Quick Start" +msgstr "クイックスタート" + #: kallithea/templates/summary/summary.html:188 -msgid "Quick Start" -msgstr "クイックスタート" - -#: kallithea/templates/summary/summary.html:202 +msgid "Add or upload files directly via Kallithea" +msgstr "Kallithea経由で直接ファイルを追加またはアップロード" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "新しいリポジトリをプッシュ" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "存在するリポジトリをプッシュ" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "リビジョン %s:%s の README ファイル" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "%s を %s でダウンロード" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s タグ" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "タグを比較" +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "" +#~ "検索するためのインデックスがありません。whooshでインデックスを作成して" +#~ "下さい" + +#~ msgid "IP %s not allowed" +#~ msgstr "IPアドレス %s は許可されません" + +#~ msgid "%(user)s commented on changeset %(age)s" +#~ msgstr "%(user)s がチェンジセットにコメント %(age)s" + +#~ msgid "%(user)s sent message %(age)s" +#~ msgstr "%(user)s がメッセージを送信 %(age)s" + +#~ msgid "%(user)s mentioned you %(age)s" +#~ msgstr "%(user)s がにあなたにメンション %(age)s" + +#~ msgid "%(user)s registered in Kallithea %(age)s" +#~ msgstr "%(user)s がKallitheaに登録 %(age)s" + +#~ msgid "%(user)s opened new pull request %(age)s" +#~ msgstr "%(user)s が新しいプルリクエストを作成 %(age)s" + +#~ msgid "%(user)s commented on pull request %(age)s" +#~ msgstr "%(user)s がプルリクエストにコメント %(age)s" + +#~ msgid "%(user)s commented on changeset at %(when)s" +#~ msgstr "%(user)s がチェンジセットにコメント %(when)s" + +#~ msgid "%(user)s sent message at %(when)s" +#~ msgstr "%(user)s がメッセージを送信 %(when)s" + +#~ msgid "%(user)s mentioned you at %(when)s" +#~ msgstr "%(user)s がにあなたにメンション %(when)s" + +#~ msgid "%(user)s registered in Kallithea at %(when)s" +#~ msgstr "%(user)s がKallitheaに登録 %(when)s" + +#~ msgid "%(user)s opened new pull request at %(when)s" +#~ msgstr "%(user)s が新しいプルリクエストを作成 %(when)s" + +#~ msgid "%(user)s commented on pull request at %(when)s" +#~ msgstr "%(user)s がプルリクエストにコメント %(when)s" + +#, fuzzy +#~| msgid "Repository group" +#~ msgid "Repository Group" +#~ msgstr "リポジトリグループ" + +#~ msgid "My Notifications" +#~ msgstr "通知" + +#~ msgid "All" +#~ msgstr "すべて" + +#~ msgid "Comments" +#~ msgstr "コメント" + +#~ msgid "Mark All Read" +#~ msgstr "すべて既読としてマーク" + +#, fuzzy +#~| msgid "Mark All Read" +#~ msgid "Mark as read" +#~ msgstr "すべて既読としてマーク" + +#~ msgid "No notifications here yet" +#~ msgstr "まだ通知がありません" + +#~ msgid "Show Notification" +#~ msgstr "通知を表示" + +#~ msgid "Notifications" +#~ msgstr "通知" + +#~ msgid "Home" +#~ msgstr "ホーム" + +#~ msgid "with" +#~ msgstr "と" + +#~ msgid "members" +#~ msgstr "メンバー" + +#~ msgid "Changeset has comments" +#~ msgstr "チェンジセットにコメントがあります" + +#~ msgid "Author" +#~ msgstr "作成者" + +#~ msgid "Refs" +#~ msgstr "Refs" + +#, fuzzy +#~ msgid "Commenting on line." +#~ msgstr "{1} 行目にコメント" + +#, fuzzy +#~| msgid "on pull request" +#~ msgid "Pull request from" +#~ msgstr "プルリクエスト #%s にコメント" + +#, fuzzy +#~| msgid "Date" +#~ msgid "at" +#~ msgstr "日時" + +#~ msgid "Previous revision" +#~ msgstr "前のリビジョン" + +#~ msgid "Next revision" +#~ msgstr "次のリビジョン" + +#~ msgid "Follow current branch" +#~ msgstr "このブランチで追跡" + +#~ msgid "Still not reviewed by" +#~ msgstr "未レビュー" + +#~ msgid "%d reviewer" +#~ msgid_plural "%d reviewers" +#~ msgstr[0] "%d 人のレビュアー" + +#~ msgid "Pull request was reviewed by all reviewers" +#~ msgstr "プルリクエストはすべてのレビュアーにレビューされました" + +#~ msgid "There are no reviewers" +#~ msgstr "レビュアーがいません" + +#~ msgid "Pull Request Reviewers" +#~ msgstr "プルリクエストレビュアー" + +#~ msgid "Dashboard" +#~ msgstr "ダッシュボード" + +#~ msgid "Group Name" +#~ msgstr "グループ名" + +#~ msgid "Remember me" +#~ msgstr "次回から自動的にサインイン" + +#~ msgid "name this file..." +#~ msgstr "ファイルに名前をつける..." + +#~ msgid "Change your avatar at" +#~ msgstr "アバターを変更できます : " + +#~ msgid "Using" +#~ msgstr "メールアドレス:" + +#~ msgid "Missing email, please update your user email address." +#~ msgstr "メールアドレスがありません。更新してください。" + +#~ msgid "%s Repository group dashboard" +#~ msgstr "%s リポジトリグループダッシュボード" + +#~ msgid "Rescan option" +#~ msgstr "再スキャンオプション" + +#~ msgid "Web" +#~ msgstr "Web" + +#~ msgid "Require SSL for vcs operations" +#~ msgstr "VCSの操作にSSLを必須とする" + +#~ msgid "" +#~ "Activate to require SSL both pushing and pulling. If SSL certificate " +#~ "is missing, it will return an HTTP Error 406: Not Acceptable." +#~ msgstr "" +#~ "プッシュ、プル時にSSLを要求します。SSLでない場合はHTTP Error 406: Not " +#~ "Acceptableを返します。" + +#~ msgid "Use Gravatars in Kallithea" +#~ msgstr "Gravatorsを利用する" + +#, fuzzy +#~| msgid "" +#~| "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +#~| "{repo}'.\n" +#~| "The following variables are available:\n" +#~| "{scheme} 'http' or 'https' sent from running Kallithea server,\n" +#~| "{user} current user username,\n" +#~| "{netloc} network location/server host of running Kallithea server,\n" +#~| "{repo} full repository name,\n" +#~| "{repoid} ID of repository, can be used to contruct clone-by-id" +#~ msgid "" +#~ "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +#~ "{repo}'.\n" +#~ " The following " +#~ "variables are available:\n" +#~ " {scheme} " +#~ "'http' or 'https' sent from running Kallithea server,\n" +#~ " {user} " +#~ "current user username,\n" +#~ " {netloc} " +#~ "network location/server host of running Kallithea server,\n" +#~ " {repo} full " +#~ "repository name,\n" +#~ " {repoid} ID of " +#~ "repository, can be used to construct clone-by-id" +#~ msgstr "" +#~ "クローン URL のスキーマは、 '{scheme}://{user}@{netloc}/{repo}' のよう" +#~ "な形式にします。使える変数は下記の通りです:\n" +#~ " {scheme} " +#~ "Kallithea サーバからリクエストを送信するときに使うスキーム。 'http' ま" +#~ "たは 'https'\n" +#~ " {user} 現在の" +#~ "ユーザーのユーザー名\n" +#~ " {netloc} " +#~ "Kallithea サーバーのアドレスまたはホスト名\n" +#~ " {repo} リポジ" +#~ "トリの完全な名前\n" +#~ " {repoid} リポジ" +#~ "トリの ID。 clone-by-id に使います。" + +#~ msgid "Dashboard items" +#~ msgstr "ダッシュボードの項目" + +#~ msgid "" +#~ "Number of items displayed in the main page dashboard before pagination " +#~ "is shown." +#~ msgstr "メインページダッシュボードで1ページに表示する要素数。" + +#~ msgid "Admin pages items" +#~ msgstr "管理ページの項目" + +#~ msgid "quick filter..." +#~ msgstr "クイックフィルタ..." + +#~ msgid "Change avatar at" +#~ msgstr "アバターを変更:" + +#~ msgid "Missing email, please update this user email address." +#~ msgstr "" +#~ "メールアドレスがありません。このユーザーのメールアドレスを更新してくだ" +#~ "さい。" + +#~ msgid "Keyboard shortcuts" +#~ msgstr "キーボードショートカット" + +#~ msgid "Site-wide shortcuts" +#~ msgstr "サイト全体" + +#~ msgid "Forgot password ?" +#~ msgstr "パスワードを忘れた?" + +#~ msgid "Ancestor" +#~ msgstr "祖先" + +#~ msgid "No common ancestor found - repositories are unrelated" +#~ msgstr "共通の祖先が見つかりません - リポジトリ同士に関連がありません" + +#~ msgid "Comment from %s on %s changeset %s" +#~ msgstr "%sから%sのチェンジセット%sに対するコメント" + +#~ msgid "The changeset status was changed to" +#~ msgstr "チェンジセットを次に変更" + +#~ msgid "This is an automatic notification. Don't reply to this mail." +#~ msgstr "" +#~ "これは自動的に送信される通知です。このメールに返信しないでください。" + +#~ msgid "%s mentioned you on %s pull request \"%s\"" +#~ msgstr "%sさんが%sへのプルリクエスト \"%s\"でメンションしました" + +#~ msgid "%s requested your review of %s pull request \"%s\"" +#~ msgstr "%sさんが%sへのプルリクエスト \"%s\"でレビューを要求しています" + +#~ msgid "Comment from %s on %s pull request \"%s\"" +#~ msgstr "%sから%sのプルリクエスト \"%s\"に対するコメント" + +#, fuzzy +#~ msgid "The comment closed the pull request with status" +#~ msgstr "%s がプルリクエスト\"%s\" にコメントしました" + +#, fuzzy +#~ msgid "The comment was made with status" +#~ msgstr "プルリクエストを以下のステータスで閉じました：" + +#~ msgid "View this user here" +#~ msgstr "このユーザを閲覧する" + +#~ msgid "Edit on Branch:%s" +#~ msgstr "ブランチ:%s で編集" + +#~ msgid "Repository Size" +#~ msgstr "リポジトリサイズ" #~ msgid "No comments." #~ msgstr "%d 個のコメント" @@ -6030,9 +5986,6 @@ msgstr "タグを比較" #~ msgid "No Files" #~ msgstr "ファイルなし" -#~ msgid "" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "ユーザー名 \"%(username)s\" は許可されていません" @@ -6045,11 +5998,17 @@ msgstr "タグを比較" #~ msgid "invalid clone URL" #~ msgstr "無効なクローンURIです" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "無効なクローンURIです。有効な http(s)/svn+http(s) のURIを指定してください" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "リビジョン %(revs)s はすでにプルリクエストの一部かステータスが設定されています" +#~ msgid "" +#~ "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +#~ msgstr "" +#~ "無効なクローンURIです。有効な http(s)/svn+http(s) のURIを指定してくださ" +#~ "い" + +#~ msgid "" +#~ "Revisions %(revs)s are already part of pull request or have set status" +#~ msgstr "" +#~ "リビジョン %(revs)s はすでにプルリクエストの一部かステータスが設定され" +#~ "ています" #~ msgid "Defaults" #~ msgstr "デフォルト設定" @@ -6165,9 +6124,6 @@ msgstr "タグを比較" #~ msgid "user groups" #~ msgstr "ユーザーグループ" -#~ msgid "show" -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "チェンジセットのステータスを変更" @@ -6186,21 +6142,9 @@ msgstr "タグを比較" #~ msgid "My Repos" #~ msgstr "リポジトリ" -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - #~ msgid "owner" #~ msgstr "所有者" -#~ msgid "reviewer" -#~ msgstr "レビュアー" - #~ msgid "Your new password" #~ msgstr "新しいパスワード" @@ -6222,3 +6166,172 @@ msgstr "タグを比較" #~ msgid "Created by" #~ msgstr "作成日" +#~ msgid "Confirm to invalidate repository cache." +#~ msgstr "リポジトリのキャッシュを無効化してもよろしいですか？" + +#~ msgid "Comments parsed using %s syntax with %s support." +#~ msgstr "コメントには %s 構文 ( %s サポートつき ) が利用できます。" + +#~ msgid "Use @username inside this text to notify another user" +#~ msgstr "テキスト内で @username を使うと、そのユーザーに通知されます" + +#~ msgid "Comment preview" +#~ msgstr "コメントのプレビュー" + +#~ msgid "Preview" +#~ msgstr "プレビュー" + +#~ msgid "New file mode" +#~ msgstr "ファイルモード" + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "%s で置き換えられたのでクローズします。" + +#~ msgid "Closing." +#~ msgstr "クローズ。" + +#~ msgid "Repository no access" +#~ msgstr "リポジトリへのアクセス権限無し" + +#~ msgid "Repository read access" +#~ msgstr "リポジトリに読込権限でアクセス" + +#~ msgid "Repository write access" +#~ msgstr "リポジトリに書込権限でアクセス" + +#~ msgid "Repository admin access" +#~ msgstr "リポジトリに管理権限でアクセス" + +#~ msgid "Repository Group no access" +#~ msgstr "リポジトリグループへのアクセス権限なし" + +#~ msgid "Repository Group read access" +#~ msgstr "リポジトリグループに読込権限でアクセス" + +#~ msgid "Repository Group write access" +#~ msgstr "リポジトリグループに書込権限でアクセス" + +#~ msgid "Repository Group admin access" +#~ msgstr "リポジトリグループに管理権限でアクセス" + +#~ msgid "Repository creation disabled" +#~ msgstr "リポジトリの作成を有効にする" + +#~ msgid "Repository creation enabled" +#~ msgstr "リポジトリの作成を有効にする" + +#~ msgid "Repository forking disabled" +#~ msgstr "リポジトリのフォークを無効にする" + +#~ msgid "Repository forking enabled" +#~ msgstr "リポジトリのフォークを有効にする" + +#~ msgid "Register disabled" +#~ msgstr "新規登録を無効にする" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Kallitheaに登録した新しいユーザーを手動でアクティベートする" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "Kallitheaに登録した新しいユーザーを自動でアクティベートする" + +#~ msgid "Not Reviewed" +#~ msgstr "未レビュー" + +#~ msgid "Rejected" +#~ msgstr "却下" + +#~ msgid "Under Review" +#~ msgstr "レビュー中" + +#~ msgid "Repository group no access" +#~ msgstr "リポジトリグループへのアクセス権限なし" + +#~ msgid "Repository group read access" +#~ msgstr "リポジトリグループに読込権限でアクセス" + +#~ msgid "Repository group write access" +#~ msgstr "リポジトリグループに書込権限でアクセス" + +#~ msgid "Repository group admin access" +#~ msgstr "リポジトリグループに管理権限でアクセス" + +#~ msgid "User group no access" +#~ msgstr "ユーザーグループへのアクセス権限なし" + +#~ msgid "User group read access" +#~ msgstr "ユーザーグループに読込権限でアクセス" + +#~ msgid "User group write access" +#~ msgstr "ユーザーグループに書込権限でアクセス" + +#~ msgid "User group admin access" +#~ msgstr "ユーザーグループに管理権限でアクセス" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "リポジトリグループの作成を無効にする" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "リポジトリグループの作成を有効にする" + +#~ msgid "User Group creation disabled" +#~ msgstr "ユーザーグループの作成を無効にする" + +#~ msgid "User Group creation enabled" +#~ msgstr "ユーザーグループの作成を有効にする" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "ユーザーの新規登録時に手動でアカウントをアクティベートする" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "ユーザーの新規登録時に自動でアカウントをアクティベートする" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "%(user)s がプリリクエスト #%(pr_id)s: %(pr_title)s のレビューを求めてい" +#~ "ます" + +#~ msgid "repositories" +#~ msgstr "リポジトリ" + +#~ msgid "No repositories found." +#~ msgstr "リポジトリが見つかりません。" + +#~ msgid "There are no branches yet" +#~ msgstr "まだブランチがありません" + +#~ msgid "There are no tags yet" +#~ msgstr "まだタグがありません" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "まだブックマークがありません" + +#~ msgid "enabled" +#~ msgstr "有効" + +#~ msgid "%s Bookmarks" +#~ msgstr "%s ブックマーク" + +#~ msgid "Compare Bookmarks" +#~ msgstr "ブックマークを比較" + +#~ msgid "%s Branches" +#~ msgstr "%s ブランチ" + +#~ msgid "Compare Branches" +#~ msgstr "ブランチを比較" + +#~ msgid "Editing file" +#~ msgstr "ファイルを編集" + +#~ msgid "Update" +#~ msgstr "更新" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "新しいプルリクエストとして保存" + +#~ msgid "%s Tags" +#~ msgstr "%s タグ" + +#~ msgid "Compare Tags" +#~ msgstr "タグを比較" diff --git a/kallithea/i18n/kallithea.pot b/kallithea/i18n/kallithea.pot --- a/kallithea/i18n/kallithea.pot +++ b/kallithea/i18n/kallithea.pot @@ -1,451 +1,464 @@ # Translations template for Kallithea. -# Copyright (C) 2017 Various authors, licensing as GPLv3 +# Copyright (C) 2019 Various authors, licensing as GPLv3 # This file is distributed under the same license as the Kallithea project. -# FIRST AUTHOR , 2017. +# FIRST AUTHOR , 2019. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Kallithea 0.3.2\n" +"Project-Id-Version: Kallithea 0.4.0rc1\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +"Generated-By: Babel 2.5.3\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +msgid "No permission to change status" +msgstr "" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:383 -msgid "Changing status on a changeset associated with a closed pull request is not allowed" -msgstr "" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, python-format +msgid "Could not find other repository %s" +msgstr "" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "" + #: kallithea/controllers/error.py:71 -msgid "No response" -msgstr "" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 +#: kallithea/controllers/error.py:84 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#, python-format +msgid "%s %s feed" +msgstr "" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 #, python-format msgid "Changes on %s repository" msgstr "" -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:91 -msgid "Click here to add new file" -msgstr "" - #: kallithea/controllers/files.py:92 +msgid "Click here to add new file" +msgstr "" + +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:317 +#: kallithea/controllers/files.py:312 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:328 +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:184 +#: kallithea/model/scm.py:706 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 kallithea/controllers/pullrequests.py:185 +#: kallithea/model/scm.py:717 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "" - -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "This pull request is based on another %s revision and there is no simple diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:514 +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:375 +msgid "New pull request iteration created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:432 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 +#, python-format +msgid "Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "" #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "" @@ -457,149 +470,151 @@ msgstr "" msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "" +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "" + #: kallithea/controllers/admin/gists.py:233 -msgid "Unmodified" -msgstr "" - -#: kallithea/controllers/admin/gists.py:262 -msgid "Successfully updated gist content" -msgstr "" - -#: kallithea/controllers/admin/gists.py:267 -msgid "Successfully updated gist data" -msgstr "" - -#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "" +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "" + #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -607,1755 +622,1230 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "" +#: kallithea/controllers/admin/repos.py:446 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:450 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:466 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:468 +#, python-format +msgid "Marked repository %s as fork of %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:475 +msgid "An error occurred during this operation" +msgstr "" + #: kallithea/controllers/admin/repos.py:491 -msgid "Updated repository visibility in public journal" -msgstr "" - -#: kallithea/controllers/admin/repos.py:495 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:512 -msgid "Nothing" -msgstr "" - -#: kallithea/controllers/admin/repos.py:514 -#, python-format -msgid "Marked repository %s as fork of %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:521 -msgid "An error occurred during this operation" -msgstr "" - -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 msgid "Repository has been locked" msgstr "" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" +msgstr "" + #: kallithea/controllers/admin/settings.py:174 -msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" -msgstr "" - -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 -msgid "Error occurred while updating application settings" -msgstr "" - -#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +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 "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "" - -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:785 +#: kallithea/lib/base.py:495 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 +#: kallithea/lib/diffs.py:213 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 -#, python-format -msgid "Deleted branch: %s" -msgstr "" - #: kallithea/lib/helpers.py:612 #, python-format +msgid "Deleted branch: %s" +msgstr "" + +#: kallithea/lib/helpers.py:614 +#, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" msgstr "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2266 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, python-format +msgid "[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on %(branch)s" +msgstr "" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:309 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from %(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from %(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "Cannot create pull request - criss cross merge detected, please merge a later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "This iteration is based on another %s revision and there is no simple diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "User \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "User \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups: %s" msgstr "" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "User \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "The password to your account %s has been changed using password reset form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with an alphanumeric character or underscore" msgstr "" -#: kallithea/model/validators.py:126 +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:133 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:152 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 msgid "Invalid username or password" msgstr "" +#: kallithea/model/validators.py:312 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:330 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + #: kallithea/model/validators.py:331 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:345 -#, python-format -msgid "Repository name %(repo)s is not allowed" -msgstr "" - -#: kallithea/model/validators.py:347 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - -#: kallithea/model/validators.py:348 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "Invalid repository URL. It must be a valid http, https, ssh, svn+http or svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:775 +#: kallithea/model/validators.py:732 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 -msgid "Add Repository Group" -msgstr "" - +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 #: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "" @@ -2363,142 +1853,125 @@ msgstr "" msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" msgstr "" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 -msgid "Send Password Reset Email" -msgstr "" - #: kallithea/templates/password_reset.html:47 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 msgid "A password reset link will be sent to the specified email address if it is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "Note that you must use the same browser session for this as the one used to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2506,30 +1979,16 @@ msgstr[0] "" msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2537,7 +1996,7 @@ msgstr "" msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "" @@ -2546,104 +2005,104 @@ msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "Comma-separated list of plugins; Kallithea will try user authentication in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 +msgid "Private repositories are only visible to people explicitly added as collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "Private repositories are only visible to people explicitly added as collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2652,43 +2111,43 @@ msgstr "" msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 msgid "Never" msgstr "" @@ -2697,7 +2156,8 @@ msgid "Update Gist" msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "" @@ -2720,16 +2180,16 @@ msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "" @@ -2738,45 +2198,45 @@ msgstr "" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "" @@ -2786,182 +2246,197 @@ msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 msgid "Owned Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "" @@ -2969,105 +2444,67 @@ msgstr "" msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" msgstr "" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "" @@ -3081,151 +2518,155 @@ msgstr "" msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:20 msgid "Apply to all existing repositories" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:33 +msgid "Apply to all existing repository groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +msgid "Permissions for the Default user on new repository groups." +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:40 -msgid "Apply to all existing repository groups" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:41 -msgid "Permissions for the Default user on new repository groups." +#: kallithea/templates/data_table/_dt_elements.html:141 +msgid "User group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 -msgid "User group" +msgid "Apply to all existing user groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +msgid "Permissions for the Default user on new user groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:53 -msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:54 -msgid "Apply to all existing user groups" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Top level repository creation" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 +msgid "Note: This will also give all users API access to create repositories everywhere. That might change in future versions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:61 +msgid "Repository creation with group write access" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "Note: This will also give all users API access to create repositories everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 -msgid "Repository creation with group write access" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:75 +msgid "Repository forking" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:78 +msgid "Enable this to allow non-admins to fork repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 +msgid "Registration" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:88 -msgid "Repository forking" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:92 -msgid "Enable this to allow non-admins to fork repositories." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:97 -msgid "Registration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:105 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" @@ -3234,30 +2675,28 @@ msgstr "" msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:152 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "" @@ -3282,12 +2721,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3298,16 +2737,32 @@ msgstr[1] "" msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +msgid "Add repos" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3315,95 +2770,87 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "Set or revoke permission to all children of that group, including non-private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" +msgid "Repository group %s" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "Default revision for files page, downloads, full text search index and readme generation" msgstr "" @@ -3430,22 +2877,22 @@ msgstr "" msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "" @@ -3454,90 +2901,88 @@ msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "All actions done in this repository will be visible to everyone in the public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it." msgstr "" @@ -3545,134 +2990,139 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "Manually invalidate cache for this repository. On first access, the repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +msgid "Fork of repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the repository URL changes.\n" " Using the above permanent URL guarantees that this repository always will be accessible on that URL.\n" " This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "Optional: URL of a remote repository. If set, the repository can be pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3688,7 +3138,7 @@ msgstr "" msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3709,7 +3159,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "" @@ -3721,81 +3171,81 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 -msgid "HTML with JavaScript for web analytics systems like Google Analytics or Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +msgid "HTML (possibly with JavaScript and/or CSS) that will be added to the bottom of every page. This can be used for web analytics systems, but also to perform instance-specific customizations like adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 -msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications." -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:17 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:18 +msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications." +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "Check this option to remove all comments, pull requests and other records related to repositories that no longer exist in the filesystem." msgstr "" @@ -3803,159 +3253,147 @@ msgstr "" msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 msgid "This option completely reindexeses all of the repositories for proper fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial." msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:59 +msgid "Location of repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Location of repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "Click to unlock. You must restart Kallithea in order to make this setting take effect." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "" @@ -3963,11 +3401,11 @@ msgstr "" msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following variables of the URL will be replaced accordingly.\n" @@ -3978,79 +3416,84 @@ msgid "" " {netloc} network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" -" The following variables are available:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 -msgid "Number of items displayed in the main page dashboard before pagination is shown." +" The following variables are available:\n" +" {scheme} 'http' or 'https' sent from running Kallithea server,\n" +" {user} current user username,\n" +" {netloc} network location/server host of running Kallithea server,\n" +" {repo} full repository name,\n" +" {repoid} ID of repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +msgid "Repository page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +msgid "Number of items displayed in the repository pages before pagination is shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "Number of items displayed in the admin pages grids before pagination is shown." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:70 +msgid "Icons" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:75 -msgid "Icons" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 +#: kallithea/templates/admin/settings/settings_visual.html:94 +msgid "Parses meta tags from the repository description field and turns them into colored tags." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:98 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:111 -msgid "Parses meta tags from the repository description field and turns them into colored tags." -msgstr "" - #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4069,13 +3512,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4084,15 +3527,15 @@ msgstr "" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" @@ -4106,17 +3549,17 @@ msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "" @@ -4135,12 +3578,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4149,7 +3592,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4158,24 +3601,16 @@ msgstr "" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "" @@ -4183,220 +3618,214 @@ msgstr "" msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "" - #: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 +#: kallithea/templates/base/base.html:178 kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "" -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "Select to inherit global settings, IP whitelist and permissions from the %s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "" @@ -4405,227 +3834,171 @@ msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "" - -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "" - -#: kallithea/templates/base/root.html:27 -msgid "Loading ..." -msgstr "" - #: kallithea/templates/base/root.html:28 -msgid "loading ..." +msgid "Retry" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +msgid "Unable to post" msgstr "" #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "" @@ -4641,7 +4014,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "" @@ -4655,38 +4028,59 @@ msgstr "" msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -msgid "Push new repository" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, python-format +msgid "%s comments" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" msgstr "" #: kallithea/templates/changeset/changeset.html:8 @@ -4694,85 +4088,75 @@ msgstr "" msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 msgid "Merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -msgid "No revisions" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +msgid "comment" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:21 @@ -4791,171 +4175,164 @@ msgstr "" msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 msgid "Status change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +msgid "Finish pull request" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, python-format +msgid "Unknown operation: %r" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "Please merge the target branch to your branch before creating a pull request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "" @@ -4966,123 +4343,161 @@ msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +msgid "Changeset on" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +msgid "branch" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +msgid "Status change:" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:33 +msgid "The pull request has been closed." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "This account is however managed outside this system and the password cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "Should you not be able to use the link above, please type the following code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "If it weren't you who requested the password reset, just disregard this message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +msgid "Pull request" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5101,7 +4516,7 @@ msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "" @@ -5111,72 +4526,73 @@ msgstr "" msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" +msgid "New file type" msgstr "" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "" @@ -5186,7 +4602,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5199,24 +4615,20 @@ msgstr "" msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5224,50 +4636,58 @@ msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "" +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" +msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 @@ -5288,12 +4708,12 @@ msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "" @@ -5302,35 +4722,35 @@ msgstr "" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5340,40 +4760,40 @@ msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "" @@ -5382,31 +4802,36 @@ msgstr "" msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "" @@ -5418,6 +4843,10 @@ msgstr "" msgid "Vote" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5441,7 +4870,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "" @@ -5468,102 +4897,91 @@ msgstr "" msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -msgid "There are no reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "This is just a range of changesets and doesn't have a target or a real merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "Pull request iterations do not change content once created. Select a revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5579,35 +4997,39 @@ msgstr "" msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" @@ -5621,29 +5043,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "" @@ -5653,80 +5075,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "" @@ -5734,83 +5156,78 @@ msgstr "" msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 msgid "Latest Changes" msgstr "" +#: kallithea/templates/summary/summary.html:177 +msgid "Quick Start" +msgstr "" + #: kallithea/templates/summary/summary.html:188 -msgid "Quick Start" -msgstr "" - -#: kallithea/templates/summary/summary.html:202 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" - diff --git a/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po b/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/nb_NO/LC_MESSAGES/kallithea.po @@ -5,263 +5,291 @@ # msgid "" msgstr "" -"Project-Id-Version: Kallithea 0.3.2\n" +"Project-Id-Version: Kallithea 0.3.99\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" -"PO-Revision-Date: 2018-02-05 15:38+0000\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Norwegian Bokmål " -"\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 \n" +"Language-Team: Norwegian Bokmål \n" "Language: nb_NO\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 2.19-dev\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +"X-Generator: Weblate 3.5.1\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "Ingen endringssett enda" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Ingen" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(lukket)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "Vis blanktegn" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorer blanktegn" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Øk diff-bindeleddsinformasjon til %(num)s linjer" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +#, fuzzy +#| msgid "No permission to change pull request status" +msgid "No permission to change status" +msgstr "Ingen tilgang til endring av innsendingsforespørselsstatus" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 msgid "Such revision does not exist for this repository" msgstr "En slik revisjon funnes ikke for denne pakkebrønnen" -#: kallithea/controllers/changeset.py:383 -msgid "Changing status on a changeset associated with a closed pull request is not allowed" -msgstr "" -"Endring av status for et endringssett tilknyttet en lukket " -"innhentingsforespørsel tillates ikke" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Velg endringssett" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, python-format +msgid "Could not find other repository %s" +msgstr "Fant ikke annen pakkebrønn %s" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "Kan ikke sammenligne pakkebrønner av forskjellige typer" + +#: kallithea/controllers/compare.py:244 +#, fuzzy +msgid "Cannot show empty diff" +msgstr "Kan ikke vise tom diff" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "Kan ikke sammenligne pakkebrønner uten bruk av felles opphav" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "Ingen respons" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "Ukjent feil" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" -"Forespørselen kunne ikke forstås av tjeneren som følge av feilaktig syntaks." - -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" +"Forespørselen kunne ikke forstås av tjeneren som følge av feilaktig " +"syntaks." + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Uautorisert tilgang til ressurs" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Du har ikke tilgang til å se denne siden" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Kunne ikke finne ressursen" -#: kallithea/controllers/error.py:109 -msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." +#: kallithea/controllers/error.py:93 +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." msgstr "" "Tjeneren støtte på en uventet tilstand som forhindret utøvelse av " "forespørsel." -#: kallithea/controllers/feed.py:55 -#, fuzzy, python-format -msgid "Changes on %s repository" -msgstr "Endringer i %s-pakkebrønn" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "%s sendte inn %s" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "Endringsettet var for stort og har blitt avskåret…" + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 #, fuzzy, python-format msgid "%s %s feed" msgstr "%s %s kilde" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "Endringsettet var for stort og har blitt avskåret…" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s sendte inn %s" - -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, fuzzy, python-format +msgid "Changes on %s repository" +msgstr "Endringer i %s-pakkebrønn" + +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Klikk her for å legge til ny fil" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "Ingen filer enda. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, fuzzy, python-format msgid "%s at %s" msgstr "%s den %s" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, 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:317 +#: kallithea/controllers/files.py:312 #, 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:328 +msgstr "" +"Du kan bare slette filer med en revisjon som er en gyldig forgrening" + +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Slettet filen %s via Kallithea" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "Filen %s ble slettet" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "Feil inntraff under innsendelse" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 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:391 +msgstr "" +"Du kan bare redigere filer med en revisjon som er en gyldig avgrening" + +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "Filen %s ble endret via Kallithea" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "Ingen endringer" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "Innsendt til %s" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "Fil lagt til via Kallithea" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "Inget innhold" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "Inget filnavn" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 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:526 +msgstr "" +"Plasseringen må være en relativ sti, og kan ikke inneholde .. i stien" + +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "Nedlastinger avskrudd" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "Ukjent revisjon %s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "Tom pakkebrønn" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "Ukjent arkivtype" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Endringssett" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Forgreninger" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Etiketter" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "En uventet feil inntraff under forgrening av pakkebrønnen %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "Grupper" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Pakkebrønner" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 @@ -269,200 +297,191 @@ msgstr "Pakkebrønner" msgid "Branch" msgstr "Forgrening" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Lukkede forgreninger" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "Etikett" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "Bokmerke" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Offentlig loggbok" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Loggbok" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 #, fuzzy msgid "Bad captcha" msgstr "Feilaktig CAPTCHA" -#: kallithea/controllers/login.py:152 -#, fuzzy -msgid "You have successfully registered into Kallithea" -msgstr "Du har registrert deg på Kallithea" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, fuzzy, python-format +msgid "You have successfully registered with %s" +msgstr "Du har registrer deg på %s" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" msgstr "Passordbekreftelseskode sendt" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" msgstr "Ugyldig passordtilbakestillingssymbol" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "Passord oppdatert" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:71 +#, fuzzy, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "Ugyldig analytiker \"%s\" angitt" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" msgstr "%s (lukket)" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Endringssett" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 #, fuzzy msgid "Special" msgstr "Spesiell" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "Likemennsforgreninger" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "Bokmerker" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "Feil ved opprettelse av ny innsendelsesforespørsel: %s" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "Ingen beskrivelse" - -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "Åpnet en ny innsendelsesforespørsel" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, fuzzy, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "Ugyldig analytiker \"%s\" angitt" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 msgid "Error occurred while creating pull request" msgstr "Feil inntraff under opprettelse av innsendelsesforespørsel" -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "Manglende endringssett siden forrige innsendingsforespørsel:" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Nye endringssett på %s %s siden forrige innsendingsforespørsel:" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "Opphav endret seg ikke - vis diff siden forrige versjon:" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "This pull request is based on another %s revision and there is no simple diff." -msgstr "" -"Denne innsendingsforespørselen er basert på en annen %s-revisjon, og det " -"finnes ingen enkel diff." - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Ingen endringer funnet på %s %s siden forrige versjon." - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Lukket, erstattet av %s." - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "Innsendingsforespørsel opprettet" - -#: kallithea/controllers/pullrequests.py:514 +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "Åpnet en ny innsendelsesforespørsel" + +#: kallithea/controllers/pullrequests.py:375 +msgid "New pull request iteration created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Ingen beskrivelse" + +#: kallithea/controllers/pullrequests.py:432 msgid "Pull request updated" msgstr "Innsendingsforespørsel oppdatert" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "Slettet innsendingsforespørsel" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." msgstr "Denne innsendingsforespørselen har allerede blitt flettet inn i %s." -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" "Denne innsendingsforespørselen har blitt lukket, og kan ikke oppdateres." -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "Denne innsendingsforespørselen kan ikke oppdateres med endringer på %s:" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" -"Ingen endringssett funnet for oppdatering av denne innsendingsforespørselen." - -#: kallithea/controllers/pullrequests.py:627 +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Merk: Forgreningen %s har et annet hode: %s." -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "Git-innsendingsforespørsler støtter ikke oppdateringer enda." - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "Ingen tilgang til endring av innsendingsforespørselsstatus" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "Lukker." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 +#, python-format +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "Ugyldig søkespørring. Prøv å sette den i sistattegn." #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Det er ingen indeks å søke i. Kjør en annen whoosh-indekserer" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "Tjeneren har ingen søkeindeks." + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Feil inntraff under søkeoperasjon." -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "Ingen data klar enda" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "Statistikk er avskrudd for denne pakkebrønnen" @@ -474,152 +493,155 @@ msgstr "Autentiseringsinnstillinger oppd msgid "error occurred during update of auth settings" msgstr "feil inntraff under oppdatering av autentiseringsinnstillinger" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Forvalgte innstillinger oppdatert" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Feil inntraff under oppdatering av forvalg" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "For alltid" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" -msgstr "For alltid" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "Fem minutter" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "Fem minutter" - -#: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 msgid "1 hour" msgstr "Én time" -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/gists.py:61 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "Én dag" -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "Én måned" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Livstid" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "Feil inntraff under gist-opprettelse" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "Slettet gist-en %s" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:196 msgid "Unmodified" msgstr "Uendret" -#: kallithea/controllers/admin/gists.py:262 +#: kallithea/controllers/admin/gists.py:225 msgid "Successfully updated gist content" msgstr "Oppdaterte gist-innhold" -#: kallithea/controllers/admin/gists.py:267 +#: kallithea/controllers/admin/gists.py:230 msgid "Successfully updated gist data" msgstr "Oppdaterte gist-data" -#: kallithea/controllers/admin/gists.py:270 +#: kallithea/controllers/admin/gists.py:233 #, fuzzy, python-format msgid "Error occurred during update of gist %s" msgstr "Feil inntraff under oppdatering av gist-en %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -"Du kan ikke endre denne brukeren siden den er avgjørende for hele programmet" - -#: kallithea/controllers/admin/my_account.py:129 +"Du kan ikke endre denne brukeren siden den er avgjørende for hele " +"programmet" + +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "Kontoen din ble oppdatert" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, fuzzy, python-format msgid "Error occurred during update of user %s" msgstr "Feil inntraff under oppdatering av brukeren %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "Feil inntraff under oppdatering av brukerpassord" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, fuzzy, python-format msgid "Added email %s to user" msgstr "La til e-postadressen %s for bruker" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 #, fuzzy msgid "An error occurred during email saving" msgstr "Feil inntraff under lagring av e-postadresse" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 #, fuzzy msgid "Removed email from user" msgstr "Fjernet e-postadresse fra bruker" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "API-nøkkel opprettet" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "API-nøkkel tilbakestilt" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API-nøkkel slettet" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "LEs" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Skriv" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -627,1902 +649,1411 @@ msgstr "Skriv" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Admin" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Avskrudd" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Tillatt med manuell kontoaktivering" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Tillatt med automatisk kontoaktivering" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "Manuell aktivering av ekstern konto" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "Automatisk aktivering av ekstern konto" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "Avskrudd" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Tillatt med manuell kontoaktivering" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Tillatt med automatisk kontoaktivering" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "Manuell aktivering av ekstern konto" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "Automatisk aktivering av ekstern konto" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Påskrudd" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 #, fuzzy msgid "Global permissions updated successfully" msgstr "Globale tilganger oppdatert" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Feil inntraff under oppdatering av tilganger" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Feil inntraff under opprettelse av pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "Opprettet pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "Oppdaterte pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Feil inntraff under oppdatering av pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Denne gruppen inneholder %s pakkebrønner og kan ikke slettes" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Denne grunnen inneholder %s undergrupper og kan ikke slettes" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Fjernet pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Feil inntraff under sletting av pakkebrønnsgruppen %s" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 #, fuzzy msgid "Cannot revoke permission for yourself as admin" msgstr "Kan ikke tilbakekalle egen administratortilgang" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Pakkebrønnsgruppetilganger oppdatert" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "En feil inntraff under tilbakekalling av tilgang" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "Feil under opprettelse av pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Opprettet pakkebrønnen %s fra %s" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Forgrenet pakkebrønnen %s som %s" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Opprettet pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Pakkebrønnen %s ble oppdatert" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Feil under oppdatering av pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "Avhektet %s forgreninger" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "Slettet %s forgreninger" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Slettet pakkebrønnen %s" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Kan ikke slette pakkebrønne %s, som fremdeles har forgreninger" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "En feil inntraff under sletting av %s" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Pakkebrønnstilganger oppdatert" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "Feil inntraff under opprettelse av felt" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "Feil inntraff under fjerning av felt" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "-- Ikke en forgrening --" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:446 msgid "Updated repository visibility in public journal" msgstr "Oppdaterte pakkebrønnssynlighet i offentlig loggbok" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:450 #, fuzzy msgid "An error occurred during setting this repository in public journal" msgstr "" -"En feil inntraff under innlemmelse av denne pakkebrønnen i offentlig loggbok" - -#: kallithea/controllers/admin/repos.py:512 +"En feil inntraff under innlemmelse av denne pakkebrønnen i offentlig " +"loggbok" + +#: kallithea/controllers/admin/repos.py:466 msgid "Nothing" msgstr "Ingenting" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:468 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Markerte pakkebrønnen %s som en forgrening av %s" -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:475 msgid "An error occurred during this operation" msgstr "En feil inntraff under denne operasjonen" -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 msgid "Repository has been locked" msgstr "Pakkebrønnen har blitt låst" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" msgstr "Pakkebrønnen har blitt låst opp" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "En feil inntraff under opplåsning" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" +msgstr "Oppdaterte VCS-innstillinger" + +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" msgstr "" #: kallithea/controllers/admin/settings.py:174 -msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" -msgstr "" - -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 -msgid "Error occurred while updating application settings" -msgstr "" - -#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" -msgstr "" - -#: kallithea/controllers/admin/settings.py:383 +msgstr "Skriv inn e-postadresse" + +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +#, fuzzy +#| msgid "No data ready yet" +msgid "Hook already exists" +msgstr "Ingen data klar enda" + +#: 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 "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:163 +msgstr "Opprettet brukergruppe %s" + +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:224 +msgstr "Oppdaterte brukergruppe %s" + +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 +#, fuzzy msgid "Successfully deleted user group" -msgstr "" - -#: kallithea/controllers/admin/user_groups.py:247 +msgstr "Brukergruppe slettet" + +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "" - -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" - -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 -#, python-format -msgid "Deleted branch: %s" -msgstr "" - #: kallithea/lib/helpers.py:612 #, python-format +msgid "Deleted branch: %s" +msgstr "" + +#: kallithea/lib/helpers.py:614 +#, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1445 -#, python-format -msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" -msgstr "" - -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/helpers.py:1264 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" + +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2266 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:309 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" -msgstr "" - -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "" - -#: kallithea/model/scm.py:812 +msgstr "Lukker" + +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" + +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 -msgid "You can't remove this user since it is crucial for the entire application" -msgstr "" - -#: kallithea/model/user.py:261 -#, python-format -msgid "User \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories: %s" -msgstr "" - -#: kallithea/model/user.py:266 -#, python-format -msgid "User \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups: %s" -msgstr "" - -#: kallithea/model/user.py:273 -#, python-format -msgid "User \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups: %s" -msgstr "" - -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" + +#: kallithea/model/user.py:258 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:263 +#, python-format +msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 +#, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 -#, python-format -msgid "The password to your account %s has been changed using password reset form." -msgstr "" - -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/user.py:414 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" + +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:97 +msgstr "Brukernavnet \"%(username)s\" finnes allerede" + +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" -msgstr "" - -#: kallithea/model/validators.py:99 -msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:126 +msgstr "Brukernavnet \"%(username)s\" kan ikke brukes" + +#: kallithea/model/validators.py:78 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:133 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:152 msgid "Invalid user group name" -msgstr "" - -#: kallithea/model/validators.py:153 +msgstr "Ugyldig brukergruppenavn" + +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" -msgstr "" - -#: kallithea/model/validators.py:155 -msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" -msgstr "" - -#: kallithea/model/validators.py:193 +msgstr "Brukergruppen \"%(usergroup)s\" finnes allerede" + +#: kallithea/model/validators.py:136 +msgid "" +"user group name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "" + +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" -msgstr "" - -#: kallithea/model/validators.py:285 +msgstr "Ugyldig gammelt passord" + +#: kallithea/model/validators.py:266 msgid "Passwords do not match" -msgstr "" - -#: kallithea/model/validators.py:300 +msgstr "Passordene samsvarer ikke" + +#: kallithea/model/validators.py:281 msgid "Invalid username or password" +msgstr "Ugyldig brukernavn eller passord" + +#: kallithea/model/validators.py:312 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:330 +#, python-format +msgid "Repository named %(repo)s already exists" msgstr "" #: kallithea/model/validators.py:331 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:345 -#, python-format -msgid "Repository name %(repo)s is not allowed" -msgstr "" - -#: kallithea/model/validators.py:347 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - -#: kallithea/model/validators.py:348 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 msgid "Invalid repository URL" -msgstr "" - -#: kallithea/model/validators.py:466 -msgid "Invalid repository URL. It must be a valid http, https, ssh, svn+http or svn+https URL" -msgstr "" - -#: kallithea/model/validators.py:489 +msgstr "Ugyldig pakkebrønnsnettadresse" + +#: kallithea/model/validators.py:420 +msgid "" +"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " +"svn+https URL" +msgstr "" + +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" -msgstr "" - -#: kallithea/model/validators.py:705 +msgstr "Dette er ikke en gyldig sti" + +#: kallithea/model/validators.py:662 msgid "This email address is already in use" -msgstr "" - -#: kallithea/model/validators.py:725 -#, python-format +msgstr "E-postadressen er allerede i bruk" + +#: kallithea/model/validators.py:682 +#, fuzzy, python-format msgid "Email address \"%(email)s\" not found" -msgstr "" - -#: kallithea/model/validators.py:762 -msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\"" -msgstr "" - -#: kallithea/model/validators.py:774 +msgstr "Fant ikke e-postadressen \"%(email)s\"" + +#: kallithea/model/validators.py:719 +msgid "" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" + +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" -msgstr "" - -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" - -#: kallithea/model/validators.py:808 +msgstr "Skriv inn en gyldig IPv4- eller IPv6-adresse" + +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" -msgstr "" - -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 +msgstr "Om" + #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" -msgstr "" - -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 +msgstr "Legg til pakkebrønn" + #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 -msgid "Add Repository Group" -msgstr "" - +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 #: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "Legg til pakkebrønnsgruppe" + +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" -msgstr "" - -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +msgstr "Rediger pakkebrønnsgruppe" + +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "Pakkebrønn" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" -msgstr "" - -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +msgstr "Beskrivelse" + +#: kallithea/templates/index_base.html:60 msgid "Last Change" -msgstr "" - -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +msgstr "Siste endring" + +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" -msgstr "" - -#: kallithea/templates/index_base.html:132 +msgstr "Tips" + #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" -msgstr "" - -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +msgstr "Eier" + +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" -msgstr "" - -#: kallithea/templates/login.html:13 +msgstr "Logg inn" + +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" -msgstr "" - -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 +msgstr "Logg inn på %s" + #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" -msgstr "" - -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +msgstr "Brukernavn" + +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" -msgstr "" +msgstr "Passord" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +#, fuzzy +msgid "Stay logged in after browser restart" +msgstr "Forbli innlogget etter omstart av nettleser" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" -msgstr "" - -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +msgstr "Glemt passordet ditt?" + +#: kallithea/templates/login.html:55 +#, fuzzy msgid "Don't have an account ?" -msgstr "" - -#: kallithea/templates/login.html:59 +msgstr "Har du ikke en konto?" + +#: kallithea/templates/login.html:62 +#, fuzzy msgid "Sign In" -msgstr "" +msgstr "Logg inn" #: kallithea/templates/password_reset.html:5 msgid "Password Reset" -msgstr "" - -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +msgstr "Passordstilbakestilling" + +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" -msgstr "" - -#: kallithea/templates/password_reset.html:14 +msgstr "Tilbakestill passordet ditt til %s" + +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" -msgstr "" - -#: kallithea/templates/password_reset.html:25 +msgstr "Tilbakestill passordet ditt" + +#: kallithea/templates/password_reset.html:30 msgid "Email Address" -msgstr "" - -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +msgstr "E-postadresse" + +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 +#, fuzzy msgid "Captcha" -msgstr "" - -#: kallithea/templates/password_reset.html:46 -msgid "Send Password Reset Email" -msgstr "" +msgstr "CAPTCHA" #: kallithea/templates/password_reset.html:47 -msgid "A password reset link will be sent to the specified email address if it is registered in the system." -msgstr "" - -#: kallithea/templates/password_reset_confirmation.html:19 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 +msgid "" +"A password reset link will be sent to the specified email address if it " +"is registered in the system." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 -msgid "Note that you must use the same browser session for this as the one used to request the password reset." -msgstr "" - -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:24 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 msgid "New Password" -msgstr "" - -#: kallithea/templates/password_reset_confirmation.html:48 +msgstr "Nytt passord" + +#: kallithea/templates/password_reset_confirmation.html:43 msgid "Confirm New Password" -msgstr "" - -#: kallithea/templates/password_reset_confirmation.html:56 +msgstr "Bekreft nytt passord" + +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" -msgstr "" - -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +msgstr "Bekreft" + +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" -msgstr "" - -#: kallithea/templates/register.html:12 +msgstr "Registrer" + +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" -msgstr "" - -#: kallithea/templates/register.html:42 +msgstr "Registrer på %s" + +#: kallithea/templates/register.html:45 msgid "Re-enter password" -msgstr "" - -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +msgstr "Skriv inn passord på ny" + +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" -msgstr "" - -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +msgstr "Fornavn" + +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" -msgstr "" - -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +msgstr "Etternavn" + +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" -msgstr "" - -#: kallithea/templates/register.html:92 +msgstr "E-post" + +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" -msgstr "" +msgstr "Filter" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2530,144 +2061,135 @@ msgstr[0] "" msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" -msgstr "" +msgstr "Dato" #: kallithea/templates/admin/admin_log.html:9 +#, fuzzy msgid "From IP" -msgstr "" - -#: kallithea/templates/admin/admin_log.html:63 +msgstr "Fra IP" + +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" -msgstr "" +msgstr "Ingen handlinger enda" #: kallithea/templates/admin/auth/auth_settings.html:5 msgid "Authentication Settings" -msgstr "" +msgstr "Identitetsbekreftelsesinnstillinger" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:28 +msgstr "Identitetsbekreftelse" + +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:31 +msgstr "Identitetsbekreftelsesprogramtillegg" + +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:33 -msgid "Comma-separated list of plugins; Kallithea will try user authentication in plugin order" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:34 +msgstr "Aktiverte programtillegg" + +#: kallithea/templates/admin/auth/auth_settings.html:32 +msgid "" +"Comma-separated list of plugins; Kallithea will try user authentication " +"in plugin order" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:51 +msgstr "Tilgjengelige innebygde programtillegg" + +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" -msgstr "" +msgstr "Programtillegg" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" -msgstr "" +msgstr "Lagre" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" +msgstr "Type" + +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 +msgid "Private repository" +msgstr "Privat pakkebrønn" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." msgstr "" #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "Private repositories are only visible to people explicitly added as collaborators." -msgstr "" +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +msgid "Enable statistics" +msgstr "Skru på statistikk" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +msgid "Enable downloads" +msgstr "Skru på nedlastinger" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +msgstr "Skru på nedlastingsmeny på sammendragsside." + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +msgstr "Skru på låsing" + +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2676,54 +2198,57 @@ msgstr "" msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 -#, python-format -msgid "Gist was update since you started editing. Copy your changes and click %(here)s to reload new version." -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: 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." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +msgstr "Utløper" + +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 msgid "Never" -msgstr "" +msgstr "Aldri" #: kallithea/templates/admin/gists/edit.html:145 msgid "Update Gist" msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" -msgstr "" +msgstr "Avbryt" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 @@ -2744,16 +2269,16 @@ msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" -msgstr "" - -#: kallithea/templates/admin/gists/index.html:74 +msgstr "Opprettet" + +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "" @@ -2762,45 +2287,45 @@ msgstr "" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "" @@ -2810,182 +2335,197 @@ msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" +msgstr "Nettadresse" + +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:56 +msgstr "Slett" + +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "Rediger" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:35 +msgstr "Min konto" + +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:36 +msgstr "Profil" + +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:38 +msgstr "E-postadresser" + +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:39 +msgstr "API-nøkler" + +#: kallithea/templates/admin/my_account/my_account.html:29 msgid "Owned Repositories" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +msgstr "Eide pakkebrønner" + +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +msgstr "Fjern" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +msgstr "Ny API-nøkkel" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +msgstr "Legg til" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "" @@ -2993,107 +2533,70 @@ msgstr "" msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +msgstr "Nåværende passord" + +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_password.html:28 +msgstr "Nytt passord" + +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" -msgstr "" +msgstr "Bekreft nytt passord" + +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "Nåværende IP" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "Gravatar" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" +msgstr "Endre %s-avatar på" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" +msgstr "Avatarer er avskrudd" #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "" +msgstr "Pakkebrønner du eier" + +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "Navn" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "" +msgstr "Pakkebrønner du holder oppsyn med" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" -msgstr "" +msgstr "Forvalgte tilganger" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 @@ -3103,153 +2606,175 @@ msgstr "" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 msgid "IP Whitelist" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +msgstr "IP-hvitliste" + +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:13 -#, python-format -msgid "Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:25 -msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +msgstr "Anonym tilgang" + +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "Tillat anonym tilgang" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 +#, python-format +msgid "" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +msgid "" +"All default permissions on each repository will be reset to chosen " +"permission, note that all custom default permission on repositories will " +"be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:20 msgid "Apply to all existing repositories" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 -msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" +msgid "" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:33 +msgid "Apply to all existing repository groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +msgid "Permissions for the Default user on new repository groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:40 -msgid "Apply to all existing repository groups" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:41 -msgid "Permissions for the Default user on new repository groups." +#: kallithea/templates/data_table/_dt_elements.html:141 +msgid "User group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +msgid "" +"All default permissions on each user group will be reset to chosen " +"permission, note that all custom default permission on user groups will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 -msgid "User group" +msgid "Apply to all existing user groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +msgid "Permissions for the Default user on new user groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:53 -msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:54 -msgid "Apply to all existing user groups" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Top level repository creation" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:61 +msgid "Repository creation with group write access" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "Note: This will also give all users API access to create repositories everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 -msgid "Repository creation with group write access" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:74 -msgid "With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +msgid "" +"With this, write permission to a repository group allows creating " +"repositories inside that group. Without this, group write permissions " +"mean nothing." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:75 +msgid "Repository forking" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:78 +msgid "Enable this to allow non-admins to fork repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 +msgid "Registration" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:88 -msgid "Repository forking" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:92 -msgid "Enable this to allow non-admins to fork repositories." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:97 -msgid "Registration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:105 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" @@ -3258,30 +2783,29 @@ msgstr "" msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "" @@ -3306,12 +2830,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3322,16 +2846,32 @@ msgstr[1] "" msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +msgid "Add repos" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3339,96 +2879,97 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 -msgid "Set or revoke permission to all children of that group, including non-private repositories and other groups if selected." -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 -msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +msgid "" +"Set or revoke permission to all children of that group, including non-" +"private repositories and other groups if selected." +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" +msgid "Repository group %s" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:22 -msgid "Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +msgid "" +"Optional: URL of a remote repository. If set, the repository will be " +"created as a clone from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 -msgid "Default revision for files page, downloads, full text search index and readme generation" +#: kallithea/templates/admin/repos/repo_add_base.html:52 +msgid "" +"Default revision for files page, downloads, full text search index and " +"readme generation" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 @@ -3442,11 +2983,15 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format -msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name" +msgid "" +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:39 -msgid "We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator." +msgid "" +"We're sorry but error occurred during this operation. Please check your " +"Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 @@ -3454,22 +2999,22 @@ msgstr "" msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "" @@ -3478,225 +3023,244 @@ msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 -msgid "All actions done in this repository will be visible to everyone in the public journal." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +msgid "" +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 -msgid "Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +msgid "" +"Force locking on the repository. Works only when anonymous access is " +"disabled. Triggering a pull locks the repository. The user who is " +"pulling locks the repository; only the user who pulled and locked it can " +"unlock it by doing a push." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 -msgid "The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it." +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +msgid "" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 -msgid "Manually invalidate cache for this repository. On first access, the repository will be cached again." +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 +msgid "" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +msgid "Fork of repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" -"In case this repository is renamed or moved into another group the repository URL changes.\n" -" Using the above permanent URL guarantees that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +"In case this repository is renamed or moved into another group the " +"repository URL changes.\n" +" Using the above permanent URL guarantees " +"that this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any " +"other cases that you need to hardcode the URL into a 3rd party service." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 -msgid "Optional: URL of a remote repository. If set, the repository can be pulled from this URL." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "" +"Optional: URL of a remote repository. If set, the repository can be " +"pulled from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3712,7 +3276,7 @@ msgstr "" msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3733,7 +3297,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "" @@ -3745,336 +3309,374 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 -msgid "HTML with JavaScript for web analytics systems like Google Analytics or Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +msgid "" +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 -msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:43 +msgid "" +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 -msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications." -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:17 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:18 +msgid "" +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 -msgid "Check this option to remove all comments, pull requests and other records related to repositories that no longer exist in the filesystem." +#: kallithea/templates/admin/settings/settings_mapping.html:12 +msgid "" +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 -msgid "This option completely reindexeses all of the repositories for proper fulltext search capabilities." -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:21 +msgid "" +"This option completely reindexeses all of the repositories for proper " +"fulltext search capabilities." +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 -msgid "Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial." +msgid "" +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:59 +msgid "Location of repositories" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Location of repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:69 -msgid "Click to unlock. You must restart Kallithea in order to make this setting take effect." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 -msgid "Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:8 +msgid "" +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 +msgid "" +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" -" The following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:42 +" The following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" -" The following variables are available:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 -msgid "Number of items displayed in the main page dashboard before pagination is shown." +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " +"variables are available:\n" +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +msgid "Repository page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +msgid "" +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 -msgid "Number of items displayed in the admin pages grids before pagination is shown." +msgid "" +"Number of items displayed in the admin pages grids before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:70 +msgid "Icons" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:75 -msgid "Icons" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 +#: kallithea/templates/admin/settings/settings_visual.html:94 +msgid "" +"Parses meta tags from the repository description field and turns them " +"into colored tags." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:98 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:111 -msgid "Parses meta tags from the repository description field and turns them into colored tags." -msgstr "" - #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4093,13 +3695,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4108,15 +3710,15 @@ msgstr "" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" @@ -4130,17 +3732,17 @@ msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "" @@ -4159,12 +3761,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4173,7 +3775,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4182,24 +3784,16 @@ msgstr "" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "" @@ -4207,220 +3801,219 @@ msgstr "" msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "" - #: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" -msgstr "" - #: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "" - -#: kallithea/templates/base/base.html:221 -msgid "Show recent activity" -msgstr "" - -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 -msgid "Public journal" -msgstr "" - -#: kallithea/templates/base/base.html:233 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:234 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:238 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:241 -msgid "My Private Gists" -msgstr "" - -#: kallithea/templates/base/base.html:246 -msgid "Search in repositories" -msgstr "" - -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 -msgid "My Pull Requests" -msgstr "" - -#: kallithea/templates/base/base.html:289 -msgid "Not Logged In" +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" msgstr "" #: kallithea/templates/base/base.html:296 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:308 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:309 +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:313 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:315 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:316 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:321 +msgid "Search in repositories" +msgstr "" + +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:360 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 -#, python-format -msgid "Select to inherit global settings, IP whitelist and permissions from the %s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:15 +#, python-format +msgid "" +"Select to inherit global settings, IP whitelist and permissions from the " +"%s." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "" @@ -4429,227 +4022,171 @@ msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "" - -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "" - -#: kallithea/templates/base/root.html:27 -msgid "Loading ..." -msgstr "" - #: kallithea/templates/base/root.html:28 -msgid "loading ..." +msgid "Retry" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +msgid "Unable to post" msgstr "" #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "Velg endringssett" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "" @@ -4665,7 +4202,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "" @@ -4679,38 +4216,60 @@ msgstr "" msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -msgid "Push new repository" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%s committed on %s" +msgid "%s comments" +msgstr "%s sendte inn %s" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" msgstr "" #: kallithea/templates/changeset/changeset.html:8 @@ -4718,86 +4277,78 @@ msgstr "" msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 msgid "Merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -msgid "No revisions" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#, fuzzy +#| msgid "%s committed on %s" +msgid "comment" +msgstr "%s sendte inn %s" #: kallithea/templates/changeset/changeset_file_comment.html:21 msgid "on pull request" @@ -4815,171 +4366,166 @@ msgstr "" msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 msgid "Status change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +msgid "Finish pull request" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, python-format +msgid "Unknown operation: %r" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "" @@ -4990,123 +4536,169 @@ msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +msgid "Changeset on" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +msgid "branch" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +msgid "Status change:" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:33 +msgid "The pull request has been closed." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 -msgid "Should you not be able to use the link above, please type the following code into the password reset form" -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:12 -msgid "If it weren't you who requested the password reset, just disregard this message." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/password_reset.html:33 +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:44 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Pull request updated" +msgid "Pull request" +msgstr "Innsendingsforespørsel oppdatert" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5125,7 +4717,7 @@ msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "" @@ -5135,72 +4727,73 @@ msgstr "" msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" +msgid "New file type" msgstr "" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "" @@ -5210,7 +4803,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5223,24 +4816,20 @@ msgstr "" msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5248,50 +4837,58 @@ msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "" +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" +msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 @@ -5312,12 +4909,12 @@ msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "" @@ -5326,35 +4923,35 @@ msgstr "" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5364,40 +4961,40 @@ msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "" @@ -5406,31 +5003,36 @@ msgstr "" msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "" @@ -5442,6 +5044,10 @@ msgstr "" msgid "Vote" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5465,7 +5071,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "" @@ -5492,102 +5098,95 @@ msgstr "" msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -msgid "There are no reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 -msgid "This is just a range of changesets and doesn't have a target or a real merge ancestor." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5603,35 +5202,39 @@ msgstr "" msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" @@ -5645,29 +5248,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "" @@ -5677,80 +5280,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "" @@ -5758,82 +5361,134 @@ msgstr "" msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 msgid "Latest Changes" msgstr "" +#: kallithea/templates/summary/summary.html:177 +msgid "Quick Start" +msgstr "" + #: kallithea/templates/summary/summary.html:188 -msgid "Quick Start" -msgstr "" - -#: kallithea/templates/summary/summary.html:202 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "Det er ingen indeks å søke i. Kjør en annen whoosh-indekserer" + +#~ msgid "" +#~ "Changing status on a changeset associated with a closed pull request " +#~ "is not allowed" +#~ msgstr "" +#~ "Endring av status for et endringssett tilknyttet en lukket " +#~ "innhentingsforespørsel tillates ikke" + +#, fuzzy +#~ msgid "You have successfully registered into Kallithea" +#~ msgstr "Du har registrert deg på Kallithea" + +#~ msgid "Missing changesets since the previous pull request:" +#~ msgstr "Manglende endringssett siden forrige innsendingsforespørsel:" + +#~ msgid "New changesets on %s %s since the previous pull request:" +#~ msgstr "Nye endringssett på %s %s siden forrige innsendingsforespørsel:" + +#~ msgid "Ancestor didn't change - show diff since previous version:" +#~ msgstr "Opphav endret seg ikke - vis diff siden forrige versjon:" + +#~ msgid "" +#~ "This pull request is based on another %s revision and there is no " +#~ "simple diff." +#~ msgstr "" +#~ "Denne innsendingsforespørselen er basert på en annen %s-revisjon, og " +#~ "det finnes ingen enkel diff." + +#~ msgid "No changes found on %s %s since previous version." +#~ msgstr "Ingen endringer funnet på %s %s siden forrige versjon." + +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Lukket, erstattet av %s." + +#~ msgid "Pull request update created" +#~ msgstr "Innsendingsforespørsel opprettet" + +#~ msgid "This pull request can be updated with changes on %s:" +#~ msgstr "" +#~ "Denne innsendingsforespørselen kan ikke oppdateres med endringer på %s:" + +#~ msgid "No changesets found for updating this pull request." +#~ msgstr "" +#~ "Ingen endringssett funnet for oppdatering av denne " +#~ "innsendingsforespørselen." + +#~ msgid "Git pull requests don't support updates yet." +#~ msgstr "Git-innsendingsforespørsler støtter ikke oppdateringer enda." + +#~ msgid "Closing." +#~ msgstr "Lukker." + +#~ msgid "An error occurred during creation of field" +#~ msgstr "Feil inntraff under opprettelse av felt" diff --git a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/nl_BE/LC_MESSAGES/kallithea.po @@ -7,457 +7,479 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" -"PO-Revision-Date: 2017-01-10 07:35+0000\n" -"Last-Translator: Sam Jaques \n" -"Language-Team: Dutch (Belgium) " -"\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"PO-Revision-Date: 2017-06-18 16:22+0000\n" +"Last-Translator: Thomas De Schampheleire \n" +"Language-Team: Dutch (Belgium) \n" "Language: nl_BE\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 2.11-dev\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +"X-Generator: Weblate 2.15-dev\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "Er zijn nog geen changesets" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Geen" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(gesloten)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "Toon witruimtes" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 #, fuzzy msgid "Ignore whitespace" msgstr "Negeer witruimtes" -#: kallithea/controllers/changeset.py:169 -#, fuzzy, python-format +#: kallithea/controllers/changeset.py:163 +#, python-format msgid "Increase diff context to %(num)s lines" -msgstr "vergroot de diff context met %(num)s lijnen" - -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +msgstr "Vergroot de diff context tot %(num)s lijnen" + +#: kallithea/controllers/changeset.py:203 +#, fuzzy +msgid "No permission to change status" +msgstr "Selecteer de changeset" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 msgid "Such revision does not exist for this repository" msgstr "Deze revisie bestaat niet in deze repository" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" -"Het is niet toegestaan de status te wijzigen van een changeset " -"geassocieerd met een gesloten pull request" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Selecteer de changeset" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, python-format +msgid "Could not find other repository %s" +msgstr "" + +#: kallithea/controllers/compare.py:72 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "" +"Kan geen repositories vergelijken zonder een gemeenschappelijke voorouder " +"te gebruiken" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" - -#: kallithea/controllers/error.py:71 +"Kan geen repositories vergelijken zonder een gemeenschappelijke voorouder " +"te gebruiken" + +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "Geen antwoord" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" -msgstr "Onbekende fout" - -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:103 +msgstr "Ongekende fout" + +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" +"De aanvraag kon niet door de server begrepen worden wegens incorrecte " +"syntax." + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" -msgstr "" - -#: kallithea/controllers/error.py:105 +msgstr "Ongeautoriseerde toegang tot resource" + +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" -msgstr "Je hebt geen toegang tot deze pagina" - -#: kallithea/controllers/error.py:107 +msgstr "U hebt geen permissie om deze pagina te bekijken" + +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" -msgstr "" - -#: kallithea/controllers/error.py:109 +msgstr "De resource kon niet gevonden worden" + +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" - -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "" - -#: kallithea/controllers/feed.py:56 +"De server kon de aanvraag niet voldoen wegens een onverwachte toestand." + +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "%s committeerde op %s" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "De changeset was te groot en werd afgekort..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 #, python-format msgid "%s %s feed" -msgstr "" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:91 -msgid "Click here to add new file" -msgstr "" +msgstr "%s %s feed" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" +msgstr "Veranderingen in repository %s" #: kallithea/controllers/files.py:92 +msgid "Click here to add new file" +msgstr "Klik hier om een nieuw bestand toe te voegen" + +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" -msgstr "" - -#: kallithea/controllers/files.py:193 +msgstr "Er zijn nog geen bestanden. %s" + +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" -msgstr "" - -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +msgstr "%s op %s" + +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, python-format msgid "This repository has been locked by %s on %s" -msgstr "" - -#: kallithea/controllers/files.py:317 +msgstr "Deze repository is gelocket door %s op %s" + +#: kallithea/controllers/files.py:312 msgid "You can only delete files with revision being a valid branch" msgstr "" - -#: kallithea/controllers/files.py:328 +"Men kan enkel bestanden verwijderen als de revisie een geldige branch is" + +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" -msgstr "" - -#: kallithea/controllers/files.py:350 +msgstr "Bestand %s verwijderd via Kallithea" + +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" -msgstr "" - -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +msgstr "Bestand %s succesvol verwijderd" + +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" -msgstr "" - -#: kallithea/controllers/files.py:377 +msgstr "Er trad een fout op tijdens het committeren" + +#: kallithea/controllers/files.py:372 msgid "You can only edit files with revision being a valid branch" msgstr "" - -#: kallithea/controllers/files.py:391 +"Men kan enkel bestanden wijzigen als de revisie een geldige branch is" + +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" -msgstr "" - -#: kallithea/controllers/files.py:407 +msgstr "Bestand %s gewijzigd via Kallithea" + +#: kallithea/controllers/files.py:402 msgid "No changes" -msgstr "" - -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +msgstr "Geen wijzigingen" + +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" -msgstr "" - -#: kallithea/controllers/files.py:443 +msgstr "Succesvol gecommitteerd naar %s" + +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" -msgstr "" - -#: kallithea/controllers/files.py:464 +msgstr "Bestand toegevoegd via Kallithea" + +#: kallithea/controllers/files.py:459 msgid "No content" -msgstr "" - -#: kallithea/controllers/files.py:468 +msgstr "Geen inhoud" + +#: kallithea/controllers/files.py:463 msgid "No filename" -msgstr "" - -#: kallithea/controllers/files.py:493 +msgstr "Geen bestandsnaam" + +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" -msgstr "" - -#: kallithea/controllers/files.py:526 +msgstr "De locatie moet een relatief pad zijn en mag geen .. bevatten" + +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" -msgstr "" - -#: kallithea/controllers/files.py:537 +msgstr "Downloads uitgeschakeld" + +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" -msgstr "" - -#: kallithea/controllers/files.py:539 +msgstr "Ongekende revisie %s" + +#: kallithea/controllers/files.py:533 msgid "Empty repository" -msgstr "" - -#: kallithea/controllers/files.py:541 +msgstr "Lege repository" + +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" -msgstr "" - -#: kallithea/controllers/files.py:771 +msgstr "Ongekende archieftype" + +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" -msgstr "" - -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +msgstr "Changesets" + +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" -msgstr "" - -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +msgstr "Branches" + +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" -msgstr "" - -#: kallithea/controllers/forks.py:186 +msgstr "Tags" + +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" -msgstr "" - -#: kallithea/controllers/home.py:84 +msgstr "Er is een fout opgetreden tijdens het forken van de repository %s" + +#: kallithea/controllers/home.py:78 msgid "Groups" -msgstr "" - -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +msgstr "Groepen" + +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" -msgstr "" - -#: kallithea/controllers/home.py:130 +msgstr "Repositories" + +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" -msgstr "" - -#: kallithea/controllers/home.py:136 +msgstr "Branch" + +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Gesloten branches" + +#: kallithea/controllers/home.py:133 msgid "Tag" -msgstr "" - -#: kallithea/controllers/home.py:142 +msgstr "Tag" + +#: kallithea/controllers/home.py:139 msgid "Bookmark" -msgstr "" - -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +msgstr "Bladwijzer" + +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" -msgstr "" - -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +msgstr "Publiek logboek" + +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" -msgstr "" - -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +msgstr "Logboek" + +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" -msgstr "" - -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "" - -#: kallithea/controllers/login.py:197 +msgstr "Incorrecte captcha" + +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "U bent succesvol geregistreerd bij %s" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" -msgstr "" - -#: kallithea/controllers/login.py:246 +msgstr "Een paswoordherstel bevestigingscode is verzonden" + +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" -msgstr "" - -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +msgstr "Ongeldig paswoordherstel token" + +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" -msgstr "" - -#: kallithea/controllers/pullrequests.py:124 -#, fuzzy, python-format +msgstr "Paswoord succesvol aangepast" + +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:133 +#, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" -msgstr "" - -#: kallithea/controllers/pullrequests.py:173 +msgstr "Changeset" + +#: kallithea/controllers/pullrequests.py:181 msgid "Special" -msgstr "" - -#: kallithea/controllers/pullrequests.py:174 +msgstr "Bijzonder" + +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "" - -#: kallithea/controllers/pullrequests.py:363 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 +msgid "Error occurred while creating pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:352 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 -msgid "Error occurred while creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 +#: kallithea/controllers/pullrequests.py:375 +msgid "New pull request iteration created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:432 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:445 +msgid "Successfully deleted pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:524 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:557 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:514 -msgid "Pull request updated" -msgstr "" - -#: kallithea/controllers/pullrequests.py:529 -msgid "Successfully deleted pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:595 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:597 -msgid "This pull request has been closed and can not be updated." -msgstr "" - -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 -#, python-format -msgid "Note: Branch %s has another head: %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +"Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "" #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "" @@ -469,149 +491,151 @@ msgstr "" msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "" +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "" + #: kallithea/controllers/admin/gists.py:233 -msgid "Unmodified" -msgstr "" - -#: kallithea/controllers/admin/gists.py:262 -msgid "Successfully updated gist content" -msgstr "" - -#: kallithea/controllers/admin/gists.py:267 -msgid "Successfully updated gist data" -msgstr "" - -#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "" +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "" + #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -619,622 +643,618 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "An error occurred during repository forking %s" +msgid "An error occurred during creation of field: %r" +msgstr "Er is een fout opgetreden tijdens het forken van de repository %s" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "" +#: kallithea/controllers/admin/repos.py:446 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:450 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:466 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:468 +#, python-format +msgid "Marked repository %s as fork of %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:475 +msgid "An error occurred during this operation" +msgstr "" + #: kallithea/controllers/admin/repos.py:491 -msgid "Updated repository visibility in public journal" -msgstr "" - -#: kallithea/controllers/admin/repos.py:495 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:512 -msgid "Nothing" -msgstr "" - -#: kallithea/controllers/admin/repos.py:514 -#, python-format -msgid "Marked repository %s as fork of %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:521 -msgid "An error occurred during this operation" -msgstr "" - -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 -#, fuzzy msgid "Repository has been locked" msgstr "" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 -#, fuzzy +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:211 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +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 "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "" - -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" - -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 -#, python-format -msgid "Deleted branch: %s" -msgstr "" - #: kallithea/lib/helpers.py:612 #, python-format +msgid "Deleted branch: %s" +msgstr "" + +#: kallithea/lib/helpers.py:614 +#, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, fuzzy, python-format #| msgid "Set changeset status" msgid "Changeset %s not found" msgstr "Selecteer de changeset" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1242,1158 +1262,652 @@ msgid "" "repositories" msgstr "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" msgstr[1] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2238 -#, fuzzy +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2241 -#, fuzzy +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2266 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:309 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "" - -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" + +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 -msgid "You can't remove this user since it is crucial for the entire application" -msgstr "" - -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" + +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" - -#: kallithea/model/user.py:273 +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:126 +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:133 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:152 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 msgid "Invalid username or password" msgstr "" +#: kallithea/model/validators.py:312 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:330 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + #: kallithea/model/validators.py:331 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:345 -#, python-format -msgid "Repository name %(repo)s is not allowed" -msgstr "" - -#: kallithea/model/validators.py:347 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - -#: kallithea/model/validators.py:348 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" - -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 -msgid "Add Repository Group" -msgstr "" - +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 #: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "" @@ -2401,177 +1915,146 @@ msgstr "" msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" msgstr "" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 -msgid "Send Password Reset Email" -msgstr "" - #: kallithea/templates/password_reset.html:47 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 -#, fuzzy, python-format +#: kallithea/templates/journal/journal.html:13 +#, python-format msgid "%s Entry" msgid_plural "%s Entries" msgstr[0] "" msgstr[1] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2579,7 +2062,7 @@ msgstr "" msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "" @@ -2588,108 +2071,108 @@ msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2698,45 +2181,45 @@ msgstr "" msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 msgid "Never" msgstr "" @@ -2745,7 +2228,8 @@ msgid "Update Gist" msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "" @@ -2768,16 +2252,16 @@ msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "" @@ -2786,45 +2270,45 @@ msgstr "" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "" @@ -2834,182 +2318,197 @@ msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 msgid "Owned Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "" @@ -3017,105 +2516,68 @@ msgstr "" msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" msgstr "" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "" @@ -3129,167 +2591,173 @@ msgstr "" msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:20 msgid "Apply to all existing repositories" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:33 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 msgid "Top level repository creation" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:61 +msgid "Repository creation with group write access" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 -msgid "Repository creation with group write access" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:75 +msgid "Repository forking" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:78 +msgid "Enable this to allow non-admins to fork repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 +msgid "Registration" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:88 -msgid "Repository forking" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:92 -msgid "Enable this to allow non-admins to fork repositories." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:97 -msgid "Registration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:105 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 -#, fuzzy, python-format +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" @@ -3298,30 +2766,29 @@ msgstr "" msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "" @@ -3346,12 +2813,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3362,16 +2829,34 @@ msgstr[1] "" msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "Geen antwoord" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3379,102 +2864,94 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 -#, fuzzy +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" +msgid "Repository group %s" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3503,26 +2980,26 @@ msgid "" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, fuzzy, python-format +#, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "" @@ -3531,63 +3008,61 @@ msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3595,33 +3070,32 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 -#, fuzzy +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 -#, fuzzy, python-format +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3632,105 +3106,107 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Empty repository" +msgid "Fork of repository" +msgstr "Lege repository" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3740,33 +3216,38 @@ msgid "" "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3782,7 +3263,7 @@ msgstr "" msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3803,7 +3284,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "" @@ -3815,276 +3296,266 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom Hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. " -"Current hooks will be updated to the latest version." +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:59 +msgid "Location of repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Location of repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4101,92 +3572,100 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repositories" +msgid "Repository page size" +msgstr "Repositories" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4205,13 +3684,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4220,15 +3699,15 @@ msgstr "" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" @@ -4242,17 +3721,17 @@ msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "" @@ -4271,12 +3750,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4285,7 +3764,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4294,24 +3773,16 @@ msgstr "" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "" @@ -4319,222 +3790,219 @@ msgstr "" msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "" - #: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" -msgstr "" - #: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "" @@ -4543,231 +4011,174 @@ msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -#, fuzzy -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "" - -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "" - -#: kallithea/templates/base/root.html:27 -msgid "Loading ..." -msgstr "" - #: kallithea/templates/base/root.html:28 -msgid "loading ..." +msgid "Retry" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +msgid "Unable to post" msgstr "" #: kallithea/templates/base/root.html:31 -#, fuzzy -msgid "Open New Pull Request from {0}" -msgstr "Statuswijziging -> %s" +msgid "Add Another Comment" +msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:33 -#, fuzzy -msgid "Show Selected Changesets {0} → {1}" -msgstr "Selecteer de changeset" +msgid "Start following this repository" +msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" +#, fuzzy +msgid "Open New Pull Request from {0}" +msgstr "Statuswijziging -> %s" #: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +#, fuzzy +msgid "Show Selected Changesets {0} → {1}" +msgstr "Selecteer de changeset" #: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "Selecteer een changeset" + +#: kallithea/templates/base/root.html:52 #, fuzzy msgid "Specify changeset" msgstr "Selecteer de changeset" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "" @@ -4783,7 +4194,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "" @@ -4797,38 +4208,60 @@ msgstr "" msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -msgid "Push new repository" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, fuzzy, python-format +msgid "Changeset status: %s by %s" +msgstr "Selecteer de changeset" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "No comments." +msgid "%s comments" +msgstr "Geen kommentaar." + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" msgstr "" #: kallithea/templates/changeset/changeset.html:8 @@ -4836,86 +4269,78 @@ msgstr "" msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 msgid "Merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -msgid "No revisions" -msgstr "" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#, fuzzy +#| msgid "No comments." +msgid "comment" +msgstr "Geen kommentaar." #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy @@ -4932,178 +4357,176 @@ msgid "on this changeset" msgstr "Selecteer de changeset" #: kallithea/templates/changeset/changeset_file_comment.html:30 -#, fuzzy msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 #, fuzzy msgid "Status change" msgstr "Statuswijziging -> %s" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#, fuzzy +msgid "Set changeset status" +msgstr "Selecteer de changeset" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "Statuswijziging -> %s" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +#, fuzzy +msgid "Close" +msgstr "(gesloten)" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:107 -#, fuzzy, python-format +#: kallithea/templates/changeset/changeset_file_comment.html:154 +#, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -#, fuzzy -msgid "Set changeset status" -msgstr "Selecteer de changeset" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -#, fuzzy -msgid "Close" -msgstr "(gesloten)" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Ongekende revisie %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Geen bestandsnaam" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 -#, fuzzy, python-format +#: kallithea/templates/compare/compare_cs.html:55 +#, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "" @@ -5114,127 +4537,177 @@ msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Comment on Changeset \"%s\"" +msgstr "Selecteer de changeset" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset on" +msgstr "Changeset" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Branch" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Statuswijziging -> %s" + +#: kallithea/templates/email_templates/comment.html:33 +msgid "The pull request has been closed." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request" +msgstr "Statuswijziging -> %s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "on pull request" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Statuswijziging -> %s" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5253,7 +4726,7 @@ msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "" @@ -5263,73 +4736,74 @@ msgstr "" msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" +msgid "New file type" msgstr "" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 #, fuzzy msgid "Commit Changes" msgstr "Selecteer de changeset" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "" @@ -5339,7 +4813,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5352,24 +4826,20 @@ msgstr "" msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5377,50 +4847,58 @@ msgid_plural "%s authors" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "" +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" +msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 @@ -5441,12 +4919,12 @@ msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "" @@ -5455,35 +4933,35 @@ msgstr "" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5493,40 +4971,40 @@ msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "" @@ -5535,31 +5013,36 @@ msgstr "" msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "" @@ -5571,6 +5054,10 @@ msgstr "" msgid "Vote" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5594,7 +5081,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "" @@ -5607,7 +5094,7 @@ msgid "Confirm to delete this pull reque msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:70 -#, fuzzy, python-format +#, python-format msgid "Confirm again to delete this pull request with %s comments" msgstr "" @@ -5621,107 +5108,96 @@ msgstr "" msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "" -msgstr[1] "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -msgid "There are no reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 -#, fuzzy -msgid "Remove reviewer" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:250 -msgid "Type name of reviewer to add" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:258 -#, fuzzy -msgid "Potential Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:261 -msgid "Click to add the repository owner as reviewer:" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:284 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 #, fuzzy msgid "Cancel Changes" msgstr "Selecteer de changeset" -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:234 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:240 +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:243 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5729,7 +5205,6 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -#| msgid "Open New Pull Request from {0}" msgid "Pull Requests from '%s'" msgstr "Statuswijziging -> %s" @@ -5738,35 +5213,39 @@ msgstr "Statuswijziging -> %s" msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" @@ -5780,29 +5259,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "" @@ -5812,80 +5291,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "" @@ -5893,450 +5372,83 @@ msgstr "" msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 #, fuzzy msgid "Latest Changes" msgstr "Statuswijziging -> %s" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:177 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" - -#~ msgid "No comments." -#~ msgstr "Geen kommentaar." - -#~ msgid "public journal" -#~ msgstr "" - -#~ msgid "journal" -#~ msgstr "" - -#~ msgid "bad captcha" -#~ msgstr "" - -#~ msgid "forever" -#~ msgstr "" - -#~ msgid "unmodified" -#~ msgstr "" - -#~ msgid "Cannot delete %s it still contains attached forks" -#~ msgstr "" - -#~ msgid "Locked repository" -#~ msgstr "" - -#~ msgid "Unlocked repository" -#~ msgstr "" - -#~ msgid "Unlocked" -#~ msgstr "" - -#~ msgid "Locked" -#~ msgstr "" - -#~ msgid "Repository has been %s" -#~ msgstr "" - -#~ msgid "You can't edit this user" -#~ msgstr "" - -#~ msgid "compare view" -#~ msgstr "" - -#~ msgid "fork name %s" -#~ msgstr "" - -#~ msgid "Pull request #%s" -#~ msgstr "" - -#~ msgid "No Files" -#~ msgstr "" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -#~ msgstr "" - -#~ msgid "You can't remove this user since it's crucial for entire application" -#~ msgstr "" - -#~ msgid "Username \"%(username)s\" is forbidden" -#~ msgstr "" - -#~ msgid "invalid password" -#~ msgstr "" - -#~ msgid "invalid user name" -#~ msgstr "" - -#~ msgid "Your account is disabled" -#~ msgstr "" - -#~ msgid "Repository name %(repo)s is disallowed" -#~ msgstr "" - -#~ msgid "invalid clone URL" -#~ msgstr "" - -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "This email address is already taken" -#~ msgstr "" - -#~ msgid "email \"%(email)s\" does not exist." -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "" - -#~ msgid "Defaults" -#~ msgstr "" - -#~ msgid "never" -#~ msgstr "" - -#~ msgid "My Emails" -#~ msgstr "" - -#~ msgid "Watched" -#~ msgstr "" - -#~ msgid "My Permissions" -#~ msgstr "" - -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "Confirm to reset this api key: %s" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "Confirm to remove this api key: %s" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - -#~ msgid "delete" -#~ msgstr "" - -#~ msgid "current IP" -#~ msgstr "" - -#~ msgid "Permissions Administration" -#~ msgstr "" - -#~ msgid "Overview" -#~ msgstr "" - -#~ msgid "Overwrite existing settings" -#~ msgstr "" - -#~ msgid "Repository creation" -#~ msgstr "" - -#~ msgid "Default IP Whitelist for All Users" -#~ msgstr "" - -#~ msgid "Confirm to delete this ip: %s" -#~ msgstr "" - -#~ msgid "Default User Permissions Overview" -#~ msgstr "" - -#~ msgid "none" -#~ msgstr "" - -#~ msgid "read" -#~ msgstr "" - -#~ msgid "write" -#~ msgstr "" - -#~ msgid "admin" -#~ msgstr "" - -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "default" -#~ msgstr "" - -#~ msgid "revoke" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - -#~ msgid "apply to children" -#~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - -#~ msgid "Optional URL from which repository should be cloned." -#~ msgstr "" - -#~ msgid "private repository" -#~ msgstr "" - -#~ msgid "Remote URL" -#~ msgstr "" - -#~ msgid "Pull Changes from Remote Location" -#~ msgstr "" - -#~ msgid "Confirm to pull changes from remote side." -#~ msgstr "" - -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - -#~ msgid "Non-changeable id" -#~ msgstr "" - -#~ msgid "edit" -#~ msgstr "" - -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - -#~ msgid "Destroy old data" -#~ msgstr "" - -#~ msgid "check for updates" -#~ msgstr "" - -#~ msgid "Meta-Tagging" -#~ msgstr "" - -#~ msgid "Default permissions" -#~ msgstr "" - -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "Push new repo" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "merge" -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - -#~ msgid "Comment from pull request" -#~ msgstr "" - -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - -#~ msgid "Mimetype" -#~ msgstr "" - -#~ msgid "My Repos" -#~ msgstr "" - -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "%s Pull Request #%s" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - -#~ msgid "owner" -#~ msgstr "" - -#~ msgid "reviewer" -#~ msgstr "" - -#~ msgid "with subrepos" -#~ msgstr "" - -#~ msgid "Your password reset link was sent" -#~ msgstr "" - -#~ msgid "Your new password" -#~ msgstr "" - -#~ msgid "Your new Kallithea password:%s" -#~ msgstr "" - -#~ msgid "Open New Pull Request for Selected Changesets" -#~ msgstr "" - -#~ msgid "Show Selected Changesets __S → __E" -#~ msgstr "" - -#~ msgid "We received a request to create a new password for your account." -#~ msgstr "" - -#~ msgid "You can generate it by clicking following URL" -#~ msgstr "" - -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - -#~ msgid "Created by" -#~ msgstr "" - -#~ msgid "You can only delete files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "You can only edit files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "Changeset not found" -#~ msgstr "" - -#~ msgid "Non-admins can can fork repositories" -#~ msgstr "" - -#~ msgid "Pull Requests from %s'" -#~ msgstr "" - +#, fuzzy +#~| msgid "Empty repository" +#~ msgid "Repository Group" +#~ msgstr "Lege repository" diff --git a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pl/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/pl/LC_MESSAGES/kallithea.po @@ -11,471 +11,483 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" "PO-Revision-Date: 2015-04-04 09:08+0200\n" -"Last-Translator: Andrew Shadura \n" -"Language-Team: Polish " -"\n" +"Last-Translator: Andrej Shadura \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n" +"%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.3-dev\n" -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Brak" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(zamknięty)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "pokazuj spacje" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignoruj pokazywanie spacji" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +#, fuzzy +msgid "No permission to change status" +msgstr "Zagłosuj na żądanie na grupę zmian" + +#: kallithea/controllers/changeset.py:214 +#, fuzzy, python-format +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 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" -"Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest " -"niedozwolona" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Wybrane zmiany" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Potwierdź blokowanie repozytorium" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 #, fuzzy msgid "No response" msgstr "rewizja" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." msgstr "" "Wniosek nie może być rozumiany przez serwer z powodu zniekształconej " "składni." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Nieautoryzowany dostęp do zasobów" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Nie masz uprawnień do przeglądania tej strony" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Zasób nie został znaleziony" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -"Serwer napotkał niespodziewany warunek, który uniemożliwia jej spełnienie" -" żądania." - -#: kallithea/controllers/feed.py:55 +"Serwer napotkał niespodziewany warunek, który uniemożliwia jej spełnienie " +"żądania." + +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "%s zakomitowal w %s" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "Lista zmian była zbyt duża i została ucięta..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#, python-format +msgid "%s %s feed" +msgstr "%s %s zasilać" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 #, python-format msgid "Changes on %s repository" msgstr "Zmiany w %s repozytorium" -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "%s %s zasilać" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "Lista zmian była zbyt duża i została ucięta..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s zakomitowal w %s" - -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Kliknij tutaj, by dodać nowy plik" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, fuzzy, python-format msgid "%s at %s" msgstr "w %s i %s" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, 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:317 -#, fuzzy -#| msgid "You can only edit files with revision being a valid branch " +#: kallithea/controllers/files.py:312 +#, 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:328 +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "Wystąpił błąd w trakcie zatwierdzania" -#: kallithea/controllers/files.py:377 -#, fuzzy -#| msgid "You can only edit files with revision being a valid branch " +#: kallithea/controllers/files.py:372 +#, 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:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "Edytowanie %s w Kallithea" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "Bez zmian" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "Committ wykonany do %s" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "Dodano %s poprzez Kallithea" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "Brak treści" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "Brak nazwy pliku" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 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:526 +msgstr "" +"Lokalizacja musi być ścieżką względną i nie może zawierać .. ścieżki" + +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "Pobieranie wyłączone" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "Nieznana wersja %s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "Puste repozytorium" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "Nieznany typ archiwum" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Różnice" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Gałęzie" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Etykiety" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "Wystąpił błąd podczas rozgałęzienia %s repozytorium" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repozytoria" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "gałąź" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Zamknięte Gałęzie" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "Tag" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "Bookmark" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Dziennik Publiczny" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Dziennik" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "Udało Ci się zarejestrować na stronie" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "Udało Ci się zarejestrować w %s" + +#: kallithea/controllers/login.py:189 #, fuzzy msgid "A password reset confirmation code has been sent" msgstr "Twój link zresetowania hasła został wysłany" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:238 #, fuzzy msgid "Invalid password reset token" msgstr "łącze resetowania hasła" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" msgstr "%s (zamknięty)" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Grupy zmian" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" msgstr "Specjalne" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "gałęzie" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "Zakładki" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "Brak opisu" - -#: kallithea/controllers/pullrequests.py:363 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 +msgid "Error occurred while creating pull request" +msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" + +#: kallithea/controllers/pullrequests.py:352 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 -msgid "Error occurred while creating pull request" -msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" - -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 +#: kallithea/controllers/pullrequests.py:375 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Recenzje wniosków połączenia gałęzi" + +#: kallithea/controllers/pullrequests.py:403 #, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 #, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "Recenzje wniosków połączenia gałęzi" - -#: kallithea/controllers/pullrequests.py:514 +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Brak opisu" + +#: kallithea/controllers/pullrequests.py:432 #, fuzzy msgid "Pull request updated" msgstr "Połączone gałęzie" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:615 +#: kallithea/controllers/pullrequests.py:543 #, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 -#, fuzzy -msgid "No permission to change pull request status" -msgstr "Zagłosuj na żądanie na grupę zmian" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "Zamknięcie." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 +#, python-format +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "Nieprawidłowe zapytania. Spróbuj zacytować go." #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Nie ma szukanego indeksu. Proszę uruchomić indeksowanie whoosh" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Wystąpił błąd podczas operacji wyszukiwania." -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 #, fuzzy msgid "No data ready yet" msgstr "Żadne dane nie zostały załadowane" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "Statystyki są wyłączone dla tego repozytorium" @@ -487,153 +499,155 @@ msgstr "Ustawienia autentykacji poprawni msgid "error occurred during update of auth settings" msgstr "wystapił błąd podczas uaktualniania ustawień autentykacji" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Domyślne ustawienia zostały pomyślnie zaktualizowane" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "wystąpił błąd podczas aktualizacji wartości domyślnych" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 #, fuzzy msgid "Forever" msgstr "na zawsze" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 minut" +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "1 godzina" + #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" -msgstr "1 godzina" - -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 dzień" -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 miesiąc" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Czas życia" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "Wystąpił błąd podczas tworzenia git" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "Usuń gist %s" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:196 #, fuzzy msgid "Unmodified" msgstr "Ostatnio modyfikowany" -#: kallithea/controllers/admin/gists.py:262 +#: kallithea/controllers/admin/gists.py:225 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:267 +#: kallithea/controllers/admin/gists.py:230 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:270 +#: kallithea/controllers/admin/gists.py:233 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Nie możesz edytować tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "Twoje konto zostało pomyślnie zaktualizowane" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "Dodano e-mail %s do użytkownika" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "Usunięto e-mail użytkownikowi" +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "" + #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Odczyt" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Zapis" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -641,629 +655,629 @@ msgstr "Zapis" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Administracja" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Wyłączone" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Dozwolona z ręczną aktywacją konta" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Dozwolona z automatyczną aktywacją konta" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "Ręczna aktywacja nowego konta" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "Automatyczna aktywacja nowego konta" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "Wyłączone" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Dozwolona z ręczną aktywacją konta" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Dozwolona z automatyczną aktywacją konta" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "Ręczna aktywacja nowego konta" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "Automatyczna aktywacja nowego konta" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Włączone" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Globalne uprawnienia zaktualizowane poprawnie" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Wystąpił błąd podczas aktualizacji uprawnień" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "Utworzono grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "Zaktualizowano grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Usunięto grupę repo %s" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "Nie można cofnąć zezwolenia dla admina jako admin" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Aktualizacja uprawnień grup repozytorium" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "Wystąpił błąd podczas cofania zezwolenia" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "utworzone repozytorium %s" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "utworzone repozytorium %s z %s" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Gałęzi %s w repozytorium %s" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Utworzone repozytorium %s" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Repozytorium %s zostało pomyślnie zaktualizowane" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Wystąpił błąd podczas aktualizacji repozytorium %s" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "Oderwane rozgałęzienie %s" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "Usunięte repozytorium %s" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Usunięte repozytorium %s" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, fuzzy, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Nie można usunąć %s nadal zawiera załączniki rozgałęzienia" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Wystąpił błąd podczas usuwania %s" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Uprawnienia repozytorium zostały zaktualizowane" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "-- Brak rozgalezienia --" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:446 msgid "Updated repository visibility in public journal" msgstr "Zaktualizowano widoczność stron w publicznym dzienniku" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:450 msgid "An error occurred during setting this repository in public journal" -msgstr "Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" - -#: kallithea/controllers/admin/repos.py:512 +msgstr "" +"Wystąpił błąd podczas ustawiania tego repozytorium w dzienniku publicznym" + +#: kallithea/controllers/admin/repos.py:466 msgid "Nothing" msgstr "Brak" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:468 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Oznaczono %s repo jako rozwidlenie %s" -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:475 msgid "An error occurred during this operation" msgstr "Wystąpił błąd podczas tej operacji" -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 #, fuzzy msgid "Repository has been locked" msgstr "Repozytorium nie jest zablokowane" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 #, fuzzy msgid "Repository has been unlocked" msgstr "Repozytorium nie jest zablokowane" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "Wystąpił błąd podczas odblokowywania" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "Cache wyczyszczony poprawnie" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "Wystąpił błąd podczas unieważniania cache" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "Pobieranie z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "Wystąpił błąd podczas pobierania z lokalizacji zdalnej" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "Wystąpił błąd podczas usuwania z repozytorium statystyk" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "Aktualizacja ustawień VCS" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:211 +#: kallithea/controllers/admin/settings.py:174 #, 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:226 +#: kallithea/controllers/admin/settings.py:189 #, 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:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Aktualizacja ustawień aplikacji" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Aktualizacja ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Proszę podać adres email" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +#, fuzzy +msgid "Hook already exists" +msgstr "Żadne dane nie zostały załadowane" + +#: 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 "Added new hook" msgstr "Dodano nowy hook" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Aktualizacja hooku" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Wystąpił błąd podczas tworzenia hooku" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Zadanie ponownej indeksacji whoosh zostało zaplanowane" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "Utworzono grupę użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Wystąpił błąd podczas tworzenia grupy użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "Zaktualizowano grupę użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "Wystąpił błąd podczas aktualizacji grupy użytkowników %s" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "Grupa użytkowników została usunięta z powodzeniem" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "Wystąpił błąd podczas usuwania grupy użytkowników" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "Grupa docelowa nie może być taka sama" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "Aktualizacja uprawnień grupy użytkowników" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "Aktualizacja uprawnień" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "Wystąpił błąd podczas zapisywania uprawnień" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "Utworzono użytkownika %s" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "Użytkownik został zaktualizowany" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "Użytkownik został usunięty" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "Wystąpił błąd podczas usuwania użytkownika" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Dodano ip %s do listy dozwolonych adresów użytkownia" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "Wystąpił błąd podczas zapisywania e-maila" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "Usunięto adres ip z listy dozwolonych adresów dla użytkownika" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "Obserwatorzy %s" - -#: kallithea/lib/auth.py:757 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 +#: kallithea/lib/auth.py:824 msgid "You need to be a registered user to perform this action" msgstr "Musisz być zarejestrowanym użytkownikiem, żeby wykonać to działanie" -#: kallithea/lib/auth.py:864 +#: kallithea/lib/auth.py:852 msgid "You need to be signed in to view this page" msgstr "Musisz być zalogowany, żeby oglądać stronę" -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:444 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset for %s %s not found in %s" msgstr "Nie znaleziono changeset" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "Plik binarny" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Lista zmian była zbyt duża i została obcięta, użyj menu porównań żeby " "wyświetlić różnice" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "Nie wykryto zmian" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Deleted branch: %s" msgstr "Usunięta gałąź: %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:614 #, python-format msgid "Created tag: %s" msgstr "Utworzony tag: %s" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset %s not found" msgstr "Nie znaleziono changeset" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Pokaż wszystkie zestawienia zmian changesets %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 #, fuzzy msgid "Compare view" msgstr "Wyświetl porównanie" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "i" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "%s więcej" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "rewizja" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, fuzzy, python-format msgid "Fork name %s" msgstr "nazwa rozgałęzienia %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, fuzzy, python-format msgid "Pull request %s" msgstr "Połączonych gałęzi #%s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "[usunięte] repozytorium" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "[utworzone] repozytorium" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "[utworzone] repozytorium jako rozgałęzienie" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "[rozgałęzione] repozytorium" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "[zaktualizowane] repozytorium" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "[pobierz] archiwum z repozytorium" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "[skasowane] repozytorium" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "[utworzony] użytkownik" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "[zaktualizowany] użytkownik" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "[utworzona] grupa użytkowników" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "[zaktualizowana] grupa użytkowników" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "[komentarz] do zmiany w repozytorium" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "[komentarz] wniosek o połączenie gałęzi" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "[zamknięty] wniosek o połączenie gałęzi" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "[wysłane zmiany] w" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "[synchronizacja przez Kallithea] z repozytorium" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "[pobrano]" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "[start następnego] repozytorium" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "[zatrzymany po] repozytorium" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr " i %s więcej" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Brak plików" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "nowy plik" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "modyfikuj" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "kasuj" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "zmień nazwę" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1274,7 +1288,7 @@ msgstr "" "zmienione z systemie plików proszę uruchomić aplikację ponownie, aby " "ponownie przeskanować repozytoria" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1282,7 +1296,7 @@ msgstr[0] "%d rok" msgstr[1] "%d lata" msgstr[2] "%d lat" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1290,7 +1304,7 @@ msgstr[0] "%d miesiąc" msgstr[1] "%d miesięcy" msgstr[2] "%d miesięcy" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1298,7 +1312,7 @@ msgstr[0] "%d dzień" msgstr[1] "%d dni" msgstr[2] "%d dni" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1306,7 +1320,7 @@ msgstr[0] "%d godzina" msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1314,7 +1328,7 @@ msgstr[0] "%d minuta" msgstr[1] "%d minuty" msgstr[2] "%d minut" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1322,707 +1336,305 @@ msgstr[0] "%d sekunda" msgstr[1] "%d sekund" msgstr[2] "%d sekund" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "w %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "%s temu" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "w %s i %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "%s i %s temu" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "przed chwilą" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Brak dostępu do repozytorium" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Repozytorium do odczytu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Repozytorium do zapisu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Administracja dostępu do repozytorium" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Grupy repozytoriów brak dostępu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Grupy repozytoriów dostęp do odczytu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Grupy repozytoriów dostęp do zapisu" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Repozytoria Grupy dostęp administratora" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "Administrator Repo" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Tworzenie repozytorium jest wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Tworzenie repozytorium jest włączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Rozwidlenie repozytorium wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Rozwidlenie repozytorium włączone" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Rejestracja wyłączona" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Brak Korekty" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "Zaakceptowano" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "Odrzucono" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "Objęty Przeglądem" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "najwyższy poziom" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Grupy repozytoriów brak dostępu" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Grupy repozytoriów dostęp do odczytu" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Grupy repozytoriów dostęp do zapisu" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Repozytoria Grupy dostęp administratora" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Ta grupa użytkowników nie ma dostępu" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Dostęp do grupy parametrów użytkownika" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Ta grupa użytkowników ma prawo do zapisu" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Ta grupa użytkowników ma uprawnienia administratora" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Tworzenie grup repozytoriów wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Tworzenie grup repozytoriów włączone" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Tworzenie grup użytkowników wyłączone" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Tworzenie grup użytkowników właczone" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "Rejestracja wyłączona" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Rejestracja użytkownika z ręczną aktywacją konta" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "widziany %s" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Wymieniony]" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "najwyższy poziom" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "Administrator Repo" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 #, fuzzy msgid "Default user has read access to new repositories" msgstr "Nieautoryzowany dostęp do zasobów" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 #, fuzzy msgid "Default user has write access to new repositories" msgstr "Nieautoryzowany dostęp do zasobów" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 #, fuzzy msgid "Only admins can create repository groups" msgstr "Utworzono grupę repo %s" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Utworzono grupę repo %s" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 #, fuzzy msgid "Only admins can create user groups" msgstr "Tworzenie grup użytkowników" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 #, fuzzy msgid "Non-admins can create user groups" msgstr "Tworzenie grup użytkowników" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 #, fuzzy msgid "Only admins can fork repositories" msgstr "Ogólna liczba repozytoriów" -#: kallithea/model/db.py:1696 -#, fuzzy -#| msgid "Non-admins can can fork repositories" +#: kallithea/model/db.py:1733 +#, fuzzy msgid "Non-admins can fork repositories" msgstr "Unieważnia cache dla wszystkich repozytoriów" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "Rejestracja wyłączona" + +#: kallithea/model/db.py:1736 #, fuzzy msgid "User registration with manual account activation" msgstr "Rejestracja użytkownika z ręczną aktywacją konta" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 #, fuzzy msgid "User registration with automatic account activation" msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2263 #, fuzzy msgid "Not reviewed" msgstr "Brak Korekty" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 #, fuzzy msgid "Under review" msgstr "Objęty Przeglądem" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2265 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Zaakceptowano" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "Zaakceptowano" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Wpisz login" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Wprowadź wartość %(min)i znaków lub więcej" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Wpisz hasło" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Wpisz %(min)i lub więcej znaków" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, fuzzy, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "%(user)s skomentował zatwierdzenie %(when)s" - -#: kallithea/model/notification.py:256 -#, fuzzy, python-format -msgid "%(user)s sent message %(age)s" -msgstr "%(user)s wysłał wiadomość do %(when)s" - -#: kallithea/model/notification.py:257 -#, fuzzy, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "%(user)s wspomniał o Tobie w %(when)s" - -#: kallithea/model/notification.py:258 -#, fuzzy, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "%(user)s zarejestrował na stronie w %(when)s" - -#: kallithea/model/notification.py:259 -#, fuzzy, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" - -#: kallithea/model/notification.py:260 +#: kallithea/model/notification.py:165 #, fuzzy, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "%(user)s skomentował zatwierdzenie %(when)s" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "%(user)s wysłał wiadomość do %(when)s" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "%(user)s wspomniał o Tobie w %(when)s" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "%(user)s zarejestrował na stronie w %(when)s" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "[komentarz] wniosek o połączenie gałęzi" + +#: kallithea/model/notification.py:168 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "Użytkownik %(new_username)s zarejestrował" -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" - -#: kallithea/model/notification.py:309 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "[komentarz] wniosek o połączenie gałęzi" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 #, fuzzy msgid "Closing" msgstr "Używa:" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, fuzzy, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Create Pull Request" +msgid "Cannot create empty pull request" +msgstr "Stwórz nowe żądanie połączenia gałęzi" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "Potwierdź usunięcie połączenia gałęzi" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "ostatni tip" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "nowy użytkownik się zarejestrował" -#: kallithea/model/user.py:256 -#, fuzzy -msgid "You can't remove this user since it is crucial for the entire application" +#: kallithea/model/user.py:253 +#, fuzzy +msgid "" +"You can't remove this user since it is crucial for the entire application" msgstr "" "Nie możesz usunąć tego użytkownika ponieważ jest kluczowy dla całej " "aplikacji" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2031,16 +1643,16 @@ msgstr "" "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " "zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, fuzzy, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" msgstr "" "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " "zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2049,65 +1661,65 @@ msgstr "" "użytkownik \"%s\" wciąż posiada repozytoria następujące %s i nie może " "zostać usunięty. Zmień właściciela lub usuń te repozytoria. %s" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "łącze resetowania hasła" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 #, fuzzy msgid "Password reset notification" msgstr "łącze resetowania hasła" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "Wartość listy nie może być pusta" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Użytkownik \"%(username)s\" już istnieje" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 #, fuzzy msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" -msgstr "" -"Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia," -" kropki lub myślniki i muszą zaczynać się znakiem alfanumerycznym lub " +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" +"Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia, " +"kropki lub myślniki i muszą zaczynać się znakiem alfanumerycznym lub " "podkreśleniem" -#: kallithea/model/validators.py:126 +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:112 #, python-format msgid "Username %(username)s is not valid" msgstr "Nazwa użytkownika %(username)s jest nieprawidłowa" -#: kallithea/model/validators.py:152 +#: kallithea/model/validators.py:133 msgid "Invalid user group name" msgstr "Niewłaściwa nazwa grupy" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Nazwa grupy \"%(usergroup)s\" już istnieje" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2115,107 +1727,107 @@ msgstr "" "nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, " "kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "Nie można przypisać do tej grupy jako rodzic" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Nazwa grupy \"%(group_name)s\" już istnieje" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Repozytorium o nazwie \"%(group_name)s\" już istnieje" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "Nieprawidłowe znaki (nie-ascii) w haśle" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "Hasła różnią się" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 #, fuzzy msgid "Invalid username or password" msgstr "nieprawidłowe hasło" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:312 msgid "Token mismatch" msgstr "Niezgodność tokenu" -#: kallithea/model/validators.py:345 +#: kallithea/model/validators.py:328 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Nazwa repozytorium %(repo)s jest zabroniona" -#: kallithea/model/validators.py:347 +#: kallithea/model/validators.py:330 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Repozytorium o nazwie %(repo)s już istnieje" -#: kallithea/model/validators.py:348 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Repozytorium \"%(repo)s\" już istnieje w grupie \"%(group)s\"" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Grupa repozytoriów z nazwą \"%(repo)s\" już istnieje" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 #, fuzzy msgid "Invalid repository URL" msgstr "prywatne repozytorium" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "Fork musi być tego samego typu, jak rodzic" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "nie masz uprawnień do tworzenia repozytorium w tej grupie" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "To nie jest prawidłowa ścieżka" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 #, fuzzy msgid "This email address is already in use" msgstr "Ten adres e-mail jest już zajęty" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "e-mail \"%(email)s\" nie istnieje." -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -2223,250 +1835,155 @@ msgstr "" "Atrybut logowania CN do LDAP należy określić, jest to nazwa atrybutu, " "który jest odpowiednikiem \"username\"" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Proszę podać poprawny adres IPv4 lub IPv6" -#: kallithea/model/validators.py:775 +#: kallithea/model/validators.py:732 #, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "Rozmiar sieci (bits) może mieścić się w zakresie od 0-32 (nie %(bits)r)" - -#: kallithea/model/validators.py:808 +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" +"Rozmiar sieci (bits) może mieścić się w zakresie od 0-32 (nie %(bits)r)" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Klucz nazwy może składać się tylko z liter, podkreślenia, myślnika lub " "numerów" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "Nazwa pliku nie może znajdować się w katalogu" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Repozytorium" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "szybki filtr..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "repozytoria" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "Dodaj Repozytorium" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 msgid "Add Repository Group" msgstr "Dodaj Grupę Repozytoriów" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "Jako administrator uprawnienia tej grupy, i możesz je edytować" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "Edytuj Grupę Repozytoriów" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "Nazwa Grupy" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "Repozytorium" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "Opis" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Nazwa" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "Ostatnia akytwność" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "Ostatnia zmiana" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "Właściciel" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "Kliknij, aby posortować rosnąco" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "Kliknij, aby posortować malejąco" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Nie znaleziono repozytorium." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Błąd danych." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Wczytywanie..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "Zaloguj się" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "Zaloguj się do %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "Nazwa użytkownika" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "Hasło" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Zapamiętaj mnie" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "Zapomniałeś hasła?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "Nie masz konta?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "Zaloguj się" @@ -2474,153 +1991,136 @@ msgstr "Zaloguj się" msgid "Password Reset" msgstr "Łącze resetowania hasła" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, fuzzy, python-format msgid "Reset Your Password to %s" msgstr "Zapomniałeś hasła do %s?" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 #, fuzzy msgid "Reset Your Password" msgstr "Zapomniałeś hasła?" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "Adres Email" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:47 #, fuzzy msgid "Send Password Reset Email" msgstr "łącze resetowania hasła" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:52 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "Link do zresetowania hasła zostanie wysłany na adres e-mail" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 #, fuzzy msgid "New Password" msgstr "Nowe hasło" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 #, fuzzy msgid "Confirm New Password" msgstr "Nowe hasło" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "Zarejestruj się" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "Ponownie wprowadź hasło" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "Imię" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "Nazwisko" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Nie ma jeszcze gałęzi" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "Zamknięte Gałęzie" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Nie ma jeszcze tagów" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Nie ma jeszcze zakładek" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 #, fuzzy msgid "Admin Journal" msgstr "Dziennik administratora" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "szybkie wyszukiwanie..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 #, fuzzy msgid "Filter" msgstr "filtr" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, fuzzy, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2629,30 +2129,16 @@ msgstr[1] "%s wejść" msgstr[2] "%s wejść" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Działanie" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Repozytorium" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Data" @@ -2660,7 +2146,7 @@ msgstr "Data" msgid "From IP" msgstr "Z IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "Brak akcji" @@ -2669,76 +2155,76 @@ msgid "Authentication Settings" msgstr "Ustawienia Autentykacji" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "Autentykacja" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "Wtyczki Autentykacji" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "Włączone Wtyczki" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "Wtyczka" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "Zapisz" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 #, fuzzy msgid "Repository Defaults" msgstr "Repozytoria domyślne" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Typ" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Prywatne repozytorium" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2746,34 +2232,34 @@ msgstr "" "Prywatne repozytoria są widoczne tylko dla osób bezpośrednio dodanych " "jako współpracownicy." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 msgid "Enable statistics" msgstr "Włącz statystyki" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 msgid "Enable statistics window on summary page." msgstr "Włącz okno statystyk na stronie podsumowania." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 msgid "Enable downloads" msgstr "Włącz pobieranie" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "Włącz menu pobierania na stronie podsumowania." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "Włącz blokowanie" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "Włącz blokowanie pobierania w repozytorium." @@ -2782,45 +2268,45 @@ msgstr "Włącz blokowanie pobierania w repozytorium." msgid "Edit Gist" msgstr "Edytuj Gist" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "Opis Gist ..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "Trwałość Gist" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "Wygasa" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 #, fuzzy msgid "Never" msgstr "nigdy" @@ -2830,7 +2316,8 @@ msgid "Update Gist" msgstr "Zaktualizuj Gist" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "Anuluj" @@ -2853,16 +2340,16 @@ msgstr "Publiczne Gists" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "Utwórz Nowy Gist" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "Utworzono" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "Nie ma jeszcze żadnych gists" @@ -2871,45 +2358,45 @@ msgstr "Nie ma jeszcze żadnych gists" msgid "New Gist" msgstr "Nowy Gist" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "Utwórz Prywatny Gist" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "Utwórz Publiczny Gist" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "Zresetuj" @@ -2919,113 +2406,111 @@ msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "Adres URL" -#: kallithea/templates/admin/gists/show.html:37 +#: kallithea/templates/admin/gists/show.html:35 msgid "Public Gist" msgstr "Publiczny Gist" -#: kallithea/templates/admin/gists/show.html:39 +#: kallithea/templates/admin/gists/show.html:37 msgid "Private Gist" msgstr "Prywatny Gist" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "Usuń" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "Potwierdź aby usunąć ten Gist" -#: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 #: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 #: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 #: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Edycja" -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "utworzono" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "wyświetl jako raw" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "Moje konto" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "Profil" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 #, fuzzy msgid "Email Addresses" msgstr "Nowy adres e-mail" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 #, fuzzy msgid "Owned Repositories" msgstr "repozytoria" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "Utwórz repozytorium" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 @@ -3033,77 +2518,94 @@ msgstr "Utwórz repozytorium" msgid "Show Permissions" msgstr "Skopiuj uprawnienia" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "Potwierdź, aby usunąć to ip: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 #, fuzzy msgid "Expired" msgstr "Wygasa" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "Potwierdź, aby usunąć to ip: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 #, fuzzy msgid "Remove" msgstr "Usunięto" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 #, fuzzy msgid "No additional API keys specified" msgstr "Brak dodatkowych emaili" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 #, fuzzy msgid "New API key" msgstr "Nowe pole klucza" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "Dodaj" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "Główny" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "Potwierdź, aby usunąć ten e-mail: %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 #, fuzzy msgid "No additional emails specified." msgstr "Brak dodatkowych emaili" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "Nowy adres e-mail" @@ -3112,109 +2614,71 @@ msgstr "Nowy adres e-mail" msgid "Change Your Account Password" msgstr "Nowe hasło" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "Nowe hasło" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "Zmiana awataru na" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "Używa" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "Avatary są wyłączone" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 #, fuzzy msgid "Repositories You Own" msgstr "Nie znaleziono repozytorium." -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Nie znaleziono rekordów." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "Nazwa" #: kallithea/templates/admin/my_account/my_account_watched.html:1 #, fuzzy msgid "Repositories You are Watching" msgstr "Położenie repozytorium" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "Opcje powiadomień" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "Wszystkie" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "Komentarze" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "Połączone gałęzie" - -#: kallithea/templates/admin/notifications/notifications.html:30 -#, fuzzy -msgid "Mark All Read" -msgstr "Oznacz wszystko jako przeczytane" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "Brak powiadomień" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -#, fuzzy -msgid "Show Notification" -msgstr "Pokaż powiadomienia" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "Powiadomienia" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 #, fuzzy msgid "Default Permissions" msgstr "Domyślne uprawnienia" @@ -3230,18 +2694,24 @@ msgstr "Globalne" msgid "IP Whitelist" msgstr "Lista dozwolonych adresów IP" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "Dostęp anonimowy" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +#, fuzzy +#| msgid "Anonymous access" +msgid "Allow anonymous access" +msgstr "Dostęp anonimowy" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " @@ -3251,24 +2721,24 @@ msgstr "" "Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie " "niestandardowe uprawnienia w repozytoriach zostaną utracone" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:20 #, fuzzy msgid "Apply to all existing repositories" msgstr "Istniejące repozytorium?" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 msgid "Permissions for the Default user on new repositories." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "Repozytorium grupy" + #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "Repozytorium grupy" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " @@ -3278,21 +2748,21 @@ msgstr "" "Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie " "niestandardowe uprawnienia w repozytoriach zostaną utracone" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:33 #, fuzzy msgid "Apply to all existing repository groups" msgstr "Usuń ta grupę repozytoriów" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "Grupa użytkownika" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 #, fuzzy msgid "" "All default permissions on each user group will be reset to chosen " @@ -3301,143 +2771,143 @@ msgid "" msgstr "" "Wszystkie Uprawnienia domyślne każdej grupy użytkowników zostaną " "przywrócone do wybranego zezwolenia, trzeba pamiętać, że wszystkie " -"niestandardowe uprawnienia domyślne dla grup repozytorium zostaną " -"utracone" - -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +"niestandardowe uprawnienia domyślne dla grup repozytorium zostaną utracone" + +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy msgid "Top level repository creation" msgstr "Tworzenie repozytorium" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:61 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:64 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "Tworzenie grupy użytkowników" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:75 msgid "Repository forking" msgstr "Rozwidlanie repozytorium" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:78 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:82 msgid "Registration" msgstr "Rejestracja" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:88 msgid "External auth account activation" msgstr "Autoryzacja aktywacji zewnętrznego konta" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "Potwierdź, aby usunąć to ip: %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 #, fuzzy msgid "All IP addresses are allowed." msgstr "Wszystkie adresy IP są dozwolone" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "Nowy adres ip" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "Grupy Repozytoriów" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "Nazwa grupy" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "Rodzic gropy" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "Ustawienia" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "Zaawansowane" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "Uprawnienia" @@ -3462,12 +2932,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "Utworzono" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3479,8 +2949,30 @@ msgstr[2] "Potwierdź żeby usunąć grupę %s wraz z %s repozytoriami" msgid "Delete this repository group" msgstr "Usuń ta grupę repozytoriów" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "Disabled" +msgid "Visible" +msgstr "Wyłączone" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "Dodaj Repozytorium" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "Dodaj grupę użytkowników" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy msgid "User/User Group" @@ -3488,8 +2980,8 @@ msgstr "użytkownik/grupa użytkowników" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3498,110 +2990,105 @@ msgstr "domyślny" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy msgid "Revoke" msgstr "odwołane" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "Dodaj nowe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #, fuzzy msgid "Apply to children" msgstr "dotyczy dzieci" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "Oba" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" msgstr "" "Włącz blokowanie pobierania przez grupy. Opcja ta będzie stosowana do " "wszystkich innych grup i repozytoriów wewnątrz" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Remove this group" msgstr "Tworzenie grup użytkowników" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Confirm to delete this group" msgstr "Potwierdź usunięcie grupy użytkowników: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "Strona Główna" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "używając" +#, fuzzy, python-format +#| msgid "Repository Group: %s" +msgid "Repository group %s" +msgstr "Grupa Repozytoriów: %s" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 #, fuzzy msgid "Repository Groups Administration" msgstr "Repozytoria grup administracyjnych" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 #, fuzzy msgid "Number of Top-level Repositories" msgstr "Liczba najwyższego poziomu repozytorium" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 #, fuzzy msgid "Clone remote repository" msgstr "[utworzone] repozytorium" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." - -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" +"Powinna być krótka i na temat. Użyj pliku README dla dłuższych opisów." + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Opcjonalnie wybierz grupę do wprowadzenia tego repozytorium." -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "Rodzaj repozytorium do stworzenia." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Docelowa rewizja" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3630,27 +3117,27 @@ msgid "" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, fuzzy, python-format +#, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 #, fuzzy msgid "Extra Fields" msgstr "Dodatkowe pola" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "Zdalnie" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "Statystyki" @@ -3660,31 +3147,29 @@ msgid "Parent" msgstr "Rodzic gropy" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "Ustaw" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 #, fuzzy msgid "Manually set this repository as a fork of another from the list." msgstr "Ręczne ustawienie rozwidlenia z listy" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 #, fuzzy msgid "Public Journal Visibility" msgstr "Dziennik publiczny" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "Usuń z dziennika publicznego" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 #, fuzzy msgid "Add to Public Journal" msgstr "Dziennik publiczny" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 #, fuzzy msgid "" "All actions done in this repository will be visible to everyone in the " @@ -3693,41 +3178,41 @@ msgstr "" "Wszystkie działania wykonywane na tym repozytorium będą dostępne dla " "wszystkich w dzienniku publicznym" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #, fuzzy msgid "Change Locking" msgstr "Włącz blokowanie" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 #, fuzzy msgid "Confirm to unlock repository." msgstr "Potwierdź odblokowanie repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 #, fuzzy msgid "Unlock Repository" msgstr "Odblokowane repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 #, fuzzy msgid "Confirm to lock repository." msgstr "Potwierdź blokowanie repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 #, fuzzy msgid "Lock Repository" msgstr "Odblokowane repozytorium" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "Repozytorium nie jest zablokowane" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3735,18 +3220,18 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Potwierdź usunięcie repozytorium: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 #, fuzzy msgid "Delete this Repository" msgstr "Usuń ta grupę repozytoriów" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, fuzzy, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3754,15 +3239,15 @@ msgstr[0] "to repozytorium ma %s fork" msgstr[1] "to repozytorium ma %s forki" msgstr[2] "to repozytorium ma %s forków" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "Ustaw jako rozwidlenie" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "Usuń rozwidlenie" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3774,12 +3259,7 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "Unieważnij pamięć podręczną repozytorium" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -#, fuzzy -msgid "Confirm to invalidate repository cache." -msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 #, fuzzy msgid "" "Manually invalidate cache for this repository. On first access, the " @@ -3788,102 +3268,108 @@ msgstr "" "Ręcznie unieważnienie cache dla tego repozytorium. Przy pierwszym " "dostępie do repozytorium zostanie dodany do bufora ponownie" -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 #, fuzzy msgid "List of Cached Values" msgstr "Lista buforowanych wartości" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "Prefiks" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Klucz" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "Aktywny" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Potwierdź, aby usunąć to pole: %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "Nowe pole klucza" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "Nowa etykieta pola" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "Wpisz krótką etykietę" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "Nowy opis pola" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "Wprowadź opis pola" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 #, fuzzy msgid "Extra fields are disabled." msgstr "Avatary są wyłączone" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "prywatne repozytorium" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "[rozgałęzione] repozytorium" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Utworzone repozytorium %s" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "[pobieranie z zdalnego] do repozytorium" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "Potwierdź pull z zdalnej strony" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "prywatne repozytorium" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3893,35 +3379,40 @@ msgid "" "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "[utworzone] repozytorium" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Repozytorium" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "Zmiana właściciela tego repozytorium." -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "" @@ -3940,7 +3431,7 @@ msgstr "Potwierdź usunięcie aktualnych statystyk" msgid "Repositories Administration" msgstr "Administracja repozytoriami" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3962,7 +3453,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "Aktualizacja" @@ -3974,285 +3465,278 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "Wyślij" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "Nazwa strony" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "Sfera uwierzytelniania HTTP" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 #, fuzzy msgid "Save Settings" msgstr "Zapisz ustawienia" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +#, fuzzy +msgid "Custom Hooks" +msgstr "Niestandardowa aktualizacja" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -#, fuzzy -msgid "Custom Hooks" -msgstr "Niestandardowa aktualizacja" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "Nie udało się usunąć hooka" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "ponowne skanowanie opcji" -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:9 #, fuzzy msgid "Delete records of missing repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "Unieważnia cache dla wszystkich repozytoriów" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 #, fuzzy msgid "Check this to reload data and clear cache keys for all repositories." msgstr "Unieważnia cache dla wszystkich repozytoriów" -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "Install Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. " -"Current hooks will be updated to the latest version." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "Opcja odbudowy indeksowania" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 msgid "Build from scratch" msgstr "Buduj od podstaw" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "Indeksuj ponownie" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 +msgid "Kallithea configuration file" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:9 +msgid "Python version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 #, fuzzy msgid "Git version" msgstr "Edycja Uprawnień" -#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/templates/admin/settings/settings_system.html:12 msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "www" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "Wymagaj ssl dla operacji vcs" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "Pokaż rozmiar repozytorium po wysłaniu zmian" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "Logi poleceń wysłania zmian użytkowników" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "Logi poleceń połączenia gałęzi użytkowników" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "Aktualizacja repozytorium po wysłaniu zmian (aktualizacja hg)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 #, fuzzy msgid "Mercurial extensions" msgstr "Rozszerzenia Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 msgid "Enable largefiles extension" msgstr "Rozszerzenia dużych pliów" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 msgid "Enable hgsubversion extension" msgstr "Rozszerzenia hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 #, fuzzy msgid "Location of repositories" msgstr "Ogólna liczba repozytoriów" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." msgstr "" "Kliknij, aby odblokować. Musisz ponownie uruchomić Kallithea żeby " "wprowadzić to ustawienie w życie." -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "Główne" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "Używaj w repozytorium dodatkowych pól" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." -msgstr "Umożliwia przechowywanie dodatkowych niestandardowych pól w repozytorium." - -#: kallithea/templates/admin/settings/settings_visual.html:18 +msgstr "" +"Umożliwia przechowywanie dodatkowych niestandardowych pól w repozytorium." + +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "Pokaż wersję Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4269,94 +3753,103 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +#, fuzzy +msgid "Clone URL" +msgstr "Url klonowania" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "Pozycja panelu" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Rozmiar Repozytorium" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "Ikony" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Show private repository icon on repositories" msgstr "Pokazuj w prywatnym repo ikonę w repozytoriach" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:84 #, fuzzy msgid "Show public/private icons next to repository names." msgstr "Pokazuj w publicznym repo ikonę w repozytoriach" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 #, fuzzy msgid "Meta Tagging" msgstr "Tagowanie meta" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Dodaj grupę użytkowników" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4376,13 +3869,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "Użytkownik" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Potwierdź usunięcie grupy użytkowników: %s" @@ -4391,15 +3884,15 @@ msgstr "Potwierdź usunięcie grupy użytkowników: %s" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Nie ma jeszcze żadnego użytkownika" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Wybrane grupy użytkowników" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Dostępni użytkownicy" @@ -4414,17 +3907,17 @@ msgstr "Dodaj użytkownika" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "Użytkownicy" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "Potwierdzenie hasła" @@ -4443,12 +3936,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4457,7 +3950,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "Potwierdź usunięcie tego użytkownika: %s" @@ -4466,24 +3959,16 @@ msgstr "Potwierdź usunięcie tego użytkownika: %s" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "Potwierdzenie nowego hasła" @@ -4492,237 +3977,238 @@ msgstr "Potwierdzenie nowego hasła" msgid "Users Administration" msgstr "Administracja użytkownikami" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "Wystąpienia serwera: %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "Repozytorium mercurial" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "Repozytorium git" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 #, fuzzy msgid "Create Fork" msgstr "Usuń rozwidlenie" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "Podsumowanie" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "Dziennik zmian" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Pliki" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "Przełącz do" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "Pokaż Prośby Pobrania %s" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "Połączone gałęzie" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "Opcje" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 #, fuzzy msgid "Compare Fork" msgstr "Porównaj rozwidlenie" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "Porównaj" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "Szukaj" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "Odblokowany" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "zablokowane" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:174 msgid "Follow" msgstr "Obserwuj" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "Nie obserwuj" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Gałąź" -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "Stwórz nowe żądanie połączenia gałęzi" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "Pokaż Prośby Pobrania %s" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "Przełącz do" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "Pokaż ostatnią aktywność" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "Dziennik publiczny" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "Wyświetl publiczne gists" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 #, fuzzy msgid "All Public Gists" msgstr "Wszystkie publiczne gists" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 #, fuzzy msgid "My Public Gists" msgstr "Moje publiczne gists" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 #, fuzzy msgid "My Private Gists" msgstr "Moje prywatne gists" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "Połączone gałęzie" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 #, fuzzy msgid "Not Logged In" msgstr "Zaloguj się" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 #, fuzzy msgid "Login to Your Account" msgstr "Zaloguj się do swojego konta" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:379 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "Nie pamiętasz hasła?" -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:383 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Nie masz konta?" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "Wyloguj się" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 #, fuzzy msgid "Inherit defaults" msgstr "Repozytoria domyślne" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "Utwórz repozytorium" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" "Wybierz tę opcję, aby umożliwić stworzenie repozytorium dla tego " "użytkownika" -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/templates/base/default_perms_box.html:33 msgid "Create user groups" msgstr "Tworzenie grup użytkowników" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" "Wybierz tę opcję, aby umożliwić utworzenie grupy użytkowników dla tego " "użytkownika" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "Rozwidlenie repozytorium" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" "Wybierz tę opcję, aby umożliwić rozwidlania repozytorium dla tego " "użytkownika" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "Wyświetl" @@ -4731,156 +4217,152 @@ msgid "No permissions defined yet" msgstr "Nie ma jeszcze ustawionych uprawnień" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "Uprawnienia" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "Edycja Uprawnień" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:28 +msgid "Retry" +msgstr "" + +#: kallithea/templates/base/root.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#, fuzzy +msgid "Submitting ..." +msgstr "Przesyłanie..." + +#: kallithea/templates/base/root.html:30 +#, fuzzy +#| msgid "Enable downloads" +msgid "Unable to post" +msgstr "Włącz pobieranie" + +#: kallithea/templates/base/root.html:31 #, fuzzy msgid "Add Another Comment" msgstr "Dodaj kolejny komentarz" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:32 msgid "Stop following this repository" msgstr "Zakończyć obserwację tego repozytorium" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:33 msgid "Start following this repository" msgstr "Zacznij obserwację tego repozytorium" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:34 msgid "Group" msgstr "Grupa" -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "użytkownik" - -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:35 msgid "Loading ..." msgstr "Ładuję..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:36 msgid "loading ..." msgstr "ładuję ..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:37 msgid "Search truncated" msgstr "Szukaj obcięte" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:38 msgid "No matching files" msgstr "Nie ma plików pasujących" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:39 #, fuzzy msgid "Open New Pull Request from {0}" msgstr "Komentarz połączenia gałęzi %s" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:40 msgid "Open New Pull Request for {0} → {1}" msgstr "" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:41 #, fuzzy msgid "Show Selected Changesets {0} → {1}" msgstr "Pokaż wybrane zmiany __S -> __E" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:42 #, fuzzy msgid "Selection Link" msgstr "Wybór linku" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 #, fuzzy msgid "Collapse Diff" msgstr "Pliki różnic" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:44 #, fuzzy msgid "Expand Diff" msgstr "poprawka różnic" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:45 +#, fuzzy +msgid "No revisions" +msgstr "rewizja" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 msgid "Failed to revoke permission" msgstr "Nie udało się cofnąć uprawnienia" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:48 #, fuzzy msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "potwierdzić odwołanie pozwolenie na {0}: {1} ?" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "Wybrane zmiany" + +#: kallithea/templates/base/root.html:52 #, fuzzy msgid "Specify changeset" msgstr "Wybrane zmiany" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "%s Zakładki" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Autor" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Rewizja" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "%s Gałęzie" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "Kliknij, aby posortować rosnąco" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "Kliknij, aby posortować malejąco" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "Nie znaleziono rekordów." + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "Błąd danych." + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "Wczytywanie..." + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "%s Dziennik zmian" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4888,81 +4370,33 @@ msgstr[0] "pokazano %d z %d rewizji" msgstr[1] "pokazano %d z %d rewizji" msgstr[2] "pokazano %d z %d rewizji" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "Wyczyść zaznaczenie" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 #, fuzzy msgid "Go to tip of repository" msgstr "Potwierdź blokowanie repozytorium" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "porównaj gałęzie %s" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, fuzzy, python-format msgid "Compare fork with parent repository (%s)" msgstr "porównaj gałęzie %s" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 #, fuzzy msgid "Branch filter:" msgstr "filtr" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, fuzzy, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "Status grupy zmian: %s⏎ Kliknij, aby otworzyć prośby pobrania #%s" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "Status grupy zmian: %s" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "Komentarze Grupy zmian" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "Zakładki %s" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "Tagi %s" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "Gałęzie %s" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "Nie ma jeszcze zmian" @@ -4978,7 +4412,7 @@ msgstr "Zmiana" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "Dodana" @@ -4992,104 +4426,116 @@ msgstr "Dodana" msgid "Affected %s files" msgstr "Zarażone pliki %s" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "Ostatnia zmiana" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "Gałąź/Etykieta" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -#, fuzzy -msgid "Push new repository" -msgstr "Wyślij zmiany do nowego repo" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" -msgstr "Istniejące repozytorium?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, fuzzy, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "Status grupy zmian: %s⏎ Kliknij, aby otworzyć prośby pobrania #%s" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, fuzzy, python-format +msgid "Changeset status: %s by %s" +msgstr "Status grupy zmian: %s" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%d comment" +#| msgid_plural "%d comments" +msgid "%s comments" +msgstr "%d komentarz" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "Zakładki %s" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "Tagi %s" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "Gałęzie %s" #: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "%s Grupy zmian" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "Status grupy zmian" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "Raw różnic" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "Poprawka różnic" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "Pobierz różnice" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 #, fuzzy msgid "Merge" msgstr "połącz" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 #, fuzzy msgid "Grafted from:" msgstr "Utworzono" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 #, fuzzy msgid "Replaced by:" msgstr "utworzono" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 #, fuzzy msgid "Preceded by:" msgstr "utworzono" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5097,9 +4543,9 @@ msgstr[0] "%s plik został zmieniony" msgstr[1] "%s pliki zostały zmienione" msgstr[2] "%s plików zostało zmienionych" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5107,19 +4553,20 @@ msgstr[0] "%s plik został zmieniony z %s inercjami i %s usunięciami" msgstr[1] "%s plików zostało zmienionych z %s inercjami i %s usunięciami" msgstr[2] "%s plików zostało zmienionych z %s inercjami i %s usunięciami" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 #, fuzzy msgid "Show full diff anyway" msgstr "Pokaż pełną historię" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -#, fuzzy -msgid "No revisions" -msgstr "rewizja" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#, fuzzy +#| msgid "Comment" +msgid "comment" +msgstr "Komentarz" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy @@ -5141,61 +4588,61 @@ msgstr "Brak zestawienia zmian" msgid "Delete comment?" msgstr "%d komentarz" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 #, fuzzy msgid "Status change" msgstr "Ostatnia aktywność" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "Komentując linię {1}." - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "Komentarze analizowane za pomocą %s składni od %s wsparcia." - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -#, fuzzy -msgid "Use @username inside this text to notify another user" +#: kallithea/templates/changeset/changeset_file_comment.html:87 +#, fuzzy +msgid "Comments are in plain text. Use @username to notify another user." msgstr "" "Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do " "użytkownika strony" -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "Podgląd komentarza" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -#, fuzzy -msgid "Submitting ..." -msgstr "Przesyłanie..." - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#, fuzzy +msgid "Set changeset status" +msgstr "Zmiana statusu grupy zmian" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "Zagłosuj na żądanie na grupę zmian" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +#, fuzzy +msgid "No change" +msgstr "Bez zmian" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "Komentarz połączenia gałęzi %s" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +#, fuzzy +msgid "Close" +msgstr "(zamknięty)" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "Komentarz" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "Podgląd" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "Musisz być zalogowany żeby komentarz." -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "Zaloguj się teraz" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "Ukryj" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -5203,7 +4650,7 @@ msgstr[0] "%d komentarz" msgstr[1] "%d komentarzy" msgstr[2] "%d komentarzy" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, fuzzy, python-format msgid "%d inline" msgid_plural "%d inline" @@ -5211,120 +4658,122 @@ msgstr[0] "(%d linii)" msgstr[1] "(%d linii)" msgstr[2] "(%d linii)" -#: kallithea/templates/changeset/changeset_file_comment.html:108 -#, fuzzy, python-format +#: kallithea/templates/changeset/changeset_file_comment.html:155 +#, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -#, fuzzy -msgid "Use @username inside this text to notify another user." -msgstr "" -"Użyj @username wewnątrz tego tekstu, aby wysłać powiadomienie do " -"użytkownika strony" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "Zagłosuj na żądanie na grupę zmian" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -#, fuzzy -msgid "Set changeset status" -msgstr "Zmiana statusu grupy zmian" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -#, fuzzy -msgid "No change" -msgstr "Bez zmian" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -#, fuzzy -msgid "Close" -msgstr "(zamknięty)" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "%s Zestawienie zmian" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "Status grupy zmian: %s" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "Pliki naruszone" -#: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:43 -msgid "Show full diff for this file" -msgstr "Pokaż pełną edycję tego pliku" - -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 -msgid "Show full side-by-side diff for this file" -msgstr "Pokaż pełną listę zmian i różnic obok siebie" - -#: kallithea/templates/changeset/diff_block.html:38 -msgid "Show inline comments" -msgstr "Pokaż online komentarz" - -#: kallithea/templates/changeset/diff_block.html:86 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "plik usunięty" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Ostatnio modyfikowany" + +#: kallithea/templates/changeset/diff_block.html:42 #, fuzzy msgid "Deleted" msgstr "usuń" -#: kallithea/templates/changeset/diff_block.html:89 +#: kallithea/templates/changeset/diff_block.html:44 #, fuzzy msgid "Renamed" msgstr "zmień nazwę" -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Nieznana wersja %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Brak nazwy pliku" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "plik dodany" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:43 +msgid "Show full diff for this file" +msgstr "Pokaż pełną edycję tego pliku" + +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 +msgid "Show full side-by-side diff for this file" +msgstr "Pokaż pełną listę zmian i różnic obok siebie" + +#: kallithea/templates/changeset/diff_block.html:72 +msgid "Show inline comments" +msgstr "Pokaż online komentarz" + +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "Brak zestawienia zmian" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "Przodek" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "Skomentuj grupę zmian" + +#: kallithea/templates/compare/compare_cs.html:40 #, fuzzy msgid "Show merge diff" msgstr "Pokaż pełną historię" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -#, fuzzy -msgid "Common ancestor" -msgstr "Skomentuj grupę zmian" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 #, fuzzy msgid "is" msgstr "Gist" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, fuzzy, python-format msgid "%s changesets" msgstr "%s Zestawienie zmian" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 #, fuzzy msgid "behind" msgstr "Indeksuj ponownie" @@ -5336,20 +4785,20 @@ msgid "%s Compare" msgstr "%s Porównaj" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5357,111 +4806,166 @@ msgstr[0] "Pokaż %s komentarz" msgstr[1] "Pokaż %s komentarze" msgstr[2] "Pokaż %s komentarze" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "Pokaż pełną historię" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "Publiczne repozytorium" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "Nie ma jeszcze zestawienia zmian" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "Subskrybuj %s kanał rss" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "Subskrybuj %s kanał atom" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s skomentował zatwierdzenie %(when)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 #, fuzzy, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "Status zestawienia zmian został zmieniony na" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Comment on Changeset \"%s\"" +msgstr "%(user)s skomentował zatwierdzenie %(when)s" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "Przepływ zestawienia zmian" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "gałąź" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Ostatnia aktywność" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "Repozytorium nie jest zablokowane" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "Witaj %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 #, fuzzy msgid "We have received a request to reset the password for your account." msgstr "Otrzymaliśmy prośbę o utworzenie nowego hasła do twojego konta." -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 +#: kallithea/templates/email_templates/pull_request.html:4 #, fuzzy, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, fuzzy, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#| msgid "[commented] on pull request for" +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "[komentarz] wniosek o połączenie gałęzi" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +msgid "Pull request" +msgstr "Połączonych gałęzi #%s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, fuzzy, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -#, fuzzy -msgid "The comment closed the pull request with status" -msgstr "%s skomentował nowe połączenie gałęzi \"%s\"" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -#, fuzzy -msgid "The comment was made with status" -msgstr "Wniosek połączenia został zamknięty ze statusem" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "Zobacz tego użytkownika tutaj" +#| msgid "%(user)s commented on pull request %(age)s" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Połączonych gałęzi #%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[komentarz] wniosek o połączenie gałęzi" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Nazwa grupy" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5479,7 +4983,7 @@ msgid "%s File Diff" msgstr "%s Pliki różnic" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "Pliki %s" @@ -5489,74 +4993,76 @@ msgstr "Pliki %s" msgid "%s Files Add" msgstr "Pliki %s" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Położenie" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "lub" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "Nowy tryb pliku" +#, fuzzy +msgid "New file type" +msgstr "nowy plik" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 #, fuzzy msgid "Commit Changes" msgstr "Zatwierdź zmiany" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "poprzednia wersja" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "następna wersja" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "Obserwuj aktualną gałąź" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "Wczytywanie listy plików..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Rozmiar" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "Rewizja" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 #, fuzzy msgid "Last Modified" msgstr "Ostatnio modyfikowany" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 #, fuzzy msgid "Last Committer" msgstr "Autor" @@ -5567,7 +5073,7 @@ msgid "%s Files Delete" msgstr "%s Usuń Plik" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "Usuń plik" @@ -5580,24 +5086,20 @@ msgstr "" msgid "Edit file" msgstr "Edytuj plik" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Źródło" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "Edycja pliku" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5606,53 +5108,65 @@ msgstr[0] "%s autor" msgstr[1] "%s autorzy" msgstr[2] "%s autorzy" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "Pokaż źródło" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "Usunięta gałąź: %s" + +#: kallithea/templates/files/files_source.html:37 msgid "Editing binary files not allowed" msgstr "Edycja plików binarnych jest zabroniona" -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:40 msgid "Editing files allowed only when on branch head revision" msgstr "" "Edycja plików dozwolona tylko wtedy, gdy rewizja jest w trakcie rewizji " "głównej gałęzi" -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/files/files_source.html:41 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "Plik binarny (%s)" +#: kallithea/templates/files/files_source.html:69 +#, fuzzy +msgid "File is too big to display." +msgstr "Plik jest za duży do wyświetlenia" + +#: kallithea/templates/files/files_source.html:71 +#, fuzzy +msgid "Show full annotation anyway." +msgstr "Pokaż pełną historię" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" -msgstr "Plik jest za duży do wyświetlenia" +#, fuzzy +msgid "Show as raw." +msgstr "wyświetl jako raw" #: kallithea/templates/files/files_ypjax.html:5 msgid "annotation" @@ -5672,12 +5186,12 @@ msgid "%s Followers" msgstr "Obserwatorzy %s" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "Obserwuje" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "Rozpoczęto obserwację -" @@ -5686,36 +5200,36 @@ msgstr "Rozpoczęto obserwację -" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "Nazwa rozgałęzienia" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 #, fuzzy msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "Wersja domyślna dla plików stronicowania, pobierania plików, readme" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Prywatny" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Skopiuj uprawnienia" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "Skopiuj zezwolenia z rozwidlenia repozytorium" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "Aktualizuj po klonowaniu" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "Sprawdź źródło po wykonaniu klonowania" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5725,40 +5239,40 @@ msgid "%s Forks" msgstr "Gałąź %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "Gałęzie" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "Rozgałęziony" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "Nie ma jeszcze gałęzi" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 msgid "ATOM journal feed" msgstr "Dziennik kanału ATOM" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "Dziennik kanału RSS" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "Moje Repozytoria" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "Brak wpisów jeszcze" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "Publiczny dziennik kanału ATOM" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "Publiczny dziennik kanału RSS" @@ -5768,31 +5282,36 @@ msgstr "Publiczny dziennik kanału RSS" msgid "New Pull Request" msgstr "Nowa prośba o połączenie gałęzi" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "Tytuł" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "Napisz krótki opis tego tego połączenia gałęzi" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "Przepływ zestawienia zmian" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "Repozytorium git" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "Rewizja" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "Repozytorium docelowe" @@ -5806,6 +5325,10 @@ msgstr "Brak wpisów jeszcze" msgid "Vote" msgstr "odwołane" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "Ostatnia zmiana" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5829,7 +5352,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "Zamknięte" @@ -5857,115 +5380,106 @@ msgstr "%s Połączonych gałęzi #%s" msgid "Pull request %s from %s#%s" msgstr "Połączonych gałęzi #%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 #, fuzzy msgid "Summarize the changes" msgstr "Zatwierdź zmiany" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "Nie ma jeszcze recenzenta" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "%d recenzent" -msgstr[1] "%d recenzenci" -msgstr[2] "%d recenzentów" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "Połączenie gałęzi zostało zweryfikowane przez wszystkich recenzentów" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -#, fuzzy -msgid "There are no reviewers" -msgstr "Nie ma jeszcze gałęzi" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 #, fuzzy msgid "on" msgstr "brak" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "Pobierz zmiany" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -#, fuzzy -msgid "Update" -msgstr "[zaktualizowany] użytkownik" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "Rejestracja" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -#, fuzzy -msgid "Pull Request Reviewers" -msgstr "Recenzje wniosków połączenia gałęzi" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#, fuzzy +msgid "Cancel Changes" +msgstr "Ostatnia aktywność" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#, fuzzy +#| msgid "reviewer" +msgid "Reviewers" +msgstr "recenzent" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 #, fuzzy msgid "Remove reviewer" msgstr "recenzent" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 #, fuzzy msgid "Potential Reviewers" msgstr "Podgląd komentarza" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -#, fuzzy -msgid "Save as New Pull Request" -msgstr "Otwórz nową prośbę o połączenie gałęzi" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -#, fuzzy -msgid "Cancel Changes" -msgstr "Ostatnia aktywność" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 #, fuzzy msgid "Pull Request Content" msgstr "Wniosek połączenia zmienił status" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +#, fuzzy +msgid "Common ancestor" +msgstr "Skomentuj grupę zmian" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5973,7 +5487,6 @@ msgstr "%s Moje prośby połączenia gałęzi" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull Requests from '%s'" msgstr "Połączonych gałęzi #%s" @@ -5982,37 +5495,43 @@ msgstr "Połączonych gałęzi #%s" msgid "Pull Requests to '%s'" msgstr "Połączonych gałęzi #%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 #, fuzzy msgid "Open New Pull Request" msgstr "Otwórz nową prośbę o połączenie gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "Pokaż Prośby Pobrania %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "Pokaż Prośby Pobrania %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 #, fuzzy msgid "Pull Requests Created by Me" msgstr "Recenzje wniosków połączenia gałęzi" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Recenzje wniosków połączenia gałęzi" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 #, fuzzy msgid "Pull Requests I Participate In" msgstr "Biorę udział w" @@ -6028,29 +5547,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "Szukaj we wszystkich repozytoriach" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "Szukana fraza" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "Szukaj w" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "Zawartość pliku" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "Komunikaty" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "Nazwy plików" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "Brak uprawnień" @@ -6060,80 +5579,80 @@ msgid "%s Statistics" msgstr "%s Statystyki" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "%s RSS" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "Włącz" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "Statystyki zebrane: " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "pliki" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "Pokaż więcej" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "komunikaty" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "pliki dodane" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "pliki zmienione" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "pliki usunięte" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "komunikaty" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "plik dodany" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "plik zmieniony" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "plik usunięty" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "Podsumowanie %s" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "Repozytorium zablokowane przez %s" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "Repozytorium odblokowane" @@ -6141,93 +5660,280 @@ msgstr "Repozytorium odblokowane" msgid "Fork of" msgstr "Gałąź z" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "Klonuj z" -#: kallithea/templates/summary/summary.html:72 -#, fuzzy -msgid "Clone URL" -msgstr "Url klonowania" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "Pokaż ID" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" msgstr "Pokaż nazwę" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "Pokaż ID" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "Statystyki" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "Pobierz" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "Nie pobrano jeszcze plików" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "Pliki do pobrania są zostały wyłączone dla tego repozytorium" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "Pobierz jako zip" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "Zaznacz tu żeby pobrać archiwum z subrepozytorium" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 #, fuzzy msgid "With subrepos" msgstr "z subrepozytorium" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Rozmiar Repozytorium" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "Kanał RSS" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 #, fuzzy msgid "Latest Changes" msgstr "Ostatnia aktywność" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:177 #, fuzzy msgid "Quick Start" msgstr "Szybki start" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "Dodaj lub prześlij pliki bezpośrednio przez stronę" + +#: kallithea/templates/summary/summary.html:196 +#, fuzzy +msgid "Push new repository" +msgstr "Wyślij zmiany do nowego repo" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "Istniejące repozytorium?" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "Pobierz %s jak %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "Etykiety pliku %s" - -#: kallithea/templates/tags/tags.html:26 -#, fuzzy -msgid "Compare Tags" -msgstr "Porównaj tagi" - -#~ msgid "increase diff context to %(num)s lines" +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "Nie ma szukanego indeksu. Proszę uruchomić indeksowanie whoosh" + +#~ msgid "IP %s not allowed" +#~ msgstr "Obserwatorzy %s" + +#, fuzzy +#~ msgid "%(user)s commented on changeset %(age)s" +#~ msgstr "%(user)s skomentował zatwierdzenie %(when)s" + +#, fuzzy +#~ msgid "%(user)s sent message %(age)s" +#~ msgstr "%(user)s wysłał wiadomość do %(when)s" + +#, fuzzy +#~ msgid "%(user)s mentioned you %(age)s" +#~ msgstr "%(user)s wspomniał o Tobie w %(when)s" + +#, fuzzy +#~ msgid "%(user)s registered in Kallithea %(age)s" +#~ msgstr "%(user)s zarejestrował na stronie w %(when)s" + +#, fuzzy +#~ msgid "%(user)s opened new pull request %(age)s" +#~ msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" + +#, fuzzy +#~ msgid "%(user)s commented on pull request %(age)s" +#~ msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" + +#~ msgid "%(user)s commented on changeset at %(when)s" +#~ msgstr "%(user)s skomentował zatwierdzenie %(when)s" + +#~ msgid "%(user)s sent message at %(when)s" +#~ msgstr "%(user)s wysłał wiadomość do %(when)s" + +#~ msgid "%(user)s mentioned you at %(when)s" +#~ msgstr "%(user)s wspomniał o Tobie w %(when)s" + +#~ msgid "%(user)s registered in Kallithea at %(when)s" +#~ msgstr "%(user)s zarejestrował na stronie w %(when)s" + +#~ msgid "%(user)s opened new pull request at %(when)s" +#~ msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" + +#~ msgid "%(user)s commented on pull request at %(when)s" +#~ msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" + +#, fuzzy +#~| msgid "Repository group" +#~ msgid "Repository Group" +#~ msgstr "Repozytorium grupy" + +#~ msgid "My Notifications" +#~ msgstr "Opcje powiadomień" + +#~ msgid "All" +#~ msgstr "Wszystkie" + +#~ msgid "Comments" +#~ msgstr "Komentarze" + +#, fuzzy +#~ msgid "Mark All Read" +#~ msgstr "Oznacz wszystko jako przeczytane" + +#, fuzzy +#~| msgid "Mark All Read" +#~ msgid "Mark as read" +#~ msgstr "Oznacz wszystko jako przeczytane" + +#~ msgid "No notifications here yet" +#~ msgstr "Brak powiadomień" + +#, fuzzy +#~ msgid "Show Notification" +#~ msgstr "Pokaż powiadomienia" + +#~ msgid "Notifications" +#~ msgstr "Powiadomienia" + +#~ msgid "Home" +#~ msgstr "Strona Główna" + +#~ msgid "with" +#~ msgstr "używając" + +#~ msgid "members" +#~ msgstr "użytkownik" + +#~ msgid "Changeset has comments" +#~ msgstr "Komentarze Grupy zmian" + +#~ msgid "Author" +#~ msgstr "Autor" + +#~ msgid "Refs" +#~ msgstr "Gałąź/Etykieta" + +#, fuzzy +#~ msgid "Commenting on line." +#~ msgstr "Komentując linię {1}." + +#, fuzzy +#~| msgid "on pull request" +#~ msgid "Pull request from" +#~ msgstr "Komentarz połączenia gałęzi %s" + +#, fuzzy +#~| msgid "Date" +#~ msgid "at" +#~ msgstr "Data" + +#~ msgid "Previous revision" +#~ msgstr "poprzednia wersja" + +#~ msgid "Next revision" +#~ msgstr "następna wersja" + +#~ msgid "Follow current branch" +#~ msgstr "Obserwuj aktualną gałąź" + +#~ msgid "Still not reviewed by" +#~ msgstr "Nie ma jeszcze recenzenta" + +#~ msgid "%d reviewer" +#~ msgid_plural "%d reviewers" +#~ msgstr[0] "%d recenzent" +#~ msgstr[1] "%d recenzenci" +#~ msgstr[2] "%d recenzentów" + +#~ msgid "Pull request was reviewed by all reviewers" #~ msgstr "" +#~ "Połączenie gałęzi zostało zweryfikowane przez wszystkich recenzentów" + +#, fuzzy +#~ msgid "There are no reviewers" +#~ msgstr "Nie ma jeszcze gałęzi" + +#, fuzzy +#~ msgid "Pull Request Reviewers" +#~ msgstr "Recenzje wniosków połączenia gałęzi" + +#~ msgid "Dashboard" +#~ msgstr "Repozytorium" + +#~ msgid "Group Name" +#~ msgstr "Nazwa Grupy" + +#~ msgid "Remember me" +#~ msgstr "Zapamiętaj mnie" + +#~ msgid "Change your avatar at" +#~ msgstr "Zmiana awataru na" + +#~ msgid "Using" +#~ msgstr "Używa" + +#~ msgid "Rescan option" +#~ msgstr "ponowne skanowanie opcji" + +#~ msgid "Web" +#~ msgstr "www" + +#~ msgid "Require SSL for vcs operations" +#~ msgstr "Wymagaj ssl dla operacji vcs" + +#~ msgid "Dashboard items" +#~ msgstr "Pozycja panelu" + +#~ msgid "quick filter..." +#~ msgstr "szybki filtr..." + +#~ msgid "Forgot password ?" +#~ msgstr "Nie pamiętasz hasła?" + +#~ msgid "Ancestor" +#~ msgstr "Przodek" + +#~ msgid "The changeset status was changed to" +#~ msgstr "Status zestawienia zmian został zmieniony na" + +#, fuzzy +#~ msgid "The comment closed the pull request with status" +#~ msgstr "%s skomentował nowe połączenie gałęzi \"%s\"" + +#, fuzzy +#~ msgid "The comment was made with status" +#~ msgstr "Wniosek połączenia został zamknięty ze statusem" + +#~ msgid "View this user here" +#~ msgstr "Zobacz tego użytkownika tutaj" + +#~ msgid "Repository Size" +#~ msgstr "Rozmiar Repozytorium" #~ msgid "No comments." #~ msgstr "Brak komentarzy." @@ -6238,12 +5944,6 @@ msgstr "Porównaj tagi" #~ msgid "journal" #~ msgstr "dziennik" -#~ msgid "bad captcha" -#~ msgstr "" - -#~ msgid "unmodified" -#~ msgstr "" - #~ msgid "Locked repository" #~ msgstr "Zablokowane repozytorium" @@ -6265,9 +5965,6 @@ msgstr "Porównaj tagi" #~ msgid "No Files" #~ msgstr "Brak Plików" -#~ msgid "" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "Nazwa użytkownika \"%(username)s\" jest zabroniona" @@ -6280,11 +5977,10 @@ msgstr "Porównaj tagi" #~ msgid "invalid clone URL" #~ msgstr "nieprawidłowe url klonowania" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "Nieprawidłowe url klonowania, wstaw prawidłowy url http(s)/svn+http(s)" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" +#~ msgid "" +#~ "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" #~ msgstr "" +#~ "Nieprawidłowe url klonowania, wstaw prawidłowy url http(s)/svn+http(s)" #~ msgid "Defaults" #~ msgstr "Domyślne" @@ -6298,36 +5994,9 @@ msgstr "Porównaj tagi" #~ msgid "My Permissions" #~ msgstr "Moje uprawnienia" -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "Confirm to reset this api key: %s" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "Confirm to remove this api key: %s" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - #~ msgid "delete" #~ msgstr "usuń" -#~ msgid "current IP" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "Uprawnienia administracji" @@ -6337,9 +6006,6 @@ msgstr "Porównaj tagi" #~ msgid "Overwrite existing settings" #~ msgstr "Nadpisz ustawienia" -#~ msgid "Default IP Whitelist for All Users" -#~ msgstr "" - #~ msgid "Default User Permissions Overview" #~ msgstr "Domyślne uprawnienia" @@ -6355,14 +6021,9 @@ msgstr "Porównaj tagi" #~ msgid "admin" #~ msgstr "administracja" -#~ msgid "delegated admin" +#~ msgid "Optional URL from which repository should be cloned." #~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - -#~ msgid "Optional URL from which repository should be cloned." -#~ msgstr "Opcjonalnie http[s] url z którego repozytorium powinno być klonowane." +#~ "Opcjonalnie http[s] url z którego repozytorium powinno być klonowane." #~ msgid "Remote URL" #~ msgstr "Url klonowania" @@ -6370,81 +6031,18 @@ msgstr "Porównaj tagi" #~ msgid "Pull Changes from Remote Location" #~ msgstr "Pobierz z zdalnej lokalizacji" -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - #~ msgid "Non-changeable id" #~ msgstr "Brak zmiennej id" #~ msgid "edit" #~ msgstr "edycja" -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - #~ msgid "Destroy old data" #~ msgstr "Zniszcz stare dane" -#~ msgid "check for updates" -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "Domyślne uprawnienia" -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "Zmiana statusu w grupie zmian" @@ -6463,21 +6061,9 @@ msgstr "Porównaj tagi" #~ msgid "My Repos" #~ msgstr "Moje repo" -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - #~ msgid "owner" #~ msgstr "właściciel" -#~ msgid "reviewer" -#~ msgstr "recenzent" - #~ msgid "Your new Kallithea password:%s" #~ msgstr "Nowe hasło do strony: %s" @@ -6496,6 +6082,157 @@ msgstr "Porównaj tagi" #~ msgid "Created by" #~ msgstr "utworzono" -#~ msgid "You can only delete files with revision being a valid branch " +#~ msgid "Confirm to invalidate repository cache." +#~ msgstr "Potwierdź unieważnienie pamięci podręcznej repozytorium" + +#~ msgid "Comments parsed using %s syntax with %s support." +#~ msgstr "Komentarze analizowane za pomocą %s składni od %s wsparcia." + +#~ msgid "Comment preview" +#~ msgstr "Podgląd komentarza" + +#~ msgid "Preview" +#~ msgstr "Podgląd" + +#~ msgid "New file mode" +#~ msgstr "Nowy tryb pliku" + +#~ msgid "Closing." +#~ msgstr "Zamknięcie." + +#~ msgid "Repository no access" +#~ msgstr "Brak dostępu do repozytorium" + +#~ msgid "Repository read access" +#~ msgstr "Repozytorium do odczytu" + +#~ msgid "Repository write access" +#~ msgstr "Repozytorium do zapisu" + +#~ msgid "Repository admin access" +#~ msgstr "Administracja dostępu do repozytorium" + +#~ msgid "Repository Group no access" +#~ msgstr "Grupy repozytoriów brak dostępu" + +#~ msgid "Repository Group read access" +#~ msgstr "Grupy repozytoriów dostęp do odczytu" + +#~ msgid "Repository Group write access" +#~ msgstr "Grupy repozytoriów dostęp do zapisu" + +#~ msgid "Repository Group admin access" +#~ msgstr "Repozytoria Grupy dostęp administratora" + +#~ msgid "Repository creation disabled" +#~ msgstr "Tworzenie repozytorium jest wyłączone" + +#~ msgid "Repository creation enabled" +#~ msgstr "Tworzenie repozytorium jest włączone" + +#~ msgid "Repository forking disabled" +#~ msgstr "Rozwidlenie repozytorium wyłączone" + +#~ msgid "Repository forking enabled" +#~ msgstr "Rozwidlenie repozytorium włączone" + +#~ msgid "Register disabled" +#~ msgstr "Rejestracja wyłączona" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Rejestracja nowego użytkownika na stronie z ręczną aktywacją" + +#~ msgid "Register new user with Kallithea with auto activation" #~ msgstr "" - +#~ "Rejestracja nowego użytkownika na stronie z automatyczną aktywacją" + +#~ msgid "Not Reviewed" +#~ msgstr "Brak Korekty" + +#~ msgid "Rejected" +#~ msgstr "Odrzucono" + +#~ msgid "Under Review" +#~ msgstr "Objęty Przeglądem" + +#~ msgid "Repository group no access" +#~ msgstr "Grupy repozytoriów brak dostępu" + +#~ msgid "Repository group read access" +#~ msgstr "Grupy repozytoriów dostęp do odczytu" + +#~ msgid "Repository group write access" +#~ msgstr "Grupy repozytoriów dostęp do zapisu" + +#~ msgid "Repository group admin access" +#~ msgstr "Repozytoria Grupy dostęp administratora" + +#~ msgid "User group no access" +#~ msgstr "Ta grupa użytkowników nie ma dostępu" + +#~ msgid "User group read access" +#~ msgstr "Dostęp do grupy parametrów użytkownika" + +#~ msgid "User group write access" +#~ msgstr "Ta grupa użytkowników ma prawo do zapisu" + +#~ msgid "User group admin access" +#~ msgstr "Ta grupa użytkowników ma uprawnienia administratora" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Tworzenie grup repozytoriów wyłączone" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Tworzenie grup repozytoriów włączone" + +#~ msgid "User Group creation disabled" +#~ msgstr "Tworzenie grup użytkowników wyłączone" + +#~ msgid "User Group creation enabled" +#~ msgstr "Tworzenie grup użytkowników właczone" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Rejestracja użytkownika z ręczną aktywacją konta" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" + +#~ msgid "repositories" +#~ msgstr "repozytoria" + +#~ msgid "No repositories found." +#~ msgstr "Nie znaleziono repozytorium." + +#~ msgid "There are no branches yet" +#~ msgstr "Nie ma jeszcze gałęzi" + +#~ msgid "There are no tags yet" +#~ msgstr "Nie ma jeszcze tagów" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Nie ma jeszcze zakładek" + +#~ msgid "%s Bookmarks" +#~ msgstr "%s Zakładki" + +#~ msgid "%s Branches" +#~ msgstr "%s Gałęzie" + +#~ msgid "Editing file" +#~ msgstr "Edycja pliku" + +#~ msgid "Update" +#~ msgstr "[zaktualizowany] użytkownik" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Otwórz nową prośbę o połączenie gałęzi" + +#~ msgid "%s Tags" +#~ msgstr "Etykiety pliku %s" + +#~ msgid "Compare Tags" +#~ msgstr "Porównaj tagi" diff --git a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po @@ -8,98 +8,123 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" "PO-Revision-Date: 2014-02-13 14:34+0000\n" "Last-Translator: marcinkuzminski \n" -"Language-Team: Portuguese (Brazil) " -"\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Language-Team: Portuguese (Brazil) \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +"Plural-Forms: nplurals=2; plural=(n > 1)\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "Não há nenhum changeset ainda" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Nenhum" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(fechado)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "Mostrar espaços em branco" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorar espaços em branco" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +#, fuzzy +msgid "No permission to change status" +msgstr "Vote para estado do pull request" + +#: kallithea/controllers/changeset.py:214 +#, fuzzy, python-format +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 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "Mudar o estado de um changeset associado a um pull request não é permitido" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Confirme para travar repositório" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 #, fuzzy msgid "No response" msgstr "revisões" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" -"A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal" -" formada." - -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" +"A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal " +"formada." + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Acesso não autorizado ao recurso" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Você não tem permissão para ver esta página" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "O recurso não pôde ser encontrado" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -107,372 +132,359 @@ msgstr "" "O servidor encontrou uma condição inesperada que o impediu de satisfazer " "a requisição." -#: kallithea/controllers/feed.py:55 +#: kallithea/controllers/feed.py:63 #, python-format -msgid "Changes on %s repository" -msgstr "Modificações no repositório %s" - -#: kallithea/controllers/feed.py:56 +msgid "%s committed on %s" +msgstr "%s commitados em %s" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "Conjunto de mudanças era grande demais e foi cortado..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 #, python-format msgid "%s %s feed" msgstr "%s - feed %s" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "Conjunto de mudanças era grande demais e foi cortado..." - -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 #, python-format -msgid "%s committed on %s" -msgstr "%s commitados em %s" - -#: kallithea/controllers/files.py:91 +msgid "Changes on %s repository" +msgstr "Modificações no repositório %s" + +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Clique aqui para adicionar um novo arquivo" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, fuzzy, python-format msgid "%s at %s" msgstr "em %s e %s" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, 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:317 -#, fuzzy -#| msgid "You can only edit files with revision being a valid branch " +#: kallithea/controllers/files.py:312 +#, 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:328 +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: kallithea/controllers/files.py:377 -#, fuzzy -#| msgid "You can only edit files with revision being a valid branch " +#: kallithea/controllers/files.py:372 +#, 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:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "Arquivo %s editado via Kallithea" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "Sem modificações" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "Arquivo adicionado via Kallithea" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "Nenhum conteúdo" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "Nenhum nome de arquivo" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 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:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "Downloads desabilitados" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "Repositório vazio" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "Tipo de arquivo desconhecido" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: 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:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Ramos" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Etiquetas" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repositórios" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Ramo" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Ramos Fechados" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Diário Público" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Diário" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "Você foi registrado no Kallithea com sucesso" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "Você foi registrado no %s com sucesso" + +#: kallithea/controllers/login.py:189 #, fuzzy msgid "A password reset confirmation code has been sent" msgstr "Seu link de reinicialização de senha foi enviado" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:238 #, fuzzy msgid "Invalid password reset token" msgstr "Link para trocar senha" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:124 -#, fuzzy, python-format +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:133 +#, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Conjunto de Mudanças" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" msgstr "Especial" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "Ramos pares" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "Marcadores" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 +#, fuzzy +msgid "Error occurred while creating pull request" +msgstr "Ocorreu um erro durante o envio do pull request" + +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "Novo pull request criado com sucesso" + +#: kallithea/controllers/pullrequests.py:375 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "Revisores do pull request" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 #, fuzzy msgid "No description" msgstr "Descrição" -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "Novo pull request criado com sucesso" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 -#, fuzzy -msgid "Error occurred while creating pull request" -msgstr "Ocorreu um erro durante o envio do pull request" - -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -#, fuzzy -msgid "Pull request update created" -msgstr "Revisores do pull request" - -#: kallithea/controllers/pullrequests.py:514 +#: kallithea/controllers/pullrequests.py:432 #, fuzzy msgid "Pull request updated" msgstr "Pull requests para %s" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "Pull request excluído com sucesso" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:615 +#: kallithea/controllers/pullrequests.py:543 #, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 -#, fuzzy -msgid "No permission to change pull request status" -msgstr "Vote para estado do pull request" - -#: kallithea/controllers/pullrequests.py:729 -#, fuzzy -msgid "Closing." -msgstr "carregando ..." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 +#, python-format +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "Consulta de busca inválida. Tente usar aspas." #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Não há índice onde pesquisa. Por favor execute o indexador whoosh" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 #, fuzzy msgid "An error occurred during search operation." msgstr "Ocorreu um erro durante essa operação de busca" -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 #, fuzzy msgid "No data ready yet" msgstr "Ainda não há dados carregados" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" @@ -484,151 +496,154 @@ msgstr "" msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Configurações padrão atualizadas com sucesso" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Ocorreu um erro durnge a atualização dos padrões" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 #, fuzzy msgid "Forever" msgstr "para sempre" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "cinco minutos" +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "uma hora" + #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" -msgstr "uma hora" - -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "um dia" -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "um mês" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "Ocorreu um erro durante a criação de um gist" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "Gist %s excluído" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:196 #, fuzzy msgid "Unmodified" msgstr "Última alteração" -#: kallithea/controllers/admin/gists.py:262 +#: kallithea/controllers/admin/gists.py:225 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:267 +#: kallithea/controllers/admin/gists.py:230 msgid "Successfully updated gist data" msgstr "" -#: kallithea/controllers/admin/gists.py:270 +#: kallithea/controllers/admin/gists.py:233 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" -msgstr "Você não pode editar esse usuário pois ele é crucial para toda a aplicação" - -#: kallithea/controllers/admin/my_account.py:129 +msgstr "" +"Você não pode editar esse usuário pois ele é crucial para toda a aplicação" + +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "Ocorreu um erro durante a atualização do usuário %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "Email %s adicionado ao usuário" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante o salvamento do email" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "Email removido do usuário" +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "" + #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Ler" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Gravar" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -636,627 +651,629 @@ msgstr "Gravar" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Administrador" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Desabilitado" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Permitido com ativação manual de conta" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Permitido com ativação automática de conta" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "Ativação manual de conta externa" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "Ativação automática de conta externa" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "Desabilitado" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Permitido com ativação manual de conta" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Permitido com ativação automática de conta" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "Ativação manual de conta externa" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "Ativação automática de conta externa" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Habilitado" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Ocorreu um erro durante a atualização das permissões" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Ocorreu um erro durante a criação do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "Grupo de repositórios %s criado" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "Grupo de repositórios %s atualizado" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Ocorreu um erro durante a atualização do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Esse grupo contém %s repositórios e não pode ser excluído" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Este grupo contém %s subgrupos e não pode ser excluído" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Grupo de repositórios %s excluído" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Ocorreu um erro durante a exclusão do grupo de repositórios %s" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "Você não pode revocar sua própria permissão de administrador" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Permissões atualizadas do Grupo de Repositórios" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "Ocorreu um erro durante a revocação das permissões" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "Erro ao criar repositório %s" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Repositório %s criado de %s" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Repositório %s bifurcado como %s" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Repositório %s criado" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Ocorreu um erro durante a atualização do repositório %s" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "%s bifurcações excluídas" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Repositório %s excluído" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, fuzzy, python-format msgid "Cannot delete repository %s which still has forks" -msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" - -#: kallithea/controllers/admin/repos.py:326 +msgstr "" +"Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" + +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Ocorreu um erro durante a exclusão de %s" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Permissões do repositório atualizadas" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Ocorreu um erro durante a criação do campo" -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "Ocorreu um erro durante a remoção do campo" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:446 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:450 msgid "An error occurred during setting this repository in public journal" msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" -#: kallithea/controllers/admin/repos.py:512 +#: kallithea/controllers/admin/repos.py:466 msgid "Nothing" msgstr "Nada" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:468 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:475 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 #, fuzzy msgid "Repository has been locked" msgstr "Repositório não está travado" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 #, fuzzy msgid "Repository has been unlocked" msgstr "Repositório não está travado" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "Ocorreu um erro durante o destravamento" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao excluir estatísticas de repositório" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "Configurações de VCS atualizadas" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" -msgstr "Ocorreu um erro durante a atualização das configurações da aplicação" - -#: kallithea/controllers/admin/settings.py:211 +msgstr "" +"Ocorreu um erro durante a atualização das configurações da aplicação" + +#: kallithea/controllers/admin/settings.py:174 #, 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:226 +#: kallithea/controllers/admin/settings.py:189 #, 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:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Configurações de visualização atualizadas" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 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:368 +msgstr "" +"Ocorreu um erro durante a atualização das configurações de visualização" + +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +#, fuzzy +msgid "Hook already exists" +msgstr "Ainda não há dados carregados" + +#: 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 "Added new hook" msgstr "Adicionado novo gancho" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "Ocorreu um erro durante a criação do hook" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "Grupo de usuários %s criado" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Ocorreu um erro durante a criação do grupo de usuários %s" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "Grupo de usuários %s atualizado" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "Ocorreu um erro durante a atualização do grupo de usuários %s" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "Grupo de usuários excluído com sucesso" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "Ocorreu um erro durante a exclusão do grupo de usuários" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "O grupo destino não pode ser o mesmo" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "Permissões do Grupo de Usuários atualizadas" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "Permissões atualizadas" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "Ocorreu um erro durante o salvamento das permissões" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "Usuário %s criado" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "Ocorreu um erro durante a criação do usuário %s" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "Usuário excluído com sucesso" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "Ocorreu um erro durante o salvamento do IP" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "IP %s não permitido" - -#: kallithea/lib/auth.py:757 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 +#: kallithea/lib/auth.py:824 msgid "You need to be a registered user to perform this action" msgstr "Você precisa ser um usuário registrado para realizar essa ação" -#: kallithea/lib/auth.py:864 +#: kallithea/lib/auth.py:852 msgid "You need to be signed in to view this page" msgstr "Você precisa estar logado para ver essa página" -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:444 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset for %s %s not found in %s" msgstr "Conjunto de alterações não encontrado" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "Arquivo binário" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Conjunto de mudanças é grande demais e foi cortado, use o menu de " "diferenças para ver as diferenças" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Deleted branch: %s" msgstr "Excluído ramo: %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:614 #, python-format msgid "Created tag: %s" msgstr "Tag criada: %s" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, fuzzy, python-format #| msgid "Changeset not found" msgid "Changeset %s not found" msgstr "Conjunto de alterações não encontrado" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 #, fuzzy msgid "Compare view" msgstr "comparar exibir" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "e" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "%s mais" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "revisões" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, fuzzy, python-format msgid "Fork name %s" msgstr "nome da bifurcação %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, fuzzy, python-format msgid "Pull request %s" msgstr "Pull request #%s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "repositório [criado]" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "[baixado] archive do repositório" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "[excluir] repositório" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "usuário [criado]" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "usuário [atualizado]" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "[criado] grupo de usuários" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "[atualizado] grupo de usuários" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "[comentado] em revisão no repositório" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "[comentado] no pull request para" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "[fechado] pull request para" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "[realizado push] para" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "[commitado via Kallithea] no repositório" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "[pulled do remote] no repositório" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr " e mais %s" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Nenhum arquivo" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "novo arquivo" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "excluir" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "renomear" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1264,752 +1281,351 @@ msgid "" "repositories" msgstr "" "O repositório %s não está mapeado ao BD. Talvez ele tenha sido criado ou " -"renomeado a partir do sistema de arquivos. Por favor, execute a aplicação" -" outra vez para varrer novamente por repositórios" - -#: kallithea/lib/utils2.py:415 +"renomeado a partir do sistema de arquivos. Por favor, execute a aplicação " +"outra vez para varrer novamente por repositórios" + +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d ano" msgstr[1] "%d anos" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mês" msgstr[1] "%d meses" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d segundo" msgstr[1] "%d segundos" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "em %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "%s atrás" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "em %s e %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "%s e %s atrás" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "agora há pouco" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Nenhum acesso ao repositório" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Acesso de leitura ao repositório" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Acesso de escrita ao repositório" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Acesso administrativo ao repositório" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Nenhum acesso ao Grupo de Repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Acesso de leitura ao Grupo de Repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Acesso de escrita ao Grupo de Repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Acesso administrativo ao Grupo de Repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "Administrador do Kallithea" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Criação de repositórios desabilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Criação de repositórios habilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Bifurcação de repositórios desabilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Bifurcação de repositórios habilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Registro desabilitado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Registro de novo usuário no Kallithea com ativação manual" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Registro de novo usuário no Kallithea com auto-ativação" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Não Revisado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "Aprovado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "Rejeitado" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "Sob Revisão" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "nível superior" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Sem acesso ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Acesso de leitura ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Acesso de escrita ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Acesso administrativo ao grupo de repositórios" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Sem acesso ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Acesso de leitura ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Acesso de escrita ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Acesso administrativo ao grupo de usuários" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Criação de Grupo de Repositórios desatilibada" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Criação de Grupo de Repositórios habilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Criação de Grupo de Usuários desabilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Criação de Grupo de Usuários habilitada" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "Registro desatilitado" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Registro de Usuário com ativação manual de conta" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Registro de Usuário com ativação automática de conta" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "na linha %s" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Menção]" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "nível superior" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "Administrador do Kallithea" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 #, fuzzy msgid "Default user has read access to new repositories" msgstr "Acesso não autorizado ao recurso" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 #, fuzzy msgid "Default user has write access to new repositories" msgstr "Acesso não autorizado ao recurso" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 #, fuzzy msgid "Only admins can create repository groups" msgstr "Grupo de repositórios %s criado" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Grupo de repositórios %s criado" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 #, fuzzy msgid "Only admins can create user groups" msgstr "Criar grupos de usuários" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 #, fuzzy msgid "Non-admins can create user groups" msgstr "Criar grupos de usuários" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 #, fuzzy msgid "Only admins can fork repositories" msgstr "Criar repositórios" -#: kallithea/model/db.py:1696 -#, fuzzy -#| msgid "Non-admins can can fork repositories" +#: kallithea/model/db.py:1733 +#, fuzzy msgid "Non-admins can fork repositories" msgstr "Invalidar o cache para todos os repositórios" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "Registro desatilitado" + +#: kallithea/model/db.py:1736 #, fuzzy msgid "User registration with manual account activation" msgstr "Registro de Usuário com ativação manual de conta" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 #, fuzzy msgid "User registration with automatic account activation" msgstr "Registro de Usuário com ativação automática de conta" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2263 #, fuzzy msgid "Not reviewed" msgstr "Não Revisado" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 #, fuzzy msgid "Under review" msgstr "Sob Revisão" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2265 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Aprovado" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "Aprovado" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Por favor entre um login" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Entre um valor com %(min)i caracteres ou mais" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Por favor entre com uma senha" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Entre com %(min)i caracteres ou mais" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, fuzzy, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "%(user)s comentou no changeset em %(when)s" - -#: kallithea/model/notification.py:256 -#, fuzzy, python-format -msgid "%(user)s sent message %(age)s" -msgstr "%(user)s enviou mensagem em %(when)s" - -#: kallithea/model/notification.py:257 -#, fuzzy, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "%(user)s mencionou-o em %(when)s" - -#: kallithea/model/notification.py:258 -#, fuzzy, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "%(user)s registrou-se no Kallithea em %(when)s" - -#: kallithea/model/notification.py:259 -#, fuzzy, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "%(user)s abriu um novo pull request em %(when)s" - -#: kallithea/model/notification.py:260 +#: kallithea/model/notification.py:165 #, fuzzy, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "%(user)s comentou no pull request em %(when)s" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "%(user)s comentou no changeset em %(when)s" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "%(user)s enviou mensagem em %(when)s" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "%(user)s mencionou-o em %(when)s" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "%(user)s registrou-se no Kallithea em %(when)s" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "%(user)s abriu um novo pull request em %(when)s" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "%(user)s comentou no pull request em %(when)s" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "[comentado] no pull request para" + +#: kallithea/model/notification.py:168 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "O username \"%(new_username)s\" não é válido" -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" - -#: kallithea/model/notification.py:309 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "[comentado] no pull request para" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 #, fuzzy msgid "Closing" msgstr "Usando" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, fuzzy, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" - -#: kallithea/model/scm.py:812 +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" +"%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" + +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Create Pull Request" +msgid "Cannot create empty pull request" +msgstr "Criar Pull Request" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "Confirme para excluir este pull request" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "tip mais recente" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "Novo registro de usuário" -#: kallithea/model/user.py:256 -#, fuzzy -msgid "You can't remove this user since it is crucial for the entire application" +#: kallithea/model/user.py:253 +#, fuzzy +msgid "" +"You can't remove this user since it is crucial for the entire application" msgstr "" "Você não pode remover esse usuário, pois ele é crucial para toda a " "aplicação" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -2018,16 +1634,16 @@ msgstr "" "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, fuzzy, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" msgstr "" "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2036,64 +1652,64 @@ msgstr "" "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "Link para trocar senha" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 #, fuzzy msgid "Password reset notification" msgstr "Link para trocar senha" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "O valor não pode ser uma lista vazia" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "O username \\\"%(username)s\\\" já existe" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "O username \"%(username)s\" não é válido" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 #, fuzzy msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" msgstr "" "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, " "pontos e hífens e deve iniciar com caractere alfanumérico" -#: kallithea/model/validators.py:126 +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:112 #, python-format msgid "Username %(username)s is not valid" msgstr "O username \"%(username)s\" não é válido" -#: kallithea/model/validators.py:152 +#: kallithea/model/validators.py:133 msgid "Invalid user group name" msgstr "Nome inválido de grupo de usuários" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "O grupo de usuários \"%(usergroup)s\" já existe" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2102,107 +1718,107 @@ msgstr "" "underscores, pontos ou hífens, e deve começar om um caractere alfa-" "numérico" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "Não é possível associar esse grupo como progenitor" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "O grupo \\\"%(group_name)s\\\" já existe" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Um repositório com o nome \"%(group_name)s\" já existe" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "Caracteres inválidos (não-ascii) na senha" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "Senhas não conferem" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 #, fuzzy msgid "Invalid username or password" msgstr "senha inválida" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:312 msgid "Token mismatch" msgstr "Descompasso de Token" -#: kallithea/model/validators.py:345 +#: kallithea/model/validators.py:328 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "O nome de repositório %(repo)s não é permitido" -#: kallithea/model/validators.py:347 +#: kallithea/model/validators.py:330 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Um repositório chamado %(repo)s já existe" -#: kallithea/model/validators.py:348 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Um repositório \"%(repo)s\" já existe no grupo \"%(group)s\"" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Um Grupo de Repositórios chamado \"%(repo)s\" já existe" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 #, fuzzy msgid "Invalid repository URL" msgstr "repositório privado" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "A bifurcação deve ser do mesmo tipo que o pai" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "Você não tem permissão para criar um repositório neste grupo" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "você não tem permissão para criar um repositório na raiz" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "Você não tem permissão para criar um grupo neste local" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "Este nome de usuário ou de grupo de usuários não é válido" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 #, fuzzy msgid "This email address is already in use" msgstr "Esse endereço de e-mail já está tomado" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "o e-mail \"%(email)s\" não existe." -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -2210,248 +1826,153 @@ msgstr "" "O atributo de login LDAP do CN deve ser especificado - isto é o nome do " "atributo que é equivalente ao 'nome de usuário'" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Por favor, forneça um endereço válido IPv4 ou IPv6" -#: kallithea/model/validators.py:775 +#: kallithea/model/validators.py:732 #, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)" - -#: kallithea/model/validators.py:808 +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" +"O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "O nome da chave só pode conter letras, underscore, hífen ou dígitos" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "O nome de arquivo não pode estar dentro de um diretório" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Painel de Controle" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "filtro rápido..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "repositórios" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 msgid "Add Repository Group" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "Você tem direitos de administrador neste grupo e pode editá-lo" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "Repositório" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "Descrição" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Nome" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "Última Alteração" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "Ponta" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "Dono" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "Clique para ordenar em ordem crescente" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "Clique para ordenar em ordem descrescente" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Nenhum repositório encontrado." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Erro de dados." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Carregando..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "Entrar" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "Log in em %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "Nome de usuário" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "Senha" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Lembre-se de mim" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "Esqueceu sua senha ?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "Não possui uma conta ?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "Entrar" @@ -2459,34 +1980,34 @@ msgstr "Entrar" msgid "Password Reset" msgstr "Senha Trocada" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 -#, fuzzy, python-format +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 +#, python-format msgid "Reset Your Password to %s" msgstr "" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 #, fuzzy msgid "Reset Your Password" msgstr "Esqueceu sua senha ?" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:47 #, fuzzy msgid "Send Password Reset Email" msgstr "Link para trocar senha" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:52 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " @@ -2495,119 +2016,102 @@ msgstr "" "Link de reinicialização de senha será enviado ao endereço de e-mail " "correspondente" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 #, fuzzy msgid "New Password" msgstr "Nova senha" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 #, fuzzy msgid "Confirm New Password" msgstr "Sua nova senha" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "Inscrever-se" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "Repita a senha" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "Primeiro Nome" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "Último Nome" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Ainda não há ramos" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "Ramos Fechados" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Ainda não há etiquetas" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Ainda não há marcadores" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 #, fuzzy msgid "Admin Journal" msgstr "Diário do administrador" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "filtro de diário..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 #, fuzzy msgid "Filter" msgstr "filtro" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, fuzzy, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2615,30 +2119,16 @@ msgstr[0] "%s entrada" msgstr[1] "%s entradas" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Ação" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Repositório" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Data" @@ -2646,7 +2136,7 @@ msgstr "Data" msgid "From IP" msgstr "A partir do IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "Ainda não há ações" @@ -2655,76 +2145,76 @@ msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "Salvar" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 #, fuzzy msgid "Repository Defaults" msgstr "Padrões de repositórios" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Tipo" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Repositório privado" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2732,34 +2222,34 @@ msgstr "" "Repositórios privados são visíveis somente por pessoas explicitamente " "adicionadas como colaboradores." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 msgid "Enable statistics" msgstr "Habilitar estatísticas" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 msgid "Enable statistics window on summary page." msgstr "Habilitar janela de estatísticas na página de sumário." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 msgid "Enable downloads" msgstr "Habilitar downloads" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "Habilitar menu de descarregar na página de sumário." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "Habilitar travas" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "Habilitar trava-por-pulling no repositório." @@ -2768,45 +2258,45 @@ msgstr "Habilitar trava-por-pulling no repositório." msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "Descrição do gist ..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "Tempo de vida do Gist" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "Expira" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 #, fuzzy msgid "Never" msgstr "nunca" @@ -2816,7 +2306,8 @@ msgid "Update Gist" msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "Cancelar" @@ -2839,16 +2330,16 @@ msgstr "Gists Públicos" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "Criado" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "Não há nenhum gist ainda" @@ -2857,45 +2348,45 @@ msgstr "Não há nenhum gist ainda" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "Limpar" @@ -2905,113 +2396,111 @@ msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "Excluir" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 #: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 #: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 #: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Editar" -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "criado" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "Mostrar original" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "Minha Conta" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 #, fuzzy msgid "Email Addresses" msgstr "Novo endereço de email" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 #, fuzzy msgid "Owned Repositories" msgstr "repositórios" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "Criar repositórios" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 @@ -3019,75 +2508,92 @@ msgstr "Criar repositórios" msgid "Show Permissions" msgstr "Copiar permissões" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "Confirme para excluir este IP: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 #, fuzzy msgid "Expired" msgstr "Expira" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "Confirme para excluir este IP: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 #, fuzzy msgid "Remove" msgstr "Removido" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 #, fuzzy msgid "New API key" msgstr "Próxima chave de campo" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "Adicionar" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "Confirme para excluir este email: %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "Novo endereço de email" @@ -3096,109 +2602,71 @@ msgstr "Novo endereço de email" msgid "Change Your Account Password" msgstr "Sua nova senha" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "Nova senha" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 +#: kallithea/templates/admin/my_account/my_account_password.html:39 #, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "Altere o seu avatar em" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "Usando" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 #, fuzzy msgid "Repositories You Own" msgstr "Nenhum repositório encontrado." -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Nenhum registro encontrado." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "Nome" #: kallithea/templates/admin/my_account/my_account_watched.html:1 #, fuzzy msgid "Repositories You are Watching" msgstr "Localização dos repositórios" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "Minhas Notificações" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "Todos" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "Comentários" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "Pull Requests" - -#: kallithea/templates/admin/notifications/notifications.html:30 -#, fuzzy -msgid "Mark All Read" -msgstr "Marcar tudo como lido" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "Ainda não há notificações aqui" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -#, fuzzy -msgid "Show Notification" -msgstr "Mostrar notificação" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "Notificações" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 #, fuzzy msgid "Default Permissions" msgstr "Permissões padrão" @@ -3213,45 +2681,51 @@ msgstr "" msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "Acesso anônimo" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +#, fuzzy +#| msgid "Anonymous access" +msgid "Allow anonymous access" +msgstr "Acesso anônimo" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" "Todas as permissões padrão em cada repositório serão modificadas para a " -"permissão escolhida, note que todas as permissões padrão customizadas nos" -" repositórios serão perdidas" - -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +"permissão escolhida, note que todas as permissões padrão customizadas nos " +"repositórios serão perdidas" + +#: kallithea/templates/admin/permissions/permissions_globals.html:20 #, fuzzy msgid "Apply to all existing repositories" msgstr "Repositório existente?" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 msgid "Permissions for the Default user on new repositories." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "Grupo de repositórios" + #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "Grupo de repositórios" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " @@ -3261,165 +2735,166 @@ msgstr "" "modificadas para a permissão escolhida, note que todas as permissões " "padrão customizadas em grupos de repositórios serão perdidas" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:33 #, fuzzy msgid "Apply to all existing repository groups" msgstr "Grupo de repositórios %s atualizado" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "Grupo de usuários" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 #, fuzzy msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -"Todas as permissões padrão em cada repositório serão reinicializadas para" -" as permissões escolhidas. Note que todas as permissões padrão " +"Todas as permissões padrão em cada repositório serão reinicializadas para " +"as permissões escolhidas. Note que todas as permissões padrão " "customizadas nos repositórios serão perdidas" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy msgid "Top level repository creation" msgstr "Criação de repositório" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:61 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:64 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "Criação de grupo de usuários" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:75 msgid "Repository forking" msgstr "Bifurcação de repositório" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:78 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:82 msgid "Registration" msgstr "Registro" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:88 msgid "External auth account activation" msgstr "Ativação de autenticação de conta externa" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "Confirme para excluir este IP: %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 #, fuzzy msgid "All IP addresses are allowed." msgstr "Todos os endereços IP são permitidos" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "Novo endereço IP" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "Nome do grupo" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "Progenitor do grupo" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "Configurações" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "Permissões" @@ -3444,12 +2919,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "Criado em" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3460,8 +2935,30 @@ msgstr[1] "Confirme para excluir este grupo: %s com %s repositórios" msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "Disabled" +msgid "Visible" +msgstr "Desabilitado" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "revisões" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "Adicionar grupo de usuários" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy msgid "User/User Group" @@ -3469,8 +2966,8 @@ msgstr "Grupo de usuários" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3479,112 +2976,106 @@ msgstr "padrão" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy msgid "Revoke" msgstr "revogar" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "Adicionar novo" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #, fuzzy msgid "Apply to children" msgstr "aplicar aos filhos" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "" -"Habilitar trava-por-pulling no grupo. Esta opção será aplicada a todos os" -" outros grupos e repositórios dentro deles" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" +"Habilitar trava-por-pulling no grupo. Esta opção será aplicada a todos os " +"outros grupos e repositórios dentro deles" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Remove this group" msgstr "Criar grupos de usuários" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Confirm to delete this group" msgstr "Confirme para excluir este grupo de usuário: %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "Início" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "com" +#, fuzzy, python-format +#| msgid "Repository group" +msgid "Repository group %s" +msgstr "Grupo de repositórios" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 #, fuzzy msgid "Repository Groups Administration" msgstr "Administração de grupos de repositórios" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 #, fuzzy msgid "Number of Top-level Repositories" msgstr "Número de repositórios de nível superior" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 #, fuzzy msgid "Clone remote repository" msgstr "repositório [criado]" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Seja sucinto e objetivo. Use um arquivo README para descrições mais " "longas." -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "Tipo de repositório a criar." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Revisão de pouso" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3613,27 +3104,27 @@ msgid "" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, fuzzy, python-format +#, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 #, fuzzy msgid "Extra Fields" msgstr "Campos extras" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "Remoto" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "Estatísticas" @@ -3643,33 +3134,31 @@ msgid "Parent" msgstr "Progenitor do grupo" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 #, fuzzy msgid "Manually set this repository as a fork of another from the list." msgstr "" "Marque manualmente este repositório como uma bifurcação de um outro da " "lista" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 #, fuzzy msgid "Public Journal Visibility" msgstr "diário público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "Remover do diário público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 #, fuzzy msgid "Add to Public Journal" msgstr "diário público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 #, fuzzy msgid "" "All actions done in this repository will be visible to everyone in the " @@ -3678,41 +3167,41 @@ msgstr "" "Todas as ações feitas nesse repositório serão acessíveis a todos no " "diário público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #, fuzzy msgid "Change Locking" msgstr "Habilitar travas" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 #, fuzzy msgid "Confirm to unlock repository." msgstr "Confirme para destravar repositório" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 #, fuzzy msgid "Unlock Repository" msgstr "Repositório público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 #, fuzzy msgid "Confirm to lock repository." msgstr "Confirme para travar repositório" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 #, fuzzy msgid "Lock Repository" msgstr "Repositório público" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "Repositório não está travado" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3720,33 +3209,33 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Confirma excluir esse repositório: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 #, fuzzy msgid "Delete this Repository" msgstr "[excluir] repositório" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, fuzzy, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "este repositório tem %s bifurcação" msgstr[1] "este repositório tem %s bifurcações" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "Desassociar bifurcações" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "Excluir bifurcações" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3758,12 +3247,7 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "Invalidar cache do repositório" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -#, fuzzy -msgid "Confirm to invalidate repository cache." -msgstr "Confirma invalidar cache do repositório" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 #, fuzzy msgid "" "Manually invalidate cache for this repository. On first access, the " @@ -3772,102 +3256,108 @@ msgstr "" "Invalidar manualmente o cache deste repositório. No próximo acesso o " "repositório será cacheado novamente" -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 #, fuzzy msgid "List of Cached Values" msgstr "Lista de valores cacheados" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "Prefixo" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Chave" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "Ativo" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Confirme para excluir este campo: %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "Próxima chave de campo" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "Próximo rótulo de campo" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "Entre com o rótulo curto" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "Nova descrição de campo" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "Entre com a descrição de um campo" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 #, fuzzy msgid "Extra fields are disabled." msgstr "Registro desabilitado" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "repositório privado" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "repositório [bifurcado]" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Repositório %s criado" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "[pulled do remote] no repositório" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "Confirma realizar pull de alterações a partir de lado remoto" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "repositório privado" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3877,35 +3367,40 @@ msgid "" "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "repositório [criado]" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Repositório" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "Mudar o dono desse repositório." -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 msgid "Processed commits" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed progress" msgstr "" @@ -3924,7 +3419,7 @@ msgstr "Confirma remover atuais estatísticas" msgid "Repositories Administration" msgstr "Administração de repositórios" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3946,7 +3441,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "Ganchos" @@ -3958,285 +3453,277 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "Enviar" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "Marca do site" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "Realm de autenticação HTTP" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 #, fuzzy msgid "Save Settings" msgstr "Salvar configurações" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +#, fuzzy +msgid "Custom Hooks" +msgstr "Ganchos customizados" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -#, fuzzy -msgid "Custom Hooks" -msgstr "Ganchos customizados" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "Falha ao remover gancho" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "Opção de varredura" -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:9 #, fuzzy msgid "Delete records of missing repositories" msgstr "Buscar nos repositórios" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "Invalidar o cache para todos os repositórios" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 #, fuzzy msgid "Check this to reload data and clear cache keys for all repositories." msgstr "Invalidar o cache para todos os repositórios" -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "Install Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. " -"Current hooks will be updated to the latest version." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "Opção de construção do índice" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 msgid "Build from scratch" msgstr "Construir do zero" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "Reindexar" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 +msgid "Kallithea configuration file" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:9 +msgid "Python version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 #, fuzzy msgid "Git version" msgstr "Editar Permissão" -#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/templates/admin/settings/settings_system.html:12 msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Web" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "Requer SSL para operações de VCS" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "Mostrar tamanho do repositório após o push" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "Armazenar registro de comandos de push dos usuários" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "Armazenar registro de comandos de pull dos usuários" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "Atualizar repositório após realizar push (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 #, fuzzy msgid "Mercurial extensions" msgstr "Extensões do Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 msgid "Enable largefiles extension" msgstr "Habilitar extensão largefiles" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 msgid "Enable hgsubversion extension" msgstr "Habilitar extensão hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 #, fuzzy msgid "Location of repositories" msgstr "Criar repositórios" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." msgstr "" "Clique para destravar. Você deve reiniciar o Kallithea para que esta " "configuração tenha efeito." -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "Geral" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "Usar campos extras do repositório" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "Permite armazenar campos customizados adicionais por repositório." -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "Mostrar versão do Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4253,94 +3740,103 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +#, fuzzy +msgid "Clone URL" +msgstr "URL de clonagem" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "Itens do dashboard" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Tamanho do Repositório" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "Ícones" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "Mostrar ícone de repositório público nos repositórios" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Show private repository icon on repositories" msgstr "Mostrar ícone de repositório privado nos repositórios" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:84 #, fuzzy msgid "Show public/private icons next to repository names." msgstr "Mostrar ícone de repositório público nos repositórios" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 #, fuzzy msgid "Meta Tagging" msgstr "Meta-Tagging" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Adicionar grupo de usuários" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4360,13 +3856,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "Membros" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Confirme para excluir este grupo de usuário: %s" @@ -4375,15 +3871,15 @@ msgstr "Confirme para excluir este grupo de usuário: %s" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Nenhum membro ainda" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Membros escolhidos do grupo" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Membros disponíveis" @@ -4398,17 +3894,17 @@ msgstr "Adicionar usuário" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "Usuários" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "Confirmação de senha" @@ -4427,12 +3923,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4441,7 +3937,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "Confirma excluir este usuário: %s" @@ -4450,24 +3946,16 @@ msgstr "Confirma excluir este usuário: %s" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "Confirmação de nova senha" @@ -4476,237 +3964,238 @@ msgstr "Confirmação de nova senha" msgid "Users Administration" msgstr "Administração de usuários" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "Instância de servidor: %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "Repositório Mercurial" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "Repositório Git" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 #, fuzzy msgid "Create Fork" msgstr "Excluir bifurcações" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "Sumário" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "Registro de alterações" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Arquivos" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "Trocar Para" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "Mostrar Pull Requests para %s" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "Pull Requests" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "Opções" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 #, fuzzy msgid "Compare Fork" msgstr "Compare bifurcação" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "Compare" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "Pesquisar" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "Destravar" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "Travar" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:174 msgid "Follow" msgstr "Seguir" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "Parar de seguir" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Bifurcação" -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "Criar Pull Request" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "Mostrar Pull Requests para %s" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "Trocar Para" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "Mostrar atividade recente" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "Diário público" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "Mostrar gists públicos" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 #, fuzzy msgid "All Public Gists" msgstr "Todos os gists públicos" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 #, fuzzy msgid "My Public Gists" msgstr "Meus gists públicos" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 #, fuzzy msgid "My Private Gists" msgstr "Meus gists privados" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "Buscar nos repositórios" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "Pull requests" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 #, fuzzy msgid "Not Logged In" msgstr "Não logado" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 #, fuzzy msgid "Login to Your Account" msgstr "Entrar com sua conta" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:379 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "Esqueceu a senha ?" -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:383 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Não possui uma conta ?" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "Sair" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 #, fuzzy msgid "Inherit defaults" msgstr "Padrões de repositórios" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "Criar repositórios" -#: kallithea/templates/base/default_perms_box.html:33 +#: kallithea/templates/base/default_perms_box.html:27 msgid "Select this option to allow repository creation for this user" msgstr "" "Selecione esta opção para permitir a criação de repositórios para este " "usuário" -#: kallithea/templates/base/default_perms_box.html:40 +#: kallithea/templates/base/default_perms_box.html:33 msgid "Create user groups" msgstr "Criar grupos de usuários" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" "Selecione esta opção para permitir a criação de grupos de usuários para " "este usuário" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "Bufurcar repositórios" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" -"Selecione esta opção para permitir a bifurcação de repositórios para este" -" usuário" +"Selecione esta opção para permitir a bifurcação de repositórios para este " +"usuário" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "Mostrar" @@ -4715,239 +4204,185 @@ msgid "No permissions defined yet" msgstr "Nenhuma permissão definida ainda" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "Permissão" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "Editar Permissão" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:28 +msgid "Retry" +msgstr "" + +#: kallithea/templates/base/root.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#, fuzzy +msgid "Submitting ..." +msgstr "Enviando..." + +#: kallithea/templates/base/root.html:30 +#, fuzzy +#| msgid "Enable downloads" +msgid "Unable to post" +msgstr "Habilitar downloads" + +#: kallithea/templates/base/root.html:31 #, fuzzy msgid "Add Another Comment" msgstr "Adicionar outro comentário" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:32 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:33 msgid "Start following this repository" msgstr "Passar a seguir este repositório" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:34 msgid "Group" msgstr "Grupo" -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "membros" - -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:35 msgid "Loading ..." msgstr "Carregando..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:36 msgid "loading ..." msgstr "carregando ..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:37 msgid "Search truncated" msgstr "Busca truncada" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:38 msgid "No matching files" msgstr "Nenhum arquivo encontrado" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:39 #, fuzzy msgid "Open New Pull Request from {0}" msgstr "Comentar no pull request #%s" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:40 msgid "Open New Pull Request for {0} → {1}" msgstr "" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:41 #, fuzzy msgid "Show Selected Changesets {0} → {1}" msgstr "Mostrar changesets selecionados __S -> __E" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:42 #, fuzzy msgid "Selection Link" msgstr "Link da seleção" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 #, fuzzy msgid "Collapse Diff" msgstr "Colapsar diff" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:44 #, fuzzy msgid "Expand Diff" msgstr "Expandir diff" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:45 +#, fuzzy +msgid "No revisions" +msgstr "revisões" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 msgid "Failed to revoke permission" msgstr "Falhou ao revocar a permissão" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:48 #, fuzzy msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "confirme para revogar permissão para {0}: {1} ?" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:52 #, fuzzy msgid "Specify changeset" msgstr "%s Changeset" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "%s Bookmarks" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Autor" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Revisão" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "%s Ramos" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "Clique para ordenar em ordem crescente" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "Clique para ordenar em ordem descrescente" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "Nenhum registro encontrado." + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "Erro de dados." + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "Carregando..." + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "%s Changelog" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "mostrando %d de %d revisão" msgstr[1] "mostrando %d de %d revisões" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "Deselecionar seleção" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 #, fuzzy msgid "Go to tip of repository" msgstr "Confirme para travar repositório" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "Comparar bifurcação com %s" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, fuzzy, python-format msgid "Compare fork with parent repository (%s)" msgstr "Comparar bifurcação com %s" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 #, fuzzy msgid "Branch filter:" msgstr "filtro" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, fuzzy, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" -"Estado do changeset: %s\n" -"Clique para abrir os pull request #%s associado" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "Estado do changeset: %s" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "O changeset tem comentários" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "Bookmark %s" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "Tag %s" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "Ramo %s" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "Ainda não há alteações" @@ -4963,7 +4398,7 @@ msgstr "Modificado" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "Adicionado" @@ -4977,132 +4412,147 @@ msgstr "Adicionado" msgid "Affected %s files" msgstr "Afetados %s arquivos" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "Idade" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "Refs" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "Adicionar ou enviar arquivos diretamente pelo Kallithea" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -#, fuzzy -msgid "Push new repository" -msgstr "Fazer push de novo repositório" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" -msgstr "Repositório existente?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, fuzzy, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" +"Estado do changeset: %s\n" +"Clique para abrir os pull request #%s associado" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, fuzzy, python-format +msgid "Changeset status: %s by %s" +msgstr "Estado do changeset: %s" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%d comment" +#| msgid_plural "%d comments" +msgid "%s comments" +msgstr "%d comentário" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "Bookmark %s" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "Tag %s" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "Ramo %s" #: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "%s Changeset" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "Estado do changeset" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "Diff cru" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "D" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "Baixar diff" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 #, fuzzy msgid "Merge" msgstr "mesclar" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 #, fuzzy msgid "Grafted from:" msgstr "Criado em" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 #, fuzzy msgid "Replaced by:" msgstr "criado" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 #, fuzzy msgid "Preceded by:" msgstr "criado" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s arquivo modificado" msgstr[1] "%s arquivos modificados" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s arquivo modificado com %s inserções e %s exclusões" msgstr[1] "%s arquivos modificados com %s inserções e %s exclusões" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 #, fuzzy msgid "Show full diff anyway" msgstr "Mostrar diff completo" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -#, fuzzy -msgid "No revisions" -msgstr "revisões" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#, fuzzy +#| msgid "Comment" +msgid "comment" +msgstr "Comentário" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy @@ -5124,187 +4574,189 @@ msgstr "Nenhum changeset" msgid "Delete comment?" msgstr "%d comentário" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 #, fuzzy msgid "Status change" msgstr "Mudanças mais recentes" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "Comentando a linha {1}." - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "Comentários interpretados usando a sintaxe %s com suporte a %s." - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -#, fuzzy -msgid "Use @username inside this text to notify another user" +#: kallithea/templates/changeset/changeset_file_comment.html:87 +#, fuzzy +msgid "Comments are in plain text. Use @username to notify another user." msgstr "" "Use @nomedeusuário dentro desse texto para enviar notificação a este " "usuário do Kallithea" -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "Visualizar comentário" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -#, fuzzy -msgid "Submitting ..." -msgstr "Enviando..." - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#, fuzzy +msgid "Set changeset status" +msgstr "Altere o estado do changeset" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "Vote para estado do pull request" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +#, fuzzy +msgid "No change" +msgstr "Sem modificações" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "Comentar no pull request #%s" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +#, fuzzy +msgid "Close" +msgstr "(fechado)" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "Comentário" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "Visualizar" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "Você precisa estar logado para comentar." -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "Entrar agora" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "Ocultar" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d comentário" msgstr[1] "%d comentários" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, fuzzy, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "(%d em linha)" msgstr[1] "(%d em linha)" -#: kallithea/templates/changeset/changeset_file_comment.html:108 -#, fuzzy, python-format +#: kallithea/templates/changeset/changeset_file_comment.html:155 +#, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" msgstr[1] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -#, fuzzy -msgid "Use @username inside this text to notify another user." -msgstr "" -"Use @nomedeusuário dentro desse texto para enviar notificação a este " -"usuário do Kallithea" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "Vote para estado do pull request" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -#, fuzzy -msgid "Set changeset status" -msgstr "Altere o estado do changeset" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -#, fuzzy -msgid "No change" -msgstr "Sem modificações" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -#, fuzzy -msgid "Close" -msgstr "(fechado)" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "%s Changesets" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "Estado do changeset: %s" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "Arquivos afetados" -#: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:43 -msgid "Show full diff for this file" -msgstr "Mostrar diff completo para este arquivo" - -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 -msgid "Show full side-by-side diff for this file" -msgstr "Mostrar diff completo lado-a-lado para este arquivo" - -#: kallithea/templates/changeset/diff_block.html:38 -msgid "Show inline comments" -msgstr "Mostrar comentários inline" - -#: kallithea/templates/changeset/diff_block.html:86 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "arquivo removido" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Última alteração" + +#: kallithea/templates/changeset/diff_block.html:42 #, fuzzy msgid "Deleted" msgstr "excluir" -#: kallithea/templates/changeset/diff_block.html:89 +#: kallithea/templates/changeset/diff_block.html:44 #, fuzzy msgid "Renamed" msgstr "renomear" -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Revisão desconhecida %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Nenhum nome de arquivo" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "arquivo adicionado" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:43 +msgid "Show full diff for this file" +msgstr "Mostrar diff completo para este arquivo" + +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 +msgid "Show full side-by-side diff for this file" +msgstr "Mostrar diff completo lado-a-lado para este arquivo" + +#: kallithea/templates/changeset/diff_block.html:72 +msgid "Show inline comments" +msgstr "Mostrar comentários inline" + +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "Nenhum changeset" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "Antecessor" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "Comentário no changeset" + +#: kallithea/templates/compare/compare_cs.html:40 #, fuzzy msgid "Show merge diff" msgstr "Mostrar diff completo" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -#, fuzzy -msgid "Common ancestor" -msgstr "Comentário no changeset" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 #, fuzzy msgid "is" msgstr "Gist" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, fuzzy, python-format msgid "%s changesets" msgstr "%s Changesets" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 #, fuzzy msgid "behind" msgstr "Reindexar" @@ -5316,131 +4768,186 @@ msgid "%s Compare" msgstr "%s Comparar" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "Mostrando %s commit" msgstr[1] "Mostrando %s commits" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "Mostrar diff completo" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "Repositório público" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "Nenhum conjunto de alterações ainda." -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "Assinar o feed rss de %s" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "Assinar o feed atom de %s" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s comentou no changeset em %(when)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 #, fuzzy, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "O estado do changeset foi alterado para" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Comment on Changeset \"%s\"" +msgstr "%(user)s comentou no changeset em %(when)s" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "Fluxo de changesets" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Ramo" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Mudanças mais recentes" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "Repositório não está travado" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "Olá %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 #, fuzzy msgid "We have received a request to reset the password for your account." msgstr "Recebemos uma requisição para criar uma nova senha para sua conta." -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 +#: kallithea/templates/email_templates/pull_request.html:4 #, fuzzy, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, fuzzy, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#| msgid "[commented] on pull request for" +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "[comentado] no pull request para" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +msgid "Pull request" +msgstr "Pull request #%s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, fuzzy, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -#, fuzzy -msgid "The comment closed the pull request with status" -msgstr "%s comentou no pull request \"%s\"" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -#, fuzzy -msgid "The comment was made with status" -msgstr "O pull request foi fechado com o estado" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "Veja este usuário aqui" +#| msgid "%(user)s commented on pull request %(age)s" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%(user)s comentou no pull request em %(when)s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Pull requests de %s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[comentado] no pull request para" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Nome do grupo" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5458,7 +4965,7 @@ msgid "%s File Diff" msgstr "%s Diff de Arquivo" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "%s Arquivos" @@ -5468,74 +4975,76 @@ msgstr "%s Arquivos" msgid "%s Files Add" msgstr "%s Adicionar Arquivos" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Local" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "ou" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "" +#, fuzzy +msgid "New file type" +msgstr "novo arquivo" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 #, fuzzy msgid "Commit Changes" msgstr "Realizar commit das alterações" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "Revisão anterior" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "Próxima revisão" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "Seguir o ramo atual" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "Carregando lista de arquivos..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Tamanho" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "Última revisão" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 #, fuzzy msgid "Last Modified" msgstr "Última alteração" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 #, fuzzy msgid "Last Committer" msgstr "Último commiter" @@ -5546,7 +5055,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5559,24 +5068,20 @@ msgstr "" msgid "Edit file" msgstr "Editar arquivo" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Fonte" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "Editando arquivo" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5584,53 +5089,65 @@ msgid_plural "%s authors" msgstr[0] "%s autor" msgstr[1] "%s autores" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" - -#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "Excluído ramo: %s" + +#: kallithea/templates/files/files_source.html:37 msgid "Editing binary files not allowed" msgstr "" -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:40 msgid "Editing files allowed only when on branch head revision" msgstr "" "A edição de arquivos só é permitida quando se está na revisão mais " "recente do ramo" -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/files/files_source.html:41 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "Arquivo binário (%s)" +#: kallithea/templates/files/files_source.html:69 +#, fuzzy +msgid "File is too big to display." +msgstr "Arquivo é grande demais para exibir" + +#: kallithea/templates/files/files_source.html:71 +#, fuzzy +msgid "Show full annotation anyway." +msgstr "Mostrar diff completo" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" -msgstr "Arquivo é grande demais para exibir" +#, fuzzy +msgid "Show as raw." +msgstr "Mostrar original" #: kallithea/templates/files/files_ypjax.html:5 msgid "annotation" @@ -5650,12 +5167,12 @@ msgid "%s Followers" msgstr "%s Seguidores" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "Seguidores" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "Começou a seguir -" @@ -5664,36 +5181,36 @@ msgstr "Começou a seguir -" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "Nome da bifurcação" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 #, fuzzy msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Privado" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Copiar permissões" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "Copiar permissões do repositório bifurcado" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "Atualizar após clonar" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "Checkout fontes depois de criar o clone" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5703,40 +5220,40 @@ msgid "%s Forks" msgstr "%s Bifurcações" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "Bifurcações" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "Bifurcado" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "Ainda não há bifurcações" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 msgid "ATOM journal feed" msgstr "ATOM feed do diário" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "RSS feed do diário" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "Ainda não há entradas" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "ATOM feed do diário público" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "RSS feed do diário público" @@ -5746,31 +5263,36 @@ msgstr "RSS feed do diário público" msgid "New Pull Request" msgstr "Novo pull request" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "Título" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "Escreva uma breve descrição para este pull request" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "Fluxo de changesets" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "Repositório origem" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "Revisão" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "Repositório de destino" @@ -5784,6 +5306,10 @@ msgstr "Ainda não há entradas" msgid "Vote" msgstr "revogar" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "Idade" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5807,7 +5333,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "Fechado" @@ -5835,114 +5361,106 @@ msgstr "%s Pull Request #%s" msgid "Pull request %s from %s#%s" msgstr "Pull requests de %s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 #, fuzzy msgid "Summarize the changes" msgstr "Realizar commit das alterações" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "Estado do pull request calculado a partir dos votos" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "Ainda não revisado por" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "%d revisor" -msgstr[1] "%d revisores" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "O pull request foi revisado por todos os revisores" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -#, fuzzy -msgid "There are no reviewers" -msgstr "Ainda não há ramos" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 #, fuzzy msgid "on" msgstr "nenhum" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "Puxar mudanças" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -#, fuzzy -msgid "Update" -msgstr "usuário [atualizado]" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "Registro" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -#, fuzzy -msgid "Pull Request Reviewers" -msgstr "Revisores do pull request" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#, fuzzy +msgid "Cancel Changes" +msgstr "Mudanças mais recentes" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#, fuzzy +#| msgid "reviewer" +msgid "Reviewers" +msgstr "revisor" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 #, fuzzy msgid "Remove reviewer" msgstr "revisor" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 #, fuzzy msgid "Potential Reviewers" msgstr "Visualizar comentário" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -#, fuzzy -msgid "Save as New Pull Request" -msgstr "Crie novo pull request" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -#, fuzzy -msgid "Cancel Changes" -msgstr "Mudanças mais recentes" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 #, fuzzy msgid "Pull Request Content" msgstr "O pull request mudou de estado" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +#, fuzzy +msgid "Common ancestor" +msgstr "Comentário no changeset" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5950,7 +5468,6 @@ msgstr "%s Pull Requests" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull Requests from '%s'" msgstr "Pull requests de %s" @@ -5959,38 +5476,44 @@ msgstr "Pull requests de %s" msgid "Pull Requests to '%s'" msgstr "Pull requests para %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 #, fuzzy msgid "Open New Pull Request" msgstr "Crie novo pull request" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "Pull requests para %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "Pull requests de %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 #, fuzzy msgid "Show closed pull requests (in addition to open pull requests)" msgstr "Mostrar pull requests fechados também" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 #, fuzzy msgid "Pull Requests Created by Me" msgstr "Revisores do pull request" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Revisores do pull request" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 #, fuzzy msgid "Pull Requests I Participate In" msgstr "Eu participo em" @@ -6006,29 +5529,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "Buscar em todos os repositórios" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "Termo de pesquisa" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "Pesquisando em" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "Conteúdo dos arquivos" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "Mensagens de commit" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "Nomes dos arquivos" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "Permissão negada" @@ -6038,80 +5561,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "%s ATOM feed" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "%s RSS feed" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "Habilitar" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "Estatísticas coletadas:" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "arquivos" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "Mostrar mais" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "commits" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "arquivos adicionados" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "arquivos alterados" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "arquivos removidos" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "commit" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "arquivo adicionado" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "arquivo alterado" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "arquivo removido" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "%s Sumário" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "Repositório travado por %s" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "Repositório destravado" @@ -6119,93 +5642,276 @@ msgstr "Repositório destravado" msgid "Fork of" msgstr "Bifurcação de" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "Clonar de" -#: kallithea/templates/summary/summary.html:72 -#, fuzzy -msgid "Clone URL" -msgstr "URL de clonagem" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "Mostrar por ID" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" msgstr "Mostrar por Nome" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "Mostrar por ID" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "Tendências em arquivos" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "Download" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "Ainda não há downloads" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "Downloads estão desabilitados para este repositório" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "Download como zip" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "Marque isto para descarregar arquivo com subrepositórios" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 #, fuzzy msgid "With subrepos" msgstr "com subrepositórios" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Tamanho do Repositório" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "Feed" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 #, fuzzy msgid "Latest Changes" msgstr "Mudanças mais recentes" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:177 #, fuzzy msgid "Quick Start" msgstr "Início rápido" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "Adicionar ou enviar arquivos diretamente pelo Kallithea" + +#: kallithea/templates/summary/summary.html:196 +#, fuzzy +msgid "Push new repository" +msgstr "Fazer push de novo repositório" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "Repositório existente?" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "Descarregar %s como %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s Tags" - -#: kallithea/templates/tags/tags.html:26 -#, fuzzy -msgid "Compare Tags" -msgstr "Comparar tags" - -#~ msgid "increase diff context to %(num)s lines" +#~ msgid "There is no index to search in. Please run whoosh indexer" #~ msgstr "" +#~ "Não há índice onde pesquisa. Por favor execute o indexador whoosh" + +#~ msgid "IP %s not allowed" +#~ msgstr "IP %s não permitido" + +#, fuzzy +#~ msgid "%(user)s commented on changeset %(age)s" +#~ msgstr "%(user)s comentou no changeset em %(when)s" + +#, fuzzy +#~ msgid "%(user)s sent message %(age)s" +#~ msgstr "%(user)s enviou mensagem em %(when)s" + +#, fuzzy +#~ msgid "%(user)s mentioned you %(age)s" +#~ msgstr "%(user)s mencionou-o em %(when)s" + +#, fuzzy +#~ msgid "%(user)s registered in Kallithea %(age)s" +#~ msgstr "%(user)s registrou-se no Kallithea em %(when)s" + +#, fuzzy +#~ msgid "%(user)s opened new pull request %(age)s" +#~ msgstr "%(user)s abriu um novo pull request em %(when)s" + +#, fuzzy +#~ msgid "%(user)s commented on pull request %(age)s" +#~ msgstr "%(user)s comentou no pull request em %(when)s" + +#~ msgid "%(user)s commented on changeset at %(when)s" +#~ msgstr "%(user)s comentou no changeset em %(when)s" + +#~ msgid "%(user)s sent message at %(when)s" +#~ msgstr "%(user)s enviou mensagem em %(when)s" + +#~ msgid "%(user)s mentioned you at %(when)s" +#~ msgstr "%(user)s mencionou-o em %(when)s" + +#~ msgid "%(user)s registered in Kallithea at %(when)s" +#~ msgstr "%(user)s registrou-se no Kallithea em %(when)s" + +#~ msgid "%(user)s opened new pull request at %(when)s" +#~ msgstr "%(user)s abriu um novo pull request em %(when)s" + +#~ msgid "%(user)s commented on pull request at %(when)s" +#~ msgstr "%(user)s comentou no pull request em %(when)s" + +#, fuzzy +#~| msgid "Repository group" +#~ msgid "Repository Group" +#~ msgstr "Grupo de repositórios" + +#~ msgid "My Notifications" +#~ msgstr "Minhas Notificações" + +#~ msgid "All" +#~ msgstr "Todos" + +#~ msgid "Comments" +#~ msgstr "Comentários" + +#, fuzzy +#~ msgid "Mark All Read" +#~ msgstr "Marcar tudo como lido" + +#, fuzzy +#~| msgid "Mark All Read" +#~ msgid "Mark as read" +#~ msgstr "Marcar tudo como lido" + +#~ msgid "No notifications here yet" +#~ msgstr "Ainda não há notificações aqui" + +#, fuzzy +#~ msgid "Show Notification" +#~ msgstr "Mostrar notificação" + +#~ msgid "Notifications" +#~ msgstr "Notificações" + +#~ msgid "Home" +#~ msgstr "Início" + +#~ msgid "with" +#~ msgstr "com" + +#~ msgid "members" +#~ msgstr "membros" + +#~ msgid "Changeset has comments" +#~ msgstr "O changeset tem comentários" + +#~ msgid "Author" +#~ msgstr "Autor" + +#~ msgid "Refs" +#~ msgstr "Refs" + +#, fuzzy +#~ msgid "Commenting on line." +#~ msgstr "Comentando a linha {1}." + +#, fuzzy +#~| msgid "on pull request" +#~ msgid "Pull request from" +#~ msgstr "Comentar no pull request #%s" + +#, fuzzy +#~| msgid "Date" +#~ msgid "at" +#~ msgstr "Data" + +#~ msgid "Previous revision" +#~ msgstr "Revisão anterior" + +#~ msgid "Next revision" +#~ msgstr "Próxima revisão" + +#~ msgid "Follow current branch" +#~ msgstr "Seguir o ramo atual" + +#~ msgid "Still not reviewed by" +#~ msgstr "Ainda não revisado por" + +#~ msgid "%d reviewer" +#~ msgid_plural "%d reviewers" +#~ msgstr[0] "%d revisor" +#~ msgstr[1] "%d revisores" + +#~ msgid "Pull request was reviewed by all reviewers" +#~ msgstr "O pull request foi revisado por todos os revisores" + +#, fuzzy +#~ msgid "There are no reviewers" +#~ msgstr "Ainda não há ramos" + +#, fuzzy +#~ msgid "Pull Request Reviewers" +#~ msgstr "Revisores do pull request" + +#~ msgid "Dashboard" +#~ msgstr "Painel de Controle" + +#~ msgid "Remember me" +#~ msgstr "Lembre-se de mim" + +#~ msgid "Change your avatar at" +#~ msgstr "Altere o seu avatar em" + +#~ msgid "Using" +#~ msgstr "Usando" + +#~ msgid "Rescan option" +#~ msgstr "Opção de varredura" + +#~ msgid "Web" +#~ msgstr "Web" + +#~ msgid "Require SSL for vcs operations" +#~ msgstr "Requer SSL para operações de VCS" + +#~ msgid "Dashboard items" +#~ msgstr "Itens do dashboard" + +#~ msgid "quick filter..." +#~ msgstr "filtro rápido..." + +#~ msgid "Forgot password ?" +#~ msgstr "Esqueceu a senha ?" + +#~ msgid "Ancestor" +#~ msgstr "Antecessor" + +#~ msgid "The changeset status was changed to" +#~ msgstr "O estado do changeset foi alterado para" + +#, fuzzy +#~ msgid "The comment closed the pull request with status" +#~ msgstr "%s comentou no pull request \"%s\"" + +#, fuzzy +#~ msgid "The comment was made with status" +#~ msgstr "O pull request foi fechado com o estado" + +#~ msgid "View this user here" +#~ msgstr "Veja este usuário aqui" + +#~ msgid "Repository Size" +#~ msgstr "Tamanho do Repositório" #~ msgid "No comments." #~ msgstr "%d comentário" @@ -6216,18 +5922,6 @@ msgstr "Comparar tags" #~ msgid "journal" #~ msgstr "diário" -#~ msgid "bad captcha" -#~ msgstr "" - -#~ msgid "unmodified" -#~ msgstr "" - -#~ msgid "Locked repository" -#~ msgstr "" - -#~ msgid "Unlocked repository" -#~ msgstr "" - #~ msgid "Unlocked" #~ msgstr "Destravado" @@ -6243,9 +5937,6 @@ msgstr "Comparar tags" #~ msgid "No Files" #~ msgstr "Nenhum Arquivo" -#~ msgid "" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "O username \\\"%(username)s\\\" é proibido" @@ -6258,66 +5949,29 @@ msgstr "Comparar tags" #~ msgid "invalid clone URL" #~ msgstr "URL de clonagem inválida" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "URL inválida, por favor, forneça uma URL de clone http(s)/svn+http(s)" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" +#~ msgid "" +#~ "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" #~ msgstr "" +#~ "URL inválida, por favor, forneça uma URL de clone http(s)/svn+http(s)" #~ msgid "Defaults" #~ msgstr "Padrões" -#~ msgid "My Emails" -#~ msgstr "" - #~ msgid "Watched" #~ msgstr "Seguindo" #~ msgid "My Permissions" #~ msgstr "Minhas permissões" -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "Confirm to reset this api key: %s" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "Confirm to remove this api key: %s" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - #~ msgid "delete" #~ msgstr "excluir" -#~ msgid "current IP" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "Administração de permissões" -#~ msgid "Overview" -#~ msgstr "" - #~ msgid "Overwrite existing settings" #~ msgstr "Sobrescrever as configurações existentes" -#~ msgid "Default IP Whitelist for All Users" -#~ msgstr "" - #~ msgid "Default User Permissions Overview" #~ msgstr "Permissões padrão" @@ -6333,15 +5987,6 @@ msgstr "Comparar tags" #~ msgid "admin" #~ msgstr "administrador" -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - #~ msgid "Optional URL from which repository should be cloned." #~ msgstr "URL opcional http[s] da qual o repositório deve ser clonado." @@ -6351,81 +5996,18 @@ msgstr "Comparar tags" #~ msgid "Pull Changes from Remote Location" #~ msgstr "Realizar pull de alterações a partir de localização remota" -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - #~ msgid "Non-changeable id" #~ msgstr "ID inalterável" #~ msgid "edit" #~ msgstr "editar" -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - #~ msgid "Destroy old data" #~ msgstr "Destruir dados antigos" -#~ msgid "check for updates" -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "Permissões padrão" -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "Alteração de estado no changeset" @@ -6435,30 +6017,15 @@ msgstr "Comparar tags" #~ msgid "Comment on changeset" #~ msgstr "Comentário no changeset" -#~ msgid "revision" -#~ msgstr "" - #~ msgid "Mimetype" #~ msgstr "Mimetype" #~ msgid "My Repos" #~ msgstr "Meus repositórios" -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - #~ msgid "owner" #~ msgstr "dono" -#~ msgid "reviewer" -#~ msgstr "revisor" - #~ msgid "Your new Kallithea password:%s" #~ msgstr "Sua nova senha no Kallithea: %s" @@ -6472,11 +6039,159 @@ msgstr "Comparar tags" #~ msgstr "Você pode gerá-la clicando na seguinte URL" #~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "Por favor, ignore este email se você não requisitou uma nova senha." +#~ msgstr "" +#~ "Por favor, ignore este email se você não requisitou uma nova senha." #~ msgid "Created by" #~ msgstr "criado" -#~ msgid "You can only delete files with revision being a valid branch " +#~ msgid "Confirm to invalidate repository cache." +#~ msgstr "Confirma invalidar cache do repositório" + +#~ msgid "Comments parsed using %s syntax with %s support." +#~ msgstr "Comentários interpretados usando a sintaxe %s com suporte a %s." + +#~ msgid "Comment preview" +#~ msgstr "Visualizar comentário" + +#~ msgid "Preview" +#~ msgstr "Visualizar" + +#~ msgid "Closing." +#~ msgstr "carregando ..." + +#~ msgid "Repository no access" +#~ msgstr "Nenhum acesso ao repositório" + +#~ msgid "Repository read access" +#~ msgstr "Acesso de leitura ao repositório" + +#~ msgid "Repository write access" +#~ msgstr "Acesso de escrita ao repositório" + +#~ msgid "Repository admin access" +#~ msgstr "Acesso administrativo ao repositório" + +#~ msgid "Repository Group no access" +#~ msgstr "Nenhum acesso ao Grupo de Repositórios" + +#~ msgid "Repository Group read access" +#~ msgstr "Acesso de leitura ao Grupo de Repositórios" + +#~ msgid "Repository Group write access" +#~ msgstr "Acesso de escrita ao Grupo de Repositórios" + +#~ msgid "Repository Group admin access" +#~ msgstr "Acesso administrativo ao Grupo de Repositórios" + +#~ msgid "Repository creation disabled" +#~ msgstr "Criação de repositórios desabilitada" + +#~ msgid "Repository creation enabled" +#~ msgstr "Criação de repositórios habilitada" + +#~ msgid "Repository forking disabled" +#~ msgstr "Bifurcação de repositórios desabilitada" + +#~ msgid "Repository forking enabled" +#~ msgstr "Bifurcação de repositórios habilitada" + +#~ msgid "Register disabled" +#~ msgstr "Registro desabilitado" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Registro de novo usuário no Kallithea com ativação manual" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "Registro de novo usuário no Kallithea com auto-ativação" + +#~ msgid "Not Reviewed" +#~ msgstr "Não Revisado" + +#~ msgid "Rejected" +#~ msgstr "Rejeitado" + +#~ msgid "Under Review" +#~ msgstr "Sob Revisão" + +#~ msgid "Repository group no access" +#~ msgstr "Sem acesso ao grupo de repositórios" + +#~ msgid "Repository group read access" +#~ msgstr "Acesso de leitura ao grupo de repositórios" + +#~ msgid "Repository group write access" +#~ msgstr "Acesso de escrita ao grupo de repositórios" + +#~ msgid "Repository group admin access" +#~ msgstr "Acesso administrativo ao grupo de repositórios" + +#~ msgid "User group no access" +#~ msgstr "Sem acesso ao grupo de usuários" + +#~ msgid "User group read access" +#~ msgstr "Acesso de leitura ao grupo de usuários" + +#~ msgid "User group write access" +#~ msgstr "Acesso de escrita ao grupo de usuários" + +#~ msgid "User group admin access" +#~ msgstr "Acesso administrativo ao grupo de usuários" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Criação de Grupo de Repositórios desatilibada" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Criação de Grupo de Repositórios habilitada" + +#~ msgid "User Group creation disabled" +#~ msgstr "Criação de Grupo de Usuários desabilitada" + +#~ msgid "User Group creation enabled" +#~ msgstr "Criação de Grupo de Usuários habilitada" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Registro de Usuário com ativação manual de conta" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Registro de Usuário com ativação automática de conta" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" #~ msgstr "" - +#~ "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" + +#~ msgid "repositories" +#~ msgstr "repositórios" + +#~ msgid "No repositories found." +#~ msgstr "Nenhum repositório encontrado." + +#~ msgid "There are no branches yet" +#~ msgstr "Ainda não há ramos" + +#~ msgid "There are no tags yet" +#~ msgstr "Ainda não há etiquetas" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Ainda não há marcadores" + +#~ msgid "%s Bookmarks" +#~ msgstr "%s Bookmarks" + +#~ msgid "%s Branches" +#~ msgstr "%s Ramos" + +#~ msgid "Editing file" +#~ msgstr "Editando arquivo" + +#~ msgid "Update" +#~ msgstr "usuário [atualizado]" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Crie novo pull request" + +#~ msgid "%s Tags" +#~ msgstr "%s Tags" + +#~ msgid "Compare Tags" +#~ msgstr "Comparar tags" diff --git a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/ru/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/ru/LC_MESSAGES/kallithea.po @@ -12,471 +12,493 @@ # SkryabinD , 2014 # softforwinxp , 2013 # zhmylove , 2013 -# Andrew Shadura , 2015 +# Andrej Shadura , 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" "PO-Revision-Date: 2017-01-05 14:58+0000\n" -"Last-Translator: Andrew Shadura \n" -"Language-Team: Russian " -"\n" +"Last-Translator: Andrej Shadura \n" +"Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" -"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.11-dev\n" -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "Ещё не было изменений" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Ничего" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(закрыто)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "Отображать пробелы" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Игнорировать пробелы" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Увеличить контекст до %(num)s строк" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +#, fuzzy +#| msgid "No permissions defined yet" +msgid "No permission to change status" +msgstr "Привилегии еще не назначены" + +#: kallithea/controllers/changeset.py:214 +#, fuzzy, python-format +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 msgid "Such revision does not exist for this repository" msgstr "Нет такой ревизии в этом репозитории" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" -"Нельзя редактировать статус изменений, связанных с закрытыми pull-" -"request'ами" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "Выбрать набор изменений" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Перейти на верхушку репозитория" + +#: kallithea/controllers/compare.py:72 +#, fuzzy +#| msgid "Cannot compare repositories without using common ancestor" +msgid "Cannot compare repositories of different types" +msgstr "Невозможно сравнивать репозитории без общего предка" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "Невозможно сравнивать репозитории без общего предка" +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "Нет ответа" + #: kallithea/controllers/error.py:71 -msgid "No response" -msgstr "Нет ответа" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Неизвестная ошибка" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." msgstr "Запрос не распознан сервером из-за неправильного синтаксиса." -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "Несанкционированный доступ к ресурсу" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "У вас нет прав для просмотра этой страницы" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "Ресурс не найден" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." -msgstr "Сервер не может выполнить запрос из-за неправильного условия в запросе." - -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "Изменения в репозитории %s" - -#: kallithea/controllers/feed.py:56 +msgstr "" +"Сервер не может выполнить запрос из-за неправильного условия в запросе." + +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "%s выполнил коммит в %s" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "Изменения оказались слишком большими и были вырезаны..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 #, python-format msgid "%s %s feed" msgstr "Лента новостей %s %s" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "Изменения оказались слишком большими и были вырезаны..." - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "%s выполнил коммит в %s" - -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" +msgstr "Изменения в репозитории %s" + +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Нажмите чтобы добавить новый файл" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "Нет файлов. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "%s (%s)" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Репозиторий заблокировал %s в %s" -#: kallithea/controllers/files.py:317 -#, fuzzy -#| msgid "You can only delete files with revision being a valid branch " +#: kallithea/controllers/files.py:312 msgid "You can only delete files with revision being a valid branch" -msgstr "Вы можете удалять файлы только в ревизии, связанной с существующей веткой " - -#: kallithea/controllers/files.py:328 +msgstr "" +"Вы можете удалять файлы только в ревизии, связанной с существующей веткой " + +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Файл %s удалён с помощью Kallithea" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "Файл %s удалён" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "Во время коммита произошла ошибка" -#: kallithea/controllers/files.py:377 -#, fuzzy -#| msgid "You can only edit files with revision being a valid branch " +#: kallithea/controllers/files.py:372 msgid "You can only edit files with revision being a valid branch" msgstr "" "Вы можете редактировать файлы только в ревизии, связанной с существующей " "веткой " -#: kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "Файл %s отредактирован с помощью Kallithea" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "Без изменений" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "Изменения применены в %s" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "Файл добавлен с помощью Kallithea" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "Пусто" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "Безымянный" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" msgstr "" -"Расположение должно быть относительным путем, и не должно содержать " -"\"..\" в пути" - -#: kallithea/controllers/files.py:526 +"Расположение должно быть относительным путем, и не должно содержать \".." +"\" в пути" + +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "Возможность скачивать отключена" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "Неизвестная ревизия %s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "Пустой репозиторий" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "Неизвестный тип архива" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Набор изменений" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Ветки" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Метки" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "Произошла ошибка во время создания форка репозитория %s" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "Группы" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Репозитории" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Ветка" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "Закрытые ветки" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "Тэги" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "Закладки" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "Публичный журнал" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Журнал" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "Неверная капча" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "Регистрация в Kallithea прошла успешно" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "Регистрация в %s прошла успешно" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" -msgstr "Код для сброса пароля отправлен" - -#: kallithea/controllers/login.py:246 +msgstr "Код для сброса пароля отправлена" + +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" msgstr "Неверный код сброса пароля" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "Пароль обновлён" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" msgstr "%s (закрыта)" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Изменения" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" msgstr "Специальный" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "Ветки участника" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "Закладки" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "Ошибка при создании pull-запроса: %s" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "Нет описания" - -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "Pull-запрос создан успешно" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 msgid "Error occurred while creating pull request" msgstr "Произошла ошибка при создании pull-запроса" -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "Отсутствующие ревизии относительно предыдущего pull-запроса:" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "Новые ревизии на %s %s относительно предыдущего pull-запроса:" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "Этот pull-запрос основан на другой ревизии %s, простой diff невозможен." - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "Нет изменений на %s %s относительно предыдущей версии." - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "Закрыт, замещён %s ." - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "Pull-запрос создан успешно" + +#: kallithea/controllers/pullrequests.py:375 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" msgstr "Обновление для pull-запроса создано" -#: kallithea/controllers/pullrequests.py:514 +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "Нет описания" + +#: kallithea/controllers/pullrequests.py:432 msgid "Pull request updated" msgstr "Pull-запрос обновлён" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "Pull-запрос успешно удалён" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, fuzzy, python-format +#| msgid "Changeset for %s %s not found in %s" +msgid "Revision %s not found in %s" +msgstr "Набор изменений не найден" + +#: kallithea/controllers/pullrequests.py:508 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "Нет изменений для обновления этого pull-запроса." + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." msgstr "Этот pull-запрос уже принят на ветку %s." -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "Этот pull-запрос был закрыт и не может быть обновлён." -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "Этот pull-запрос может быть обновлён из %s:" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." msgstr "Нет изменений для обновления этого pull-запроса." -#: kallithea/controllers/pullrequests.py:627 +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Внимание: Ветка %s имеет ещё одну верхушку: %s." -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." +#: kallithea/controllers/pullrequests.py:564 +#, fuzzy +#| msgid "Git pull requests don't support updates yet." +msgid "Git pull requests don't support iterating yet." msgstr "Обновление pull-запросы git не поддерживается." -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "Закрыт." - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/pullrequests.py:566 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "Нет изменений для обновления этого pull-запроса." + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "Недопустимый поисковый запрос. Попробуйте заключить его в кавычки." #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "Индексы отсутствуют. Пожалуйста, запустите индексатор Whoosh" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Произошла ошибка при выполнении этого поиска." -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "Нет данных" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "Статистические данные отключены для этого репозитария" @@ -488,152 +510,154 @@ msgstr "Настройки авторизации успешно обновлены" msgid "error occurred during update of auth settings" msgstr "произошла ошибка при обновлении настроек авторизации" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "Стандартные настройки успешно обновлены" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "Произошла ошибка при обновлении стандартных настроек" -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 #, fuzzy msgid "Forever" msgstr "навсегда" -#: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 msgid "5 minutes" msgstr "5 минут" +#: kallithea/controllers/admin/gists.py:60 +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "1 час" + #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" -msgstr "1 час" - -#: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 msgid "1 day" msgstr "1 день" -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/gists.py:62 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 месяц" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "Срок" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "Произошла ошибка во время создания gist-записи" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "Gist-запись %s удалена" -#: kallithea/controllers/admin/gists.py:233 +#: kallithea/controllers/admin/gists.py:196 msgid "Unmodified" -msgstr "Без изменений" - -#: kallithea/controllers/admin/gists.py:262 +msgstr "Неизменный" + +#: kallithea/controllers/admin/gists.py:225 msgid "Successfully updated gist content" msgstr "" -#: kallithea/controllers/admin/gists.py:267 +#: kallithea/controllers/admin/gists.py:230 msgid "Successfully updated gist data" msgstr "Данные gist-записи обновлены" -#: kallithea/controllers/admin/gists.py:270 +#: kallithea/controllers/admin/gists.py:233 #, python-format msgid "Error occurred during update of gist %s" msgstr "Произошла ошибка при обновлении gist-записи %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Вы не можете изменить данные этого пользователя, поскольку он важен для " "работы всего приложения" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "Ваша учетная запись успешно обновлена" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "Произошла ошибка при обновлении пользователя %s" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "Ошибка при обновлении пароля" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "Пользователю добавлен e-mail %s" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "Произошла ошибка при сохранении e-mail" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "E-mail пользователя удалён" -#: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 msgid "API key successfully created" msgstr "API-ключ успешно создан" -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 msgid "API key successfully reset" msgstr "API-ключ успешно сброшен" -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "API-ключ успешно удалён" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "Чтение" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "Запись" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -641,277 +665,269 @@ msgstr "Запись" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "Администратор" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "Отключено" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "Разрешена, с ручной активацией учётной записи" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "Разрешена, с автоматической активацией учётной записи" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "Ручная активация внешней учетной записи" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "Автоматическая активация внешней учетной записи" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "Отключено" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "Разрешена, с ручной активацией учётной записи" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "Разрешена, с автоматической активацией учётной записи" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "Ручная активация внешней учетной записи" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "Автоматическая активация внешней учетной записи" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "Включено" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "Глобальные привилегии успешно обновлены" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "Произошла ошибка во время обновления привилегий" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Произошла ошибка при создании группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "Создана новая группа репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "Группа репозиториев %s обновлена" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Произошла ошибка при обновлении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Данная группа содержит %s репозитариев и не может быть удалена" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Группа содержит в себе %s подгрупп и не может быть удалён" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "Группа репозиториев %s удалена" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Произошла ошибка при удалении группы репозиториев %s" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "Администратор не может отозвать свои привелегии" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "Привилегии группы репозиториев обновлены" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "Произошла ошибка при отзыве привелегии" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "Произошла ошибка при создании репозитория %s" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "Репозиторий %s создан из %s" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "Сделан форк(копия) репозитория %s на %s" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "Репозиторий %s создан" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "Репозитарий %s успешно обновлён" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "Произошла ошибка во время обновления репозитория %s" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "Форки %s отсоединены" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "Удалены форки репозитория %s" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "Репозиторий %s удалён" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Невозможно удалить %s, у него всё ещё есть форки" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "Произошла ошибка во время удаления %s" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "Привилегии репозитория обновлены" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "An error occurred during creation of field" +msgid "An error occurred during creation of field: %r" msgstr "Произошла ошибка при создании поля" -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "Произошла ошибка при удалении поля" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "-- Не форк --" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:446 msgid "Updated repository visibility in public journal" msgstr "Видимость репозитория в публичном журнале обновлена" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:450 msgid "An error occurred during setting this repository in public journal" msgstr "Произошла ошибка при установке репозитария в общедоступный журнал" -#: kallithea/controllers/admin/repos.py:512 +#: kallithea/controllers/admin/repos.py:466 msgid "Nothing" msgstr "Ничего" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:468 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Репозиторий %s отмечен как форк %s" -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:475 msgid "An error occurred during this operation" msgstr "Произошла ошибка при выполнении операции" -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 msgid "Repository has been locked" msgstr "Репозиторий заблокирован" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" msgstr "Репозиторий разблокирован" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "Произошла ошибка во время разблокирования" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "Кэш сброшен" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "Произошла ошибка при очистке кэша" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "Внесены изменения из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "Произошла ошибка при внесении изменений из удалённого репозитория" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "Произошла ошибка при удалении статистики репозитория" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "Обновлены настройки VCS" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -919,351 +935,356 @@ msgstr "" "Невозможно включить поддержку hgsubversion. Библиотека «hgsubversion» " "отсутствует" -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "Произошла ошибка при обновлении настроек приложения" -#: kallithea/controllers/admin/settings.py:211 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Репозитории успешно пересканированы, добавлено: %s, удалено: %s." -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, fuzzy, python-format -#| msgid "Invalidate cache for all repositories" msgid "Invalidated %s repositories" msgstr "Сбросить кэш для всех репозиториев" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "Обновленные параметры настройки приложения" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "Настройки визуализации обновлены" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "Произошла ошибка при обновлении настроек визуализации" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "Пожалуйста, введите адрес электронной почты" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "Задача отправки Email создана" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +#, fuzzy +#| msgid "No data ready yet" +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 "Added new hook" msgstr "Добавлена новая ловушка" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "Обновлённые ловушки" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "произошла ошибка при создании хука" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Запланирована переиндексация базы Whoosh" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "Создана группа пользователей %s" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Произошла ошибка при создании группы пользователей %s" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "Группа пользователей %s обновлена" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "Произошла ошибка при обновлении группы пользователей %s" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "Группа пользователей успешно удалена" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "Произошла ошибка при удалении группы пользователей" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "Целевая группа не может быть такой же" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "Привилегии группы пользователей обновлены" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "Обновлены привилегии" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "Произошла ошибка при сохранении привилегий" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "Пользователь %s создан" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "Произошла ошибка при создании пользователя %s" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "Пользователь успешно обновлён" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "Пользователь успешно удалён" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "Произошла ошибка при удалении пользователя" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "Добавлен IP %s в белый список пользователя" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "Произошла ошибка при сохранении IP" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "Удален IP %s из белого списка пользователя" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "IP %s заблокирован" - -#: kallithea/lib/auth.py:757 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 +#: kallithea/lib/auth.py:824 msgid "You need to be a registered user to perform this action" msgstr "" "Вы должны быть зарегистрированным пользователем, чтобы выполнить это " "действие" -#: kallithea/lib/auth.py:864 +#: kallithea/lib/auth.py:852 msgid "You need to be signed in to view this page" msgstr "Страница доступна только авторизованным пользователям" -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:444 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "Репозиторий не найден на файловой системе" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, fuzzy, python-format -#| msgid "Changeset not found" msgid "Changeset for %s %s not found in %s" msgstr "Набор изменений не найден" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "Двоичный файл" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Набор изменения оказался слишком большими и был урезан, используйте меню " "сравнения для показа результата сравнения" -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "Изменений не обнаружено" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Deleted branch: %s" msgstr "Удалена ветка: %s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:614 #, python-format msgid "Created tag: %s" msgstr "Создан тег: %s" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, fuzzy, python-format -#| msgid "Changeset not found" msgid "Changeset %s not found" msgstr "Набор изменений не найден" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Показать отличия вместе %s->%s" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 #, fuzzy msgid "Compare view" msgstr "сравнение" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "и" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "на %s больше" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "версии" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, fuzzy, python-format msgid "Fork name %s" msgstr "имя форка %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "Pull-запрос %s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "[удален] репозиторий" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "[создан] репозиторий" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "[создан] репозиторий как форк" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "[форкнут] репозиторий" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "[обновлён] репозиторий" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "[загружен] архив из репозитория" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "[удален] репозиторий" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "[создан] пользователь" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "[обновлён] пользователь" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "[создана] группа пользователей" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "[обновлена] группа пользователей" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "[комментарий] к ревизии в репозитории" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "[прокомментировано] в запросе на внесение изменений для" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "[закрыт] Pull-запрос для" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "[отправлено] в" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "[внесены изменения с помощью Kallithea] в репозитории" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "[внесены изменения из удалённого репозитория] в репозиторий" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "[внесены изменения] из" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "[добавлен в наблюдения] репозиторий" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "[удалён из наблюдения] репозиторий" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr " и на %s больше" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "Нет файлов" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "новый файл" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "изменён" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "удалён" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "переименован" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1274,7 +1295,7 @@ msgstr "" "переименован из файловой системы. Пожалуйста, перезапустите приложение " "для сканирования репозиториев" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1282,7 +1303,7 @@ msgstr[0] "%d год" msgstr[1] "%d лет" msgstr[2] "%d года" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1290,7 +1311,7 @@ msgstr[0] "%d месяц" msgstr[1] "%d месяца" msgstr[2] "%d месяцев" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1298,7 +1319,7 @@ msgstr[0] "%d день" msgstr[1] "%d дня" msgstr[2] "%d дней" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1306,7 +1327,7 @@ msgstr[0] "%d час" msgstr[1] "%d часов" msgstr[2] "%d часа" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1314,7 +1335,7 @@ msgstr[0] "%d минута" msgstr[1] "%d минут" msgstr[2] "%d минуты" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1322,722 +1343,330 @@ msgstr[0] "%d секунды" msgstr[1] "%d секунды" msgstr[2] "%d секунды" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "в %s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "%s назад" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "в %s и %s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "%s и %s назад" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "прямо сейчас" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "Репозитарий - нет доступа" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "Репозитарий - доступ на чтение" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "Репозитарий - доступ на запись" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "Репозитарий - администрирование" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "Группа Репозиториев - нет доступа" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "Группа Репозиториев - доступ на чтение" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "Группа Репозиториев - доступ на запись" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "Группа Репозиториев - администрирование" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "Администратор Kallithea" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "Создание репозиториев отключено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "Создание репозиториев включено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "Возможность создавать форк репозитория отключена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "Возможность создавать форк репозитория включена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "Регистрация отключена" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "Регистрация нового пользователя в Kallithea с ручной активацией" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "Регистрация нового пользователя в Kallithea с автоматической активацией" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "Не просмотрено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "Одобрено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "Отклонено" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "На рассмотрении" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "верхний уровень" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "Группа Репозиториев - нет доступа" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "Группа репозиториев - доступ на чтение" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "Группа репозиториев - доступ на запись" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "Группа репозиториев - администрирование" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "Группа пользователей - нет доступа" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "Группа пользователей - доступ на чтение" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "Группа пользователей - доступ на запись" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "Группа пользователей - администрирование" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "Создание групп репозиториев отключено" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "Создание групп репозиториев включено" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "Создание групп пользователей отключено" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "Создание групп пользователей включено" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "Регистрация отключена" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "Регистрация пользователя с ручной активацией учётной записи" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "Регистрация пользователя с автоматической активацией" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "на строке %s" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[Упоминание]" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "верхний уровень" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "Администратор Kallithea" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" msgstr "Неавторизованные пользователи имеют право чтения новых репозиториев" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" -msgstr "Неавторизованные пользователи имеют право записи в новые репозитории" - -#: kallithea/model/db.py:1671 +msgstr "" +"Неавторизованные пользователи имеют право записи в новые репозитории" + +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "Только администраторы могут создавать группы" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 #, fuzzy msgid "Non-admins can create repository groups" msgstr "Создана новая группа репозиториев %s" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 #, fuzzy msgid "Only admins can create user groups" msgstr "Создавать группы пользователей" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 #, fuzzy msgid "Non-admins can create user groups" msgstr "Создавать группы пользователей" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 #, fuzzy msgid "Only admins can fork repositories" msgstr "Местонахождение репозиториев" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 #, fuzzy -#| msgid "Non-admins can can fork repositories" msgid "Non-admins can fork repositories" msgstr "Сбросить кэш для всех репозиториев" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "Регистрация отключена" + +#: kallithea/model/db.py:1736 #, fuzzy msgid "User registration with manual account activation" msgstr "Регистрация пользователя с ручной активацией учётной записи" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 #, fuzzy msgid "User registration with automatic account activation" msgstr "Регистрация пользователя с автоматической активацией" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2263 #, fuzzy msgid "Not reviewed" msgstr "Не просмотрено" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 #, fuzzy msgid "Under review" msgstr "На рассмотрении" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2265 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "Одобрено" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "Одобрено" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "Пожалуйста, введите логин" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Введите значение длиной не менее %(min)i символов" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "Пожалуйста, введите пароль" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "Введите не менее %(min)i символов" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "%(user)s оставил комментарий к набору изменений %(age)s" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "%(user)s отправил сообщение %(age)s" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "%(user)s упомянул вас %(age)s" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "%(user)s зарегистрировался в Kallithea %(age)s" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "%(user)s открыл новый pull-запрос %(age)s" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "%(user)s оставил комментарий к pull-запросу %(age)s" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "%(user)s оставил комментарий к набору изменений %(when)s" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "%(user)s отправил сообщение %(when)s" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "%(user)s упомянул вас %(when)s" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "%(user)s зарегистрировался в Kallithea %(when)s" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "%(user)s открыл новый pull-запрос %(when)s" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "%(user)s оставил комментарий к pull-запросу %(when)s" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, fuzzy, python-format +#| msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "[прокомментировано] в запросе на внесение изменений для" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "Новый пользователь \"%(new_username)s\" зарегистрирован" -#: kallithea/model/notification.py:308 -#, fuzzy, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" - -#: kallithea/model/notification.py:309 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "[прокомментировано] в запросе на внесение изменений для" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "Закрыт" -#: kallithea/model/pull_request.py:137 +#: kallithea/model/pull_request.py:76 #, fuzzy, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" - -#: kallithea/model/scm.py:812 +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" +"%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" + +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "Ошибка при создании pull-запроса: %s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "Подтвердите удаление этого pull-request'а" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "Отсутствующие ревизии относительно предыдущего pull-запроса:" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "Новые ревизии на %s %s относительно предыдущего pull-запроса:" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, fuzzy, python-format +#| msgid "" +#| "This pull request is based on another %s revision and there is no " +#| "simple diff." +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" +"Этот pull-запрос основан на другой ревизии %s, простой diff невозможен." + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "No changes found on %s %s since previous version." +msgid "No changes found on %s %s since previous iteration." +msgstr "Нет изменений на %s %s относительно предыдущей версии." + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "последняя версия" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "Регистрация нового пользователя" -#: kallithea/model/user.py:256 +#: kallithea/model/user.py:253 #, fuzzy -msgid "You can't remove this user since it is crucial for the entire application" +msgid "" +"You can't remove this user since it is crucial for the entire application" msgstr "" "Вы не можете удалить пользователя, поскольку это критично для работы " "всего приложения" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -"Пользователь \"%s\" всё ещё является владельцем %s репозиториев и поэтому" -" не может быть удалён. Смените владельца или удалите эти репозитории: %s" - -#: kallithea/model/user.py:266 +"Пользователь \"%s\" всё ещё является владельцем %s репозиториев и поэтому " +"не может быть удалён. Смените владельца или удалите эти репозитории: %s" + +#: kallithea/model/user.py:263 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" msgstr "" "Пользователь \"%s\" всё ещё является владельцем %s групп репозиториев и " "поэтому не может быть удалён. Смените владельца или удалите данные " "группы: %s" -#: kallithea/model/user.py:273 +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -2047,65 +1676,65 @@ msgstr "" "поэтому не может быть удалён. Смените владельца или удалите данные " "группы: %s" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "Ссылка сброса пароля" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 #, fuzzy msgid "Password reset notification" msgstr "Ссылка сброса пароля" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "Значение не может быть пустым списком" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Пользователь с именем \"%(username)s\" уже существует" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Имя \"%(username)s\" недопустимо" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 #, fuzzy msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" msgstr "" "Имя пользователя может содержать только буквы, цифры, символы " "подчеркивания, точки и тире; а так же должно начинаться с буквы, цифры " "либо с символа подчеркивания" -#: kallithea/model/validators.py:126 +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:112 #, python-format msgid "Username %(username)s is not valid" msgstr "Имя \"%(username)s\" недопустимо" -#: kallithea/model/validators.py:152 +#: kallithea/model/validators.py:133 msgid "Invalid user group name" msgstr "Неверное имя группы пользователей" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Группа пользователей \"%(usergroup)s\" уже существует" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -2113,107 +1742,107 @@ msgstr "" "имя группы пользователей может содержать только буквы, цифры, символы " "подчеркивания, точки и тире; а так же должно начинаться с буквы или цифры" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "Невозможно использовать эту группу как родителя" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Группа \"%(group_name)s\" уже существует" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Репозитарий с именем \"%(group_name)s\" уже существует" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "Недопустимые символы (не ascii) в пароле" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "Неверно задан старый пароль" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 #, fuzzy msgid "Invalid username or password" msgstr "неверный пароль" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:312 msgid "Token mismatch" msgstr "Несовпадение токенов" -#: kallithea/model/validators.py:345 +#: kallithea/model/validators.py:328 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Имя репозитория %(repo)s запрещено" -#: kallithea/model/validators.py:347 +#: kallithea/model/validators.py:330 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Репозитарий %(repo)s уже существует" -#: kallithea/model/validators.py:348 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Репозитарий \"%(repo)s\" уже существует в группе \"%(group)s\"" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Группа репозиториев \"%(repo)s\" уже существует" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 #, fuzzy msgid "Invalid repository URL" msgstr "приватный репозиторий" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "Тип форка будет совпадать с родительским" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "У вас недостаточно прав для создания репозиториев в этой группе" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "недостаточно прав для создания репозитория в корневом каталоге" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "У Вас недостаточно привилегий для создания группы в этом месте" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "Данное имя пользователя или группы пользователей недопустимо" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "Этот путь ошибочен" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 #, fuzzy msgid "This email address is already in use" msgstr "Этот E-mail уже занят" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "\"%(email)s\" не существует." -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -2221,252 +1850,157 @@ msgstr "" "Для входа по LDAP должно быть указано значение аттрибута CN - это " "эквивалент имени пользователя" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Пожалуйста, введите существующий IPv4 или IPv6 адре" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" "Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - " "неверно)" -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Ключевое имя может только состоять из букв, символа подчеркивания, тире " "или чисел" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "Файла нет в каталоге" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "О программе" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "Панель управления" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "фильтр..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "репозитории" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "Добавить репозиторий" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 +#: kallithea/templates/index_base.html:32 msgid "Add Repository Group" msgstr "Добавить группу репозиториев" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" -msgstr "Вы имеете администраторские права на эту группу и можете редактировать её" - -#: kallithea/templates/index_base.html:32 +msgstr "" +"Вы имеете администраторские права на эту группу и можете редактировать её" + +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "Изменить группу репозиториев" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "Имя группы" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "Репозиторий" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "Описание" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "Имя" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "Последнее изменение" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "Состояние" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "Владелец" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "По возрастанию" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "По убыванию" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "Репозитарии не найдены." - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "Ошибка данных." - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "Загрузка..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "Войти" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "Войти в %s" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "Имя пользователя" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "Пароль" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "Запомнить" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "Забыли пароль?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "Нет аккаунта?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "Войти" @@ -2474,149 +2008,133 @@ msgstr "Войти" msgid "Password Reset" msgstr "Сброс пароля" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" msgstr "Сброс пароля для %s" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "Сброс пароля" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "Почтовый адрес" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "Капча" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:47 msgid "Send Password Reset Email" msgstr "Послать ссылку сброса пароля" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:52 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "Ссылка для сброса пароля была отправлена на соответствующий e-mail." -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 #, fuzzy msgid "New Password" msgstr "Новый пароль" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 #, fuzzy msgid "Confirm New Password" msgstr "Подтвердите новый пароль" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "Регистрация" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "Регистра на %s" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "Повторите пароль" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "Имя" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "Фамилия" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." -msgstr "Пожалуйста, подождите, пока администратор подтвердит Вашу регистрацию." - -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "Ветки ещё не созданы" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "Закрытые ветки" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "Метки отсутсвуют" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "Закладок ещё нет" +msgstr "" +"Пожалуйста, подождите, пока администратор подтвердит Вашу регистрацию." #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "Журнал администратора" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "Фильтр журнала..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "Отфильтровать" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2625,30 +2143,16 @@ msgstr[1] "%s записей" msgstr[2] "%s записи" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "Действие" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "Репозиторий" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Дата" @@ -2656,7 +2160,7 @@ msgstr "Дата" msgid "From IP" msgstr "С IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "Действия ещё не производились" @@ -2665,19 +2169,19 @@ msgid "Authentication Settings" msgstr "Настройки аутентификации" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "Аутентификация" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "Плагины аутентификации" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "Включенные плагины" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 #, fuzzy msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " @@ -2686,90 +2190,90 @@ msgstr "" "Список плагинов, разделенных запятой. Kallithea будет пробовать " "аутентифицировать пользователя в порядке указания плагинов" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "Доступные встроенные плагины" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "Плагин" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "Сохранить" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 msgid "Repository Defaults" msgstr "Значения по умолчанию" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "Тип" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "Приватный репозиторий" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "Приватные репозитории видны только их участникам." -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 msgid "Enable statistics" msgstr "Включить статистику" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 msgid "Enable statistics window on summary page." msgstr "Включить окно статистики на странице «Общие сведения»." -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 msgid "Enable downloads" msgstr "Включить скачивание" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "Включить меню скачивания на странице «Общие сведения»." -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "Включить блокирование" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "Включить автоблокировку для репозитория." @@ -2778,45 +2282,45 @@ msgstr "Включить автоблокировку для репозитория." msgid "Edit Gist" msgstr "Правка gist-записи" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "Описание..." -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "Истекает" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 #, fuzzy msgid "Never" msgstr "никогда" @@ -2826,7 +2330,8 @@ msgid "Update Gist" msgstr "Обновить" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "Отмена" @@ -2849,16 +2354,16 @@ msgstr "Публичные gist-записи" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "Создать новую gist-запись" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "Создано" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "Gist-записи отсутствуют" @@ -2867,45 +2372,45 @@ msgstr "Gist-записи отсутствуют" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "Сброс" @@ -2915,113 +2420,111 @@ msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "Удалить" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "Подтвердите удаление этой gist-записи" -#: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 #: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 #: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 #: kallithea/templates/pullrequests/pullrequest_show.html:41 msgid "Edit" msgstr "Редактировать" -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "Показать только текст" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "создана" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "Показать только текст" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "Мой Аккаунт" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "Профиль" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 #, fuzzy msgid "Email Addresses" msgstr "Новый E-mail" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "API-ключи" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 #, fuzzy msgid "Owned Repositories" msgstr "репозитории" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "Создать репозитории" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 @@ -3029,76 +2532,93 @@ msgstr "Создать репозитории" msgid "Show Permissions" msgstr "Скопировать привилегии" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "Подтвердите сброс этого API-ключа: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 #, fuzzy msgid "Expired" msgstr "Истекает" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "Подтвердите удаление этого API-ключа: %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 #, fuzzy msgid "Remove" msgstr "Удалено" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 #, fuzzy msgid "No additional API keys specified" msgstr "Дополнительные адреса e-mail не указаны" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 #, fuzzy msgid "New API key" msgstr "Ключ" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "Добавить" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "Основной" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "Подтвердите удаление E-mail: %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "Нет дополнительных адресов e-mail." -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "Новый E-mail" @@ -3106,106 +2626,70 @@ msgstr "Новый E-mail" msgid "Change Your Account Password" msgstr "Смена пароля" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "Текущий пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "Новый пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "Подтвердите новый пароль" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +#, fuzzy +msgid "Current IP" +msgstr "текущий IP-адрес" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "Измените аватар через сайт" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "Используется" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "Аватары отключены" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "Не указан email. Пожалуйста, обновите ваш email." - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -#, fuzzy -msgid "Current IP" -msgstr "текущий IP-адрес" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" msgstr "Репозитории, где Вы — владелец" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "Записи не найдены." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "Имя" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "Репозитории, за которыми Вы наблюдаете" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "Мои уведомления" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "Всё" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "Комментарии" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "Pull-запросы" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "Отметить все как прочтённые" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "Уведомлений нет" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "Показать уведомление" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "Уведомления" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "Стандартные привилегии" @@ -3219,18 +2703,24 @@ msgstr "" msgid "IP Whitelist" msgstr "Белый список IP" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "Анонимный доступ" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +#, fuzzy +#| msgid "Anonymous access" +msgid "Allow anonymous access" +msgstr "Анонимный доступ" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " @@ -3240,48 +2730,48 @@ msgstr "" "репозитория. Учтите, что ранее установленные привилегии по умолчанию " "будут сброшены" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:20 #, fuzzy msgid "Apply to all existing repositories" msgstr "Существующий репозиторий?" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 msgid "Permissions for the Default user on new repositories." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "Группа репозиториев" + #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "Группа репозиториев" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" "Выбранные привилегии будут установлены по умолчанию для каждой группы " -"репозиториев. Учтите, что ранее установленные привилегии по умолчанию для" -" групп репозиториев будут сброшены" - -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +"репозиториев. Учтите, что ранее установленные привилегии по умолчанию для " +"групп репозиториев будут сброшены" + +#: kallithea/templates/admin/permissions/permissions_globals.html:33 #, fuzzy msgid "Apply to all existing repository groups" msgstr "Удалить эту группу репозиториев" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "Группа пользователей" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 #, fuzzy msgid "" "All default permissions on each user group will be reset to chosen " @@ -3292,107 +2782,109 @@ msgstr "" "пользователей. Учтите, что ранее установленные привилегии по умолчанию " "для групп пользователей будут сброшены" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy msgid "Top level repository creation" msgstr "Создание репозитория" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:61 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:64 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "Создание групп пользователей" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:75 msgid "Repository forking" msgstr "Создание форка репозитория" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:78 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:82 msgid "Registration" msgstr "Регистрация" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:88 msgid "External auth account activation" msgstr "Активация сторонней учетной записи" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "Подтвердите удаление IP %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "Все IP-адреса разрешены." -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "Новый IP-адрес" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "Группы репозиториев" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "Имя группы" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "Родительская группа" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" @@ -3401,30 +2893,29 @@ msgstr "" msgid "%s Repository Group Settings" msgstr "Настройки группы репозиториев %s" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "Добавить подгруппу" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "Настройки" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "Дополнительно" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "Привилегии" @@ -3449,12 +2940,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "Создано" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3466,8 +2957,30 @@ msgstr[2] "Подтвердите удаление группы %s, содержащей %s репозиториев" msgid "Delete this repository group" msgstr "Удалить эту группу репозиториев" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "disabled" +msgid "Visible" +msgstr "отключено" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "Add Repository" +msgid "Add repos" +msgstr "Добавить репозиторий" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +#, fuzzy +#| msgid "Add user group" +msgid "Add/Edit groups" +msgstr "Добавить группу пользователей" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 #, fuzzy msgid "User/User Group" @@ -3475,8 +2988,8 @@ msgstr "Группа пользователей" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3485,106 +2998,101 @@ msgstr "по умолчанию" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy msgid "Revoke" msgstr "отозвать" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "Добавить новый" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #, fuzzy msgid "Apply to children" msgstr "применить к дочерним" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" msgstr "" "Включить автоблокировку для группы. Эта опция будет применена ко всем " "дочерним группам и репозиториям" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "Удалить эту группу" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "Подтвердите удаление этой группы пользователей" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "Домой" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "с" +#, fuzzy, python-format +#| msgid "Repository Group: %s" +msgid "Repository group %s" +msgstr "Группа репозиториев: %s" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "Администрирование групп репозиториев" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "Число репозиториев верхнего уровня" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 #, fuzzy msgid "Clone remote repository" msgstr "[создан] репозиторий" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "Короткое и осмысленное. Для развернутого описания используйте файл README." - -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" +"Короткое и осмысленное. Для развернутого описания используйте файл README." + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "Опционально выбрать группу, в которую поместить данный репозиторий." -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "Тип создаваемого репозитория." -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "Ревизия для выгрузки" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3617,22 +3125,22 @@ msgstr "" msgid "%s Repository Settings" msgstr "Настройки репозитория %s" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "Дополнительные поля" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "Удалённый" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "Статистика" @@ -3641,28 +3149,26 @@ msgid "Parent" msgstr "Родительская группа" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "Набор" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "Вручную сделать этот репозиторий форком выбранного из списка." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "Доступ к публичному журналу" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "Удалить из общедоступного журнала" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "Добавить в публичный журнал" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." @@ -3670,36 +3176,36 @@ msgstr "" "Все производимые с этим репозиторием действия будут отображаться в " "публичном журнале." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "Включить блокирование" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 msgid "Confirm to unlock repository." msgstr "Подтвердите снятие блокировки с репозитория." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 msgid "Unlock Repository" msgstr "Разблокировать репозиторий" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 msgid "Confirm to lock repository." msgstr "Подтвердите блокировку репозитория." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Lock Repository" msgstr "Заблокировать репозиторий" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "Репозиторий не заблокирован" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3707,17 +3213,17 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Подтвердите удаление этого репозитория: %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "Удалить этот репозиторий" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3725,15 +3231,15 @@ msgstr[0] "Данный репозиторий имеет %s копию" msgstr[1] "Данный репозиторий имеет %s копии" msgstr[2] "Данный репозиторий имеет %s копий" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "Отсоединить fork'и" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "Удалить fork'и" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3744,110 +3250,113 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "Сбросить кэш репозитория" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "Подтвердите сброс кэша." - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." -msgstr "Ручной сброс кэша репозитория. При первом доступе кэш восстановится." - -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +msgstr "" +"Ручной сброс кэша репозитория. При первом доступе кэш восстановится." + +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 msgid "List of Cached Values" msgstr "Список кешированных значений" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "Префикс" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "Ключ" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "Активный" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "Подтвердите удаление этого поля: %s" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "Ключ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "Имя поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "Введите краткое имя поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "Описание поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "Введите описание поля" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "Дополнительные поля отключены." -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "приватный репозиторий" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "[форкнут] репозиторий" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Репозиторий %s создан" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "[внесены изменения из удалённого репозитория] в репозиторий" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "Подтвердите скачивание изменений." -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "приватный репозиторий" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3857,37 +3366,42 @@ msgid "" "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "[создан] репозиторий" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Репозиторий" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при " "скачивании" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "Изменить владельца репозитория." +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3903,7 +3417,7 @@ msgstr "Подтвердите сброс статистики." msgid "Repositories Administration" msgstr "Администрирование репозиториев" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3924,7 +3438,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "Хуки" @@ -3936,279 +3450,271 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "Отправить" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "Брендинг сайта" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "Приветствие для HTTP-аутентификации" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "Сохранить настройки" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "Пользовательские хуки" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom Hooks" -msgstr "Пользовательские хуки" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "Не удалось удалить хук" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Rescan option" +msgid "Rescan options" msgstr "Опции пересканирования" -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:9 #, fuzzy msgid "Delete records of missing repositories" msgstr "Поиск по репозиториям" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "Сбросить кэш для всех репозиториев" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "Сбросить кэш для всех репозиториев." -#: kallithea/templates/admin/settings/settings_mapping.html:23 +#: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "Install Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. " -"Current hooks will be updated to the latest version." -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "Опции создания индекса" -#: kallithea/templates/admin/settings/settings_search.html:12 +#: kallithea/templates/admin/settings/settings_search.html:9 msgid "Build from scratch" msgstr "Сборка с нуля" -#: kallithea/templates/admin/settings/settings_search.html:15 +#: kallithea/templates/admin/settings/settings_search.html:12 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "Перестроить индекс" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" -msgstr "Версия Git" +msgid "Kallithea configuration file" +msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "Версия Git" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "Веб" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "Запрашивать SSL для операций с VCS" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "Показывать размер репозитория после отправки" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "Логировать пользовательские команды отправки" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "Логировать пользовательские команды получения" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "Обновлять репозиторий после отправки (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "Расширения Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 msgid "Enable largefiles extension" msgstr "Включить поддержку больших файлов" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 msgid "Enable hgsubversion extension" msgstr "Включить поддержку hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 msgid "Location of repositories" msgstr "Местонахождение репозиториев" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." msgstr "" "Нажмите для разблокирования. Изменения вступят в силу после перезагрузки " "Kallithea." -#: kallithea/templates/admin/settings/settings_vcs.html:72 +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "Главное" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "Использовать дополнительные поля в репозиториях" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "Позволяет хранить дополнительные поля в репозиториях." -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "Отображать версию Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4225,93 +3731,101 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "Ссылка для клонирования" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "Элементы панели" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repository Size" +msgid "Repository page size" +msgstr "Размер репозитория" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "Иконки" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "Показывать иконки публичных репозиториев" +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "Показывать иконки приватных репозиториев" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "Показывать иконки приватных репозиториев" - -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "Показывать иконки публичных репозиториев." -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 #, fuzzy msgid "Meta Tagging" msgstr "Метатегирование" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Добавить группу пользователей" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4331,13 +3845,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "Участники" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Подтвердите удаление следующей группы пользователей: %s" @@ -4346,15 +3860,15 @@ msgstr "Подтвердите удаление следующей группы пользователей: %s" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "Нет участников" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "Выбранные участники группы" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "Доступные участники" @@ -4368,17 +3882,17 @@ msgstr "Добавить пользователя" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "Пользователи" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "Подтверждение пароля" @@ -4397,12 +3911,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4411,7 +3925,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "Подтвердите удаление пользователя %s" @@ -4420,24 +3934,16 @@ msgstr "Подтвердите удаление пользователя %s" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "Подтвердите новый пароль" @@ -4445,225 +3951,226 @@ msgstr "Подтвердите новый пароль" msgid "Users Administration" msgstr "Администрирование пользователей" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "Экземпляр сервера: %s" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "Репозиторий Mercurial" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "Git репозиторий" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "Создать форк" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "Общие сведения" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "История изменений" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "Файлы" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "Переключиться на" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "Показать pull-запросы для %s" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "Pull-запросы" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "Опции" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "Сравнить форк" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "Сравнить" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "Поиск" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "Разблокировать" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "Заблокировать" -#: kallithea/templates/base/base.html:173 +#: kallithea/templates/base/base.html:174 msgid "Follow" msgstr "Наблюдать" -#: kallithea/templates/base/base.html:174 +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "Не наблюдать" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Форк" -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "Создать Pull запрос" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "Показать pull-запросы для %s" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "Переключиться на" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "Показать последнюю активность" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "Общедоступный журнал" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "Показать публичные записи" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "Gist" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "Все публичные Gist-записи" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "Мои публичные Gist-записи" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "Мои приватные Gist-записи" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "Поиск по репозиториям" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "Мои Pull-запросы" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "Не авторизован" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "Авторизоваться" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:379 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "Забыли пароль?" -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:383 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "Нет аккаунта?" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "Выход" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 #, fuzzy msgid "Inherit defaults" msgstr "Значения по умолчанию" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "Создать репозитории" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "Опция разрешает пользователю создавать репозитарии" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "Опция разрешает пользователю создавать репозитарии" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "Создавать группы пользователей" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "Опция разрешает пользователю создавать группы пользователей" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "Создавать fork от репозиториев" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" "Выберите эту опцию чтобы разрешить данному пользователю создавать fork'и " "репозиториев" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "Показать" @@ -4672,150 +4179,145 @@ msgid "No permissions defined yet" msgstr "Привилегии еще не назначены" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "Привилегия" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "Изменить привилегии" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:28 +msgid "Retry" +msgstr "" + +#: kallithea/templates/base/root.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." +msgstr "Применение..." + +#: kallithea/templates/base/root.html:30 +#, fuzzy +#| msgid "Enable downloads" +msgid "Unable to post" +msgstr "Включить скачивание" + +#: kallithea/templates/base/root.html:31 msgid "Add Another Comment" msgstr "Добавить ещё один комментарий" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:32 msgid "Stop following this repository" msgstr "Отменить наблюдение за репозиторием" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:33 msgid "Start following this repository" msgstr "Наблюдать за репозиторием" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:34 msgid "Group" msgstr "Группа" -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "участники" - -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:35 msgid "Loading ..." msgstr "Загрузка..." -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:36 msgid "loading ..." msgstr "загрузка..." -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:37 msgid "Search truncated" msgstr "Поиск усечен" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:38 msgid "No matching files" msgstr "Нет совпадений" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:39 #, fuzzy msgid "Open New Pull Request from {0}" msgstr "Комментарий в pull-запросе" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:40 msgid "Open New Pull Request for {0} → {1}" msgstr "" -#: kallithea/templates/base/root.html:33 +#: kallithea/templates/base/root.html:41 #, fuzzy msgid "Show Selected Changesets {0} → {1}" msgstr "Показать выбранные наборы изменений: __S → __E" -#: kallithea/templates/base/root.html:34 +#: kallithea/templates/base/root.html:42 msgid "Selection Link" msgstr "Ссылка выбора" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 msgid "Collapse Diff" msgstr "Свернуть сравнение" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:44 msgid "Expand Diff" msgstr "Раскрыть сравнение" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:45 +#, fuzzy +msgid "No revisions" +msgstr "версии" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 msgid "Failed to revoke permission" msgstr "Не удалось отозвать привилегии" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:48 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "Подтвердите удаление привилегии для {0}: {1} ?" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "включено" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "отключено" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "Выбрать набор изменений" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "Выбрать набор изменений" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "Закладки %s" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "Автор" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "Ревизия" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "Ветки %s" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "По возрастанию" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "По убыванию" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "Записи не найдены." + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "Ошибка данных." + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "Загрузка..." + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "Логи изменений %s" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4823,81 +4325,31 @@ msgstr[0] "Показана %d из %d ревизий" msgstr[1] "Показаны %d из %d ревизий" msgstr[2] "Показаны %d из %d ревизий" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "Очистить выбор" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 msgid "Go to tip of repository" msgstr "Перейти на верхушку репозитория" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "Сравнить fork с %s" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "Сравнить форк с родительским репозиторием (%s)" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "Отфильтровать ветку:" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, fuzzy, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" -"Статус набора изенений: %s⏎\n" -"Кликрните, чтобы перейти к соответствующему pull-request'у #%s" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "Статус набора изменений: %s" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "Комментарии отсутствуют" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "Закладка %s" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "Метка %s" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "Ветка %s" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "Изменений ещё нет" @@ -4913,7 +4365,7 @@ msgstr "Изменено" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "Добавлено" @@ -4927,103 +4379,117 @@ msgstr "Добавлено" msgid "Affected %s files" msgstr "Затрагивает %s файлов" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "Возраст" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "Ссылки" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "Добавить или загрузить файлы через Kallithea" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -#, fuzzy -msgid "Push new repository" -msgstr "Отправить новый репозиторий" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" -msgstr "Существующий репозиторий?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, fuzzy, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" +"Статус набора изенений: %s⏎\n" +"Кликрните, чтобы перейти к соответствующему pull-request'у #%s" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, fuzzy, python-format +msgid "Changeset status: %s by %s" +msgstr "Статус набора изменений: %s" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%d comment" +#| msgid_plural "%d comments" +msgid "%s comments" +msgstr "%d комментарий" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "Закладка %s" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "Метка %s" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "Ветка %s" #: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" msgstr "%s Изменения" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "Статут изменений" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "Отобразить в формате diff" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "Применить разностное исправление (Patch diff)" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "Скачать diff" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 #, fuzzy msgid "Merge" msgstr "свести" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "Перенесено из:" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 #, fuzzy msgid "Replaced by:" msgstr "Создано" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 #, fuzzy msgid "Preceded by:" msgstr "Создано" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -5031,9 +4497,9 @@ msgstr[0] "%s файл изменён" msgstr[1] "%s файлов изменено" msgstr[2] "%s файла изменено" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -5041,18 +4507,19 @@ msgstr[0] "%s файл изменён: %s добавление, %s удаление" msgstr[1] "%s файла изменёно: %s добавления, %s удаления" msgstr[2] "%s файлов изменёно: %s добавлений, %s удалений" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "Показать полный diff" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 +#: kallithea/templates/changeset/changeset_file_comment.html:20 #, fuzzy -msgid "No revisions" -msgstr "версии" +#| msgid "Comment" +msgid "comment" +msgstr "Комментировать" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy @@ -5072,61 +4539,58 @@ msgstr "Нет изменений" msgid "Delete comment?" msgstr "Удалить комментарий?" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 #, fuzzy msgid "Status change" msgstr "Последние изменения" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "Комментарий к строке {1}." - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" -"Парсинг комментариев выполнен с использованием синтаксиса %s с поддержкой" -" %s." - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" +#: kallithea/templates/changeset/changeset_file_comment.html:87 +#, fuzzy +msgid "Comments are in plain text. Use @username to notify another user." msgstr "" "Используйте @имя_пользователя в тексте, чтобы отправить оповещение " -"указанному пользователю" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "Предварительный просмотр комментария" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "Применение..." - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +"указанному пользователю." + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "Изменить статус ревизии" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "Без изменений" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "Комментарий в pull-запросе" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "Закрыть" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "Комментировать" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "Предпросмотр" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "Вам необходимо авторизоваться, чтобы оставлять комментарии." -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "Авторизоваться сейчас" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "Скрыть" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -5134,7 +4598,7 @@ msgstr[0] "%d комментарий" msgstr[1] "%d комментария" msgstr[2] "%d комментариев" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, python-format msgid "%d inline" msgid_plural "%d inline" @@ -5142,7 +4606,7 @@ msgstr[0] "%d к строке" msgstr[1] "%d к строкам" msgstr[2] "%d к строкам" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5150,104 +4614,110 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -#, fuzzy -msgid "Use @username inside this text to notify another user." -msgstr "" -"Используйте @имя_пользователя в тексте, чтобы отправить оповещение " -"указанному пользователю." - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "Изменить статус ревизии" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "Без изменений" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "Закрыть" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "%s Изменения" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "Статус набора изменений: %s" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "Затронутые файлы" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "файл удалён" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "Неизменный" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "Удалён" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "Переименован" + +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Неизвестная ревизия %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "Безымянный" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "файл удалён" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "Показать полный diff для этого файла" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "Показать полный diff для этого файла" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "Показать комментарии в строках" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "Удалён" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "Переименован" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "Нет изменений" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "Предок" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +#, fuzzy +#| msgid "Common ancestor" +msgid "Merge Ancestor" +msgstr "Общий предок" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "Показать merge diff" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "Общий предок" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "отстаёт на" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, python-format msgid "%s changesets" msgstr "%s изменений" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "от" @@ -5258,20 +4728,20 @@ msgid "%s Compare" msgstr "%s Сравнить" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5279,109 +4749,168 @@ msgstr[0] "Показать %s commit" msgstr[1] "Показать %s commit'а" msgstr[2] "Показать %s commit'ов" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "Показать полный diff" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "Публичный репозиторий" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "Изменений ещё не было" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "Подписаться на ленту RSS %s" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "Подписаться на ленту Atom %s" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s оставил комментарий к набору изменений %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Comment from %s on %s changeset %s" +msgid "Comment on Changeset \"%s\"" msgstr "Комментарий от %s к набору изменений %s %s" -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "Состояние набора изменений изменено на" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset flow" +msgid "Changeset on" +msgstr "Поток изменений" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Ветка" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Последние изменения" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "This pull request has been closed and can not be updated." +msgid "The pull request has been closed." +msgstr "Этот pull-запрос был закрыт и не может быть обновлён." + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "Здравствуйте, %s" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 #, fuzzy msgid "We have received a request to reset the password for your account." msgstr "Мы отправили запрос на создание нового пароля для вашего аккаунта." -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention on Pull Request %s \"%s\" by %s" msgstr "%s упомянул Вас в комментарии к pull-запросу %s \"%s\"" -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, fuzzy, python-format +#| msgid "%s requested your review of %s pull request \"%s\"" +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" msgstr "%s запросил рецензирование pull-запроса %s \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Pull request %s" +msgid "Pull request" +msgstr "Pull-запрос %s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" +msgstr "" + #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "Комментарий закрыл pull-запрос со статусом" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "Комментарий оставлен со статусом" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "Подробнее о пользователе" +#, fuzzy, python-format +#| msgid "%s mentioned you on %s pull request \"%s\"" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "%s упомянул Вас в комментарии к pull-запросу %s \"%s\"" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "Pull-запросы %s от %s#%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[прокомментировано] в запросе на внесение изменений для" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "Имя группы" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5399,7 +4928,7 @@ msgid "%s File Diff" msgstr "Сравнение файла %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "%s Файлы" @@ -5409,72 +4938,74 @@ msgstr "%s Файлы" msgid "%s Files Add" msgstr "%s Файлов добавлено" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "Расположение" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "или" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "Режим нового файла" +#, fuzzy +msgid "New file type" +msgstr "новый файл" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 msgid "Commit Changes" msgstr "Применить изменения" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "Предыдущая ревизия" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "Следующая ревизия" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "Отслеживать данную ветку" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "Загружается список файлов..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "Размер" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "Последняя версия" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "Последнее изменение" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "Автор последней ревизии" @@ -5484,7 +5015,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5497,24 +5028,20 @@ msgstr "" msgid "Edit file" msgstr "Редактировать файл" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Исходный код" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "Редактирование файла" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5523,51 +5050,60 @@ msgstr[0] "%s автор" msgstr[1] "%s авторов" msgstr[2] "%s автора" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" -msgstr "" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "Удалена ветка: %s" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" +msgstr "Редактирование файлов разрешено только в HEAD-ревизии данной ветки" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "Редактирование файлов разрешено только в HEAD-ревизии данной ветки" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "Бинарный файл (%s)" +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "Файл слишком большой для отображения." + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "Показать полный diff." + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" -msgstr "Файл слишком большой для отображения" +msgid "Show as raw." +msgstr "Показать только текст." #: kallithea/templates/files/files_ypjax.html:5 msgid "annotation" @@ -5587,12 +5123,12 @@ msgid "%s Followers" msgstr "%s Наблюдатели" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "Наблюдатели" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "Наблюдать за репозиторием" @@ -5601,37 +5137,37 @@ msgstr "Наблюдать за репозиторием" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "Имя форка" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при " "скачивании." -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "Приватный" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "Скопировать привилегии" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "Скопировать привилегии с форкнутого репозитория" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "Обновлять после клонирования" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "Скачивать исходники после создания клона" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5641,40 +5177,40 @@ msgid "%s Forks" msgstr "Форки %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "Ответвления" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "Форкнуто" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "Форки ещё не созданы" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 msgid "ATOM journal feed" msgstr "Лента журнала ATOM" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "Лента журнала RSS" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "Мои репозитории" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "Записи отсуствуют" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "Общая лента журнала ATOM" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "Общая лента журнала RSS" @@ -5683,31 +5219,36 @@ msgstr "Общая лента журнала RSS" msgid "New Pull Request" msgstr "Новый pull-запрос" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "Заголовок" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "Написать короткое писание по этому запросу" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "Поток изменений" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "Первоначальный репозиторий" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "Ревизия" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "Репозиторий назначения" @@ -5720,6 +5261,10 @@ msgstr "Записи отсуствуют" msgid "Vote" msgstr "отозвать" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "Возраст" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5743,7 +5288,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "Закрыто" @@ -5766,114 +5311,106 @@ msgid "%s Pull Request %s" msgstr "%s Pull-запрос #%s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 -#, fuzzy, python-format +#, python-format msgid "Pull request %s from %s#%s" -msgstr "Pull-запросы №%s от %s#%s" - -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +msgstr "Pull-запросы %s от %s#%s" + +#: kallithea/templates/pullrequests/pullrequest_show.html:54 #, fuzzy msgid "Summarize the changes" msgstr "Применить изменения" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "Еще не рассмотренный" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "%d рецензент" -msgstr[1] "%d рецензента" -msgstr[2] "%d рецензентов" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "Запрос на внесение изменений был рассмотрен всеми рецензентами" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -msgid "There are no reviewers" -msgstr "Нет рецензентов" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 #, fuzzy msgid "on" msgstr "ничего" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "Принять изменения" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 #, fuzzy -msgid "Update" -msgstr "[обновлён] пользователь" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#| msgid "Registration" +msgid "Next iteration" +msgstr "Регистрация" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "Рецензенты pull-запросов" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "Сохранить изменения" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "Отменить изменения" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#, fuzzy +#| msgid "reviewer" +msgid "Reviewers" +msgstr "рецензент" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 msgid "Remove reviewer" msgstr "Удалить рецензента" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 msgid "Potential Reviewers" msgstr "Потенциальные рецензенты" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "Сохранить изменения" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -#, fuzzy -msgid "Save as New Pull Request" -msgstr "Создать новый pull запрос" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" -msgstr "Отменить изменения" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 #, fuzzy msgid "Pull Request Content" msgstr "Статус pull-request'а был изменен" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "Общий предок" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5881,7 +5418,6 @@ msgstr "%s Запросы на внесение изменений" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull Requests from '%s'" msgstr "Pull-запросы от %s" @@ -5890,37 +5426,43 @@ msgstr "Pull-запросы от %s" msgid "Pull Requests to '%s'" msgstr "Pull-запросы для %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "Создать новый pull-запрос" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "Pull-запросы для %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, fuzzy, python-format msgid "Show Pull Requests from '%s'" msgstr "Pull запросы от %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 #, fuzzy msgid "Show closed pull requests (in addition to open pull requests)" msgstr "Показать закрытые pull-запросы" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 #, fuzzy msgid "Pull Requests Created by Me" msgstr "Рецензенты запросов на внесение изменений Pull request" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "Рецензенты pull-запросов" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 #, fuzzy msgid "Pull Requests I Participate In" msgstr "Моё участие" @@ -5935,29 +5477,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "Поиск по всем репозиториям" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "Фраза для поиска" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "Критерий поиска" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "Содержимое файлов" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "Сообщения коммитов" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "Имя файла" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "Недостаточно прав" @@ -5967,80 +5509,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "ATOM лента репозитория %s" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "RSS лента репозитория %s" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "Включено" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "Полученная статистика: " -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "файлы" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "Показать еще" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "commit'ы" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "файлы добавлены" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "файлы изменены" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "файлы удалены" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "commit" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "файл удалён" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "файл изменён" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "файл удалён" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "%s общие сведения" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "Репозитарий заблокирован %s" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "Репозиторий разблокирован" @@ -6048,86 +5590,276 @@ msgstr "Репозиторий разблокирован" msgid "Fork of" msgstr "Форк от" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "Клонировать из" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "Ссылка для клонирования" - -#: kallithea/templates/summary/summary.html:78 -msgid "Show by Name" -msgstr "Показать по имени" - -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:68 msgid "Show by ID" msgstr "Показать по ID" -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:73 +msgid "Show by Name" +msgstr "Показать по имени" + +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "Популярные файлы" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "Скачать" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "Скачиваний ещё нет" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "Скачивание отключено в этом репозитории" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "Скачать в zip" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "Отметьте для скачивания архива с дочерними репозиториями" -#: kallithea/templates/summary/summary.html:125 -#, fuzzy +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" -msgstr "с дочерними репозиториями" - -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "Размер репозитория" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +msgstr "С дочерними репозиториями" + +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "Лента новостей" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 msgid "Latest Changes" msgstr "Последние изменения" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:177 msgid "Quick Start" msgstr "Быстрый старт" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "Добавить или загрузить файлы через Kallithea" + +#: kallithea/templates/summary/summary.html:196 +#, fuzzy +msgid "Push new repository" +msgstr "Отправить новый репозиторий" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "Существующий репозиторий?" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "Скачать %s как %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s Меток" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "Сравнить теги" +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "Индексы отсутствуют. Пожалуйста, запустите индексатор Whoosh" + +#~ msgid "IP %s not allowed" +#~ msgstr "IP %s заблокирован" + +#~ msgid "%(user)s commented on changeset %(age)s" +#~ msgstr "%(user)s оставил комментарий к набору изменений %(age)s" + +#~ msgid "%(user)s sent message %(age)s" +#~ msgstr "%(user)s отправил сообщение %(age)s" + +#~ msgid "%(user)s mentioned you %(age)s" +#~ msgstr "%(user)s упомянул вас %(age)s" + +#~ msgid "%(user)s registered in Kallithea %(age)s" +#~ msgstr "%(user)s зарегистрировался в Kallithea %(age)s" + +#~ msgid "%(user)s opened new pull request %(age)s" +#~ msgstr "%(user)s открыл новый pull-запрос %(age)s" + +#~ msgid "%(user)s commented on pull request %(age)s" +#~ msgstr "%(user)s оставил комментарий к pull-запросу %(age)s" + +#~ msgid "%(user)s commented on changeset at %(when)s" +#~ msgstr "%(user)s оставил комментарий к набору изменений %(when)s" + +#~ msgid "%(user)s sent message at %(when)s" +#~ msgstr "%(user)s отправил сообщение %(when)s" + +#~ msgid "%(user)s mentioned you at %(when)s" +#~ msgstr "%(user)s упомянул вас %(when)s" + +#~ msgid "%(user)s registered in Kallithea at %(when)s" +#~ msgstr "%(user)s зарегистрировался в Kallithea %(when)s" + +#~ msgid "%(user)s opened new pull request at %(when)s" +#~ msgstr "%(user)s открыл новый pull-запрос %(when)s" + +#~ msgid "%(user)s commented on pull request at %(when)s" +#~ msgstr "%(user)s оставил комментарий к pull-запросу %(when)s" + +#, fuzzy +#~| msgid "Repository group" +#~ msgid "Repository Group" +#~ msgstr "Группа репозиториев" + +#~ msgid "My Notifications" +#~ msgstr "Мои уведомления" + +#~ msgid "All" +#~ msgstr "Всё" + +#~ msgid "Comments" +#~ msgstr "Комментарии" + +#~ msgid "Mark All Read" +#~ msgstr "Отметить все как прочтённые" + +#, fuzzy +#~| msgid "Mark All Read" +#~ msgid "Mark as read" +#~ msgstr "Отметить все как прочтённые" + +#~ msgid "No notifications here yet" +#~ msgstr "Уведомлений нет" + +#~ msgid "Show Notification" +#~ msgstr "Показать уведомление" + +#~ msgid "Notifications" +#~ msgstr "Уведомления" + +#~ msgid "Home" +#~ msgstr "Домой" + +#~ msgid "with" +#~ msgstr "с" + +#~ msgid "members" +#~ msgstr "участники" + +#~ msgid "Changeset has comments" +#~ msgstr "Комментарии отсутствуют" + +#~ msgid "Author" +#~ msgstr "Автор" + +#~ msgid "Refs" +#~ msgstr "Ссылки" + +#, fuzzy +#~ msgid "Commenting on line." +#~ msgstr "Комментарий к строке {1}." + +#, fuzzy +#~| msgid "on pull request" +#~ msgid "Pull request from" +#~ msgstr "Комментарий в pull-запросе" + +#, fuzzy +#~| msgid "Date" +#~ msgid "at" +#~ msgstr "Дата" + +#~ msgid "Previous revision" +#~ msgstr "Предыдущая ревизия" + +#~ msgid "Next revision" +#~ msgstr "Следующая ревизия" + +#~ msgid "Follow current branch" +#~ msgstr "Отслеживать данную ветку" + +#~ msgid "Still not reviewed by" +#~ msgstr "Еще не рассмотренный" + +#~ msgid "%d reviewer" +#~ msgid_plural "%d reviewers" +#~ msgstr[0] "%d рецензент" +#~ msgstr[1] "%d рецензента" +#~ msgstr[2] "%d рецензентов" + +#~ msgid "Pull request was reviewed by all reviewers" +#~ msgstr "Запрос на внесение изменений был рассмотрен всеми рецензентами" + +#~ msgid "There are no reviewers" +#~ msgstr "Нет рецензентов" + +#~ msgid "Pull Request Reviewers" +#~ msgstr "Рецензенты pull-запросов" + +#~ msgid "Dashboard" +#~ msgstr "Панель управления" + +#~ msgid "Group Name" +#~ msgstr "Имя группы" + +#~ msgid "Remember me" +#~ msgstr "Запомнить" + +#~ msgid "Change your avatar at" +#~ msgstr "Измените аватар через сайт" + +#~ msgid "Using" +#~ msgstr "Используется" + +#~ msgid "Missing email, please update your user email address." +#~ msgstr "Не указан email. Пожалуйста, обновите ваш email." + +#~ msgid "Rescan option" +#~ msgstr "Опции пересканирования" + +#~ msgid "Web" +#~ msgstr "Веб" + +#~ msgid "Require SSL for vcs operations" +#~ msgstr "Запрашивать SSL для операций с VCS" + +#~ msgid "Dashboard items" +#~ msgstr "Элементы панели" + +#~ msgid "quick filter..." +#~ msgstr "фильтр..." + +#~ msgid "Forgot password ?" +#~ msgstr "Забыли пароль?" + +#~ msgid "Ancestor" +#~ msgstr "Предок" + +#~ msgid "Comment from %s on %s changeset %s" +#~ msgstr "Комментарий от %s к набору изменений %s %s" + +#~ msgid "The changeset status was changed to" +#~ msgstr "Состояние набора изменений изменено на" + +#~ msgid "%s mentioned you on %s pull request \"%s\"" +#~ msgstr "%s упомянул Вас в комментарии к pull-запросу %s \"%s\"" + +#~ msgid "%s requested your review of %s pull request \"%s\"" +#~ msgstr "%s запросил рецензирование pull-запроса %s \"%s\"" + +#~ msgid "The comment closed the pull request with status" +#~ msgstr "Комментарий закрыл pull-запрос со статусом" + +#~ msgid "The comment was made with status" +#~ msgstr "Комментарий оставлен со статусом" + +#~ msgid "View this user here" +#~ msgstr "Подробнее о пользователе" + +#~ msgid "Repository Size" +#~ msgstr "Размер репозитория" #~ msgid "No comments." #~ msgstr "Нет комментариев." @@ -6138,9 +5870,6 @@ msgstr "Сравнить теги" #~ msgid "journal" #~ msgstr "журнал" -#~ msgid "unmodified" -#~ msgstr "" - #~ msgid "Locked repository" #~ msgstr "Закрытый репозиторий" @@ -6162,9 +5891,6 @@ msgstr "Сравнить теги" #~ msgid "No Files" #~ msgstr "Файлов нет" -#~ msgid "" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "Имя \"%(username)s\" отклонено" @@ -6177,12 +5903,6 @@ msgstr "Сравнить теги" #~ msgid "invalid clone URL" #~ msgstr "неверный URL для клонирования" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "" - #~ msgid "Defaults" #~ msgstr "Значения по умолчанию" @@ -6195,24 +5915,6 @@ msgstr "Сравнить теги" #~ msgid "My Permissions" #~ msgstr "Мои привилегии" -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - #~ msgid "delete" #~ msgstr "удалить" @@ -6243,15 +5945,6 @@ msgstr "Сравнить теги" #~ msgid "admin" #~ msgstr "администратор" -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - #~ msgid "Optional URL from which repository should be cloned." #~ msgstr "Опциональный URL, с которого требуется склонировать репозиторий." @@ -6261,93 +5954,21 @@ msgstr "Сравнить теги" #~ msgid "Pull Changes from Remote Location" #~ msgstr "Получить изменения с удалённой стороны" -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - #~ msgid "Non-changeable id" #~ msgstr "Неизменяемый id" #~ msgid "edit" #~ msgstr "редактировать" -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - #~ msgid "Destroy old data" #~ msgstr "Уничтожить все данные" -#~ msgid "check for updates" -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "Стандартные привилегии" -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "Изменение статуса" -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - #~ msgid "Mimetype" #~ msgstr "Тип файла" @@ -6357,15 +5978,9 @@ msgstr "Сравнить теги" #~ msgid "Latest vote: %s" #~ msgstr "Последняя оценка: %s" -#~ msgid "Nobody voted" -#~ msgstr "" - #~ msgid "owner" #~ msgstr "владелец" -#~ msgid "reviewer" -#~ msgstr "рецензент" - #~ msgid "Your new password" #~ msgstr "Ваш новый пароль" @@ -6381,9 +5996,210 @@ msgstr "Сравнить теги" #~ msgid "You can generate it by clicking following URL" #~ msgstr "Вы можете заново сгенерировать его, перейдя по следующей ссылке" -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - #~ msgid "Created by" #~ msgstr "Создано" +#~ msgid "Closed, replaced by %s ." +#~ msgstr "Закрыт, замещён %s ." + +#~ msgid "Closing." +#~ msgstr "Закрыт." + +#~ msgid "Changeset not found" +#~ msgstr "Набор изменений не найден" + +#~ msgid "Repository no access" +#~ msgstr "Репозитарий - нет доступа" + +#~ msgid "Repository read access" +#~ msgstr "Репозитарий - доступ на чтение" + +#~ msgid "Repository write access" +#~ msgstr "Репозитарий - доступ на запись" + +#~ msgid "Repository admin access" +#~ msgstr "Репозитарий - администрирование" + +#~ msgid "Repository Group no access" +#~ msgstr "Группа Репозиториев - нет доступа" + +#~ msgid "Repository Group read access" +#~ msgstr "Группа Репозиториев - доступ на чтение" + +#~ msgid "Repository Group write access" +#~ msgstr "Группа Репозиториев - доступ на запись" + +#~ msgid "Repository Group admin access" +#~ msgstr "Группа Репозиториев - администрирование" + +#~ msgid "Repository creation disabled" +#~ msgstr "Создание репозиториев отключено" + +#~ msgid "Repository creation enabled" +#~ msgstr "Создание репозиториев включено" + +#~ msgid "Repository forking disabled" +#~ msgstr "Возможность создавать форк репозитория отключена" + +#~ msgid "Repository forking enabled" +#~ msgstr "Возможность создавать форк репозитория включена" + +#~ msgid "Register disabled" +#~ msgstr "Регистрация отключена" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "Регистрация нового пользователя в Kallithea с ручной активацией" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "" +#~ "Регистрация нового пользователя в Kallithea с автоматической активацией" + +#~ msgid "Not Reviewed" +#~ msgstr "Не просмотрено" + +#~ msgid "Rejected" +#~ msgstr "Отклонено" + +#~ msgid "Under Review" +#~ msgstr "На рассмотрении" + +#~ msgid "Repository group no access" +#~ msgstr "Группа Репозиториев - нет доступа" + +#~ msgid "Repository group read access" +#~ msgstr "Группа репозиториев - доступ на чтение" + +#~ msgid "Repository group write access" +#~ msgstr "Группа репозиториев - доступ на запись" + +#~ msgid "Repository group admin access" +#~ msgstr "Группа репозиториев - администрирование" + +#~ msgid "User group no access" +#~ msgstr "Группа пользователей - нет доступа" + +#~ msgid "User group read access" +#~ msgstr "Группа пользователей - доступ на чтение" + +#~ msgid "User group write access" +#~ msgstr "Группа пользователей - доступ на запись" + +#~ msgid "User group admin access" +#~ msgstr "Группа пользователей - администрирование" + +#~ msgid "Repository Group creation disabled" +#~ msgstr "Создание групп репозиториев отключено" + +#~ msgid "Repository Group creation enabled" +#~ msgstr "Создание групп репозиториев включено" + +#~ msgid "User Group creation disabled" +#~ msgstr "Создание групп пользователей отключено" + +#~ msgid "User Group creation enabled" +#~ msgstr "Создание групп пользователей включено" + +#~ msgid "User Registration with manual account activation" +#~ msgstr "Регистрация пользователя с ручной активацией учётной записи" + +#~ msgid "User Registration with automatic account activation" +#~ msgstr "Регистрация пользователя с автоматической активацией" + +#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "" +#~ "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" + +#~ msgid "repositories" +#~ msgstr "репозитории" + +#~ msgid "No repositories found." +#~ msgstr "Репозитарии не найдены." + +#~ msgid "There are no branches yet" +#~ msgstr "Ветки ещё не созданы" + +#~ msgid "There are no tags yet" +#~ msgstr "Метки отсутсвуют" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "Закладок ещё нет" + +#~ msgid "enabled" +#~ msgstr "включено" + +#~ msgid "%s Bookmarks" +#~ msgstr "Закладки %s" + +#~ msgid "%s Branches" +#~ msgstr "Ветки %s" + +#~ msgid "Editing file" +#~ msgstr "Редактирование файла" + +#~ msgid "Update" +#~ msgstr "[обновлён] пользователь" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "Создать новый pull запрос" + +#~ msgid "%s Tags" +#~ msgstr "%s Меток" + +#~ msgid "Compare Tags" +#~ msgstr "Сравнить теги" + +#~ msgid "" +#~ "Changing status on a changeset associated with a closed pull request " +#~ "is not allowed" +#~ msgstr "" +#~ "Нельзя редактировать статус изменений, связанных с закрытыми pull-" +#~ "request'ами" + +#~ msgid "You have successfully registered into Kallithea" +#~ msgstr "Регистрация в Kallithea прошла успешно" + +#~ msgid "This pull request can be updated with changes on %s:" +#~ msgstr "Этот pull-запрос может быть обновлён из %s:" + +#~ msgid "Confirm to invalidate repository cache." +#~ msgstr "Подтвердите сброс кэша." + +#~ msgid "" +#~ "Changeset status: %s\n" +#~ "Click to open associated pull request %s" +#~ msgstr "" +#~ "Статус набора изенений: %s⏎\n" +#~ "Кликрните, чтобы перейти к соответствующему pull-request'у #%s" + +#~ msgid "Commenting on line {1}." +#~ msgstr "Комментарий к строке {1}." + +#~ msgid "Comments parsed using %s syntax with %s support." +#~ msgstr "" +#~ "Парсинг комментариев выполнен с использованием синтаксиса %s с " +#~ "поддержкой %s." + +#~ msgid "Use @username inside this text to notify another user" +#~ msgstr "" +#~ "Используйте @имя_пользователя в тексте, чтобы отправить оповещение " +#~ "указанному пользователю" + +#~ msgid "Comment preview" +#~ msgstr "Предварительный просмотр комментария" + +#~ msgid "Preview" +#~ msgstr "Предпросмотр" + +#~ msgid "Use @username inside this text to notify another user." +#~ msgstr "" +#~ "Используйте @имя_пользователя в тексте, чтобы отправить оповещение " +#~ "указанному пользователю." + +#~ msgid "New file mode" +#~ msgstr "Режим нового файла" + +#~ msgid "File is too big to display" +#~ msgstr "Файл слишком большой для отображения" + +#~ msgid "Save as New Pull Request" +#~ msgstr "Создать новый pull запрос" diff --git a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/sk/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/sk/LC_MESSAGES/kallithea.po @@ -7,456 +7,470 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" "PO-Revision-Date: 2015-04-01 12:59+0200\n" -"Last-Translator: Andrew Shadura \n" -"Language-Team: Slovak " -"\n" +"Last-Translator: Andrej Shadura \n" +"Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.3-dev\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Generated-By: Babel 1.3\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "Zatiaľ nie sú žiadne zmeny" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "(zatvorené)" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "Ukázať medzery" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorovať medzery" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +#, fuzzy +msgid "No permission to change status" +msgstr "Zmeny" + +#: kallithea/controllers/changeset.py:214 +#, fuzzy, python-format +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 msgid "Such revision does not exist for this repository" msgstr "Taká revízia neexistuje" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Prázdny repozitár" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 #, fuzzy msgid "No response" msgstr "Neznáma revízia %s" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "Nemáte oprávnenie na zobrazenie tejto stránky" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#, python-format +msgid "%s %s feed" +msgstr "" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 #, python-format msgid "Changes on %s repository" msgstr "Zmeny na repozitáre %s" -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:91 +#: kallithea/controllers/files.py:92 msgid "Click here to add new file" msgstr "Kliknite pre pridanie nového súboru" -#: kallithea/controllers/files.py:92 +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "Zatiaľ nie sú žiadne súbory. %s" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, 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:317 +#: kallithea/controllers/files.py:312 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:328 +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Zmazaný súbor %s cez Kallithea" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "Úspešne zmazaný súbor %s" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "Došlo k chybe pri ukladaní" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "Žiadne zmeny" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "Pridaný súbor cez Kallithea" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "Žiadny obsah" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "Sťahovanie vypnuté" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "Neznáma revízia %s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "Prázdny repozitár" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "Zmeny" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "Vetvy" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "Tagy" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "Skupiny" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "Repozitáre" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "Vetva" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "Záložka" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 #, fuzzy msgid "Bad captcha" msgstr "zlá captcha" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "Úspešne aktualizované heslo" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" msgstr "%s (zatvorené)" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "Záložky" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "" - -#: kallithea/controllers/pullrequests.py:363 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 +msgid "Error occurred while creating pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:352 msgid "Successfully opened new pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 -msgid "Error occurred while creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 +#: kallithea/controllers/pullrequests.py:375 +msgid "New pull request iteration created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "" + +#: kallithea/controllers/pullrequests.py:432 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:445 +msgid "Successfully deleted pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:524 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:557 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:514 -msgid "Pull request updated" -msgstr "" - -#: kallithea/controllers/pullrequests.py:529 -msgid "Successfully deleted pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:595 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:597 -msgid "This pull request has been closed and can not be updated." -msgstr "" - -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 -#, python-format -msgid "Note: Branch %s has another head: %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +"Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "" #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "Došlo k chybe počas vyhľadávania." -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "" @@ -468,149 +482,151 @@ msgstr "" msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" -msgstr "" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 minút" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "5 minút" +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "1 hodina" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" -msgstr "1 hodina" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "1 deň" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 -msgid "1 day" -msgstr "1 deň" - -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 mesiac" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "Došlo k chybe pri vytváraní gist" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "" +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "" + #: kallithea/controllers/admin/gists.py:233 -msgid "Unmodified" -msgstr "" - -#: kallithea/controllers/admin/gists.py:262 -msgid "Successfully updated gist content" -msgstr "" - -#: kallithea/controllers/admin/gists.py:267 -msgid "Successfully updated gist data" -msgstr "" - -#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "Došlo k chybe pri aktualizácii gist %s" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "Došlo k chybe pri aktualizácii hesla užívateľa" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "Došlo k chybe pri ukladaní e-mailovej adresy" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "" +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "" + #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -618,623 +634,621 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "Error occurred during gist creation" +msgid "An error occurred during creation of field: %r" +msgstr "Došlo k chybe pri vytváraní gist" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "" +#: kallithea/controllers/admin/repos.py:446 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:450 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:466 +msgid "Nothing" +msgstr "Nič" + +#: kallithea/controllers/admin/repos.py:468 +#, python-format +msgid "Marked repository %s as fork of %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:475 +msgid "An error occurred during this operation" +msgstr "" + #: kallithea/controllers/admin/repos.py:491 -msgid "Updated repository visibility in public journal" -msgstr "" - -#: kallithea/controllers/admin/repos.py:495 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:512 -msgid "Nothing" -msgstr "Nič" - -#: kallithea/controllers/admin/repos.py:514 -#, python-format -msgid "Marked repository %s as fork of %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:521 -msgid "An error occurred during this operation" -msgstr "" - -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 #, fuzzy msgid "Repository has been locked" msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 #, fuzzy msgid "Repository has been unlocked" msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" +msgstr "" + #: kallithea/controllers/admin/settings.py:174 -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" - -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 -msgid "Error occurred while updating application settings" -msgstr "" - -#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, fuzzy, python-format #| msgid "Watched Repositories" msgid "Invalidated %s repositories" msgstr "Repozitáre" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +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 "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "" - -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" - -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 -#, python-format -msgid "Deleted branch: %s" -msgstr "" - #: kallithea/lib/helpers.py:612 #, python-format +msgid "Deleted branch: %s" +msgstr "" + +#: kallithea/lib/helpers.py:614 +#, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, fuzzy, python-format #| msgid "Set changeset status" msgid "Changeset %s not found" msgstr "Zmeny" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1242,7 +1256,7 @@ msgid "" "repositories" msgstr "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1250,7 +1264,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1258,7 +1272,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1266,7 +1280,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1274,7 +1288,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1282,7 +1296,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1290,1120 +1304,613 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 #, fuzzy msgid "Only admins can fork repositories" msgstr "Repozitáre" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 #, fuzzy -#| msgid "Non-admins can can fork repositories" msgid "Non-admins can fork repositories" msgstr "Repozitáre" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2238 -#, fuzzy +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2241 -#, fuzzy +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2266 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:309 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "" - -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" + +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 -msgid "You can't remove this user since it is crucial for the entire application" -msgstr "" - -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" + +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" - -#: kallithea/model/user.py:273 +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:126 +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:133 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:152 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 msgid "Invalid username or password" msgstr "" +#: kallithea/model/validators.py:312 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:330 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + #: kallithea/model/validators.py:331 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:345 -#, python-format -msgid "Repository name %(repo)s is not allowed" -msgstr "" - -#: kallithea/model/validators.py:347 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - -#: kallithea/model/validators.py:348 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 #, fuzzy msgid "Invalid repository URL" msgstr "Odblokovať repozitár" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" - -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 -msgid "Add Repository Group" -msgstr "" - +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 #: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "" @@ -2411,146 +1918,129 @@ msgstr "" msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" msgstr "" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 -msgid "Send Password Reset Email" -msgstr "" - #: kallithea/templates/password_reset.html:47 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2559,30 +2049,16 @@ msgstr[1] "%s záznamy" msgstr[2] "%s záznamov" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2590,7 +2066,7 @@ msgstr "" msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "" @@ -2599,109 +2075,109 @@ msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 #, fuzzy msgid "Repository Defaults" msgstr "Repozitáre" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "" -"Private repositories are only visible to people explicitly added as " -"collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2710,45 +2186,45 @@ msgstr "" msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 msgid "Never" msgstr "" @@ -2757,7 +2233,8 @@ msgid "Update Gist" msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "" @@ -2780,16 +2257,16 @@ msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "" @@ -2798,45 +2275,45 @@ msgstr "" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "" @@ -2846,184 +2323,199 @@ msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 #, fuzzy msgid "Owned Repositories" msgstr "Repozitáre" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "Repozitáre" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "" @@ -3031,105 +2523,68 @@ msgstr "" msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" msgstr "Vaše repozitáre" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "" @@ -3143,168 +2598,174 @@ msgstr "" msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:20 #, fuzzy msgid "Apply to all existing repositories" msgstr "Repozitáre" +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:33 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 msgid "Top level repository creation" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:61 +msgid "Repository creation with group write access" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "" -"Note: This will also give all users API access to create repositories " -"everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 -msgid "Repository creation with group write access" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:75 +msgid "Repository forking" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:78 +msgid "Enable this to allow non-admins to fork repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 +msgid "Registration" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:88 -msgid "Repository forking" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:92 -msgid "Enable this to allow non-admins to fork repositories." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:97 -msgid "Registration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:105 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 -#, fuzzy, python-format +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" @@ -3313,30 +2774,29 @@ msgstr "" msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "" @@ -3361,12 +2821,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3378,16 +2838,34 @@ msgstr[2] "" msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "Neznáma revízia %s" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3395,103 +2873,96 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 -#, fuzzy +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository Defaults" +msgid "Repository group %s" +msgstr "Repozitáre" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 #, fuzzy msgid "Clone remote repository" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3520,26 +2991,26 @@ msgid "" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, fuzzy, python-format +#, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "" @@ -3548,63 +3019,61 @@ msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "Odblokovať repozitár" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" -msgstr "Odblokovať repozitár" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 msgid "Confirm to lock repository." msgstr "Potvrdenie blokovania repozitára." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 msgid "Lock Repository" msgstr "Zablokovať repozitár" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3612,33 +3081,33 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "Vymazať tento repozitár" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 -#, fuzzy, python-format +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3649,110 +3118,112 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Go to tip of repository" +msgid "Fork of repository" +msgstr "Prázdny repozitár" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "Zmeny na repozitáre %s" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "Potvrdenie blokovania repozitára." -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3762,35 +3233,40 @@ msgid "" "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "Prázdny repozitár" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "Repozitáre" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3806,7 +3282,7 @@ msgstr "" msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3827,7 +3303,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "" @@ -3839,277 +3315,267 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +msgid "Custom Hooks" +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -msgid "Custom Hooks" -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. " -"Current hooks will be updated to the latest version." +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 #, fuzzy msgid "Location of repositories" msgstr "Repozitáre" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4126,92 +3592,100 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "Repositories" +msgid "Repository page size" +msgstr "Repozitáre" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4230,13 +3704,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4245,15 +3719,15 @@ msgstr "" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" @@ -4267,17 +3741,17 @@ msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "" @@ -4296,12 +3770,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4310,7 +3784,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4319,24 +3793,16 @@ msgstr "" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "" @@ -4344,223 +3810,220 @@ msgstr "" msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "" - #: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" -msgstr "" - #: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 #, fuzzy msgid "Inherit defaults" msgstr "Repozitáre" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "" @@ -4569,150 +4032,142 @@ msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -#, fuzzy -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "" - -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "" - -#: kallithea/templates/base/root.html:27 -msgid "Loading ..." -msgstr "" - #: kallithea/templates/base/root.html:28 -msgid "loading ..." +msgid "Retry" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +msgid "Unable to post" msgstr "" #: kallithea/templates/base/root.html:31 -#, fuzzy -msgid "Open New Pull Request from {0}" -msgstr "Zmena stavu" +msgid "Add Another Comment" +msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" +#, fuzzy +msgid "Open New Pull Request from {0}" +msgstr "Zmena stavu" #: kallithea/templates/base/root.html:40 -msgid "disabled" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +#, fuzzy +msgid "No revisions" +msgstr "Neznáma revízia %s" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4720,80 +4175,32 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 #, fuzzy msgid "Go to tip of repository" msgstr "Prázdny repozitár" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "" @@ -4809,7 +4216,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "" @@ -4823,39 +4230,60 @@ msgstr "" msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -#, fuzzy -msgid "Push new repository" -msgstr "Prázdny repozitár" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, fuzzy, python-format +msgid "Changeset status: %s by %s" +msgstr "Zmeny" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "No comments." +msgid "%s comments" +msgstr "Nie sú žiadne komentáre." + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" msgstr "" #: kallithea/templates/changeset/changeset.html:8 @@ -4863,60 +4291,50 @@ msgstr "" msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 msgid "Merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4924,9 +4342,9 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4934,18 +4352,19 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 +#: kallithea/templates/changeset/changeset_file_comment.html:20 #, fuzzy -msgid "No revisions" -msgstr "Neznáma revízia %s" +#| msgid "No comments." +msgid "comment" +msgstr "Nie sú žiadne komentáre." #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy @@ -4962,61 +4381,61 @@ msgid "on this changeset" msgstr "%s zmien" #: kallithea/templates/changeset/changeset_file_comment.html:30 -#, fuzzy msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 #, fuzzy msgid "Status change" msgstr "Posledné zmeny" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#, fuzzy +msgid "Set changeset status" +msgstr "Zmeny" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +#, fuzzy +msgid "No change" +msgstr "Žiadne zmeny" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "Zmena stavu" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +#, fuzzy +msgid "Close" +msgstr "(zatvorené)" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -5024,15 +4443,15 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:107 -#, fuzzy, python-format +#: kallithea/templates/changeset/changeset_file_comment.html:154 +#, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5040,104 +4459,100 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -#, fuzzy -msgid "Set changeset status" -msgstr "Zmeny" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -#, fuzzy -msgid "No change" -msgstr "Žiadne zmeny" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -#, fuzzy -msgid "Close" -msgstr "(zatvorené)" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "Neznáma revízia %s" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, fuzzy, python-format msgid "%s changesets" msgstr "%s zmien" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "" @@ -5148,20 +4563,20 @@ msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5169,107 +4584,159 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Comment on Changeset \"%s\"" +msgstr "Zmeny" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changesets" +msgid "Changeset on" +msgstr "Zmeny" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "Vetva" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "Posledné zmeny" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "Tento repozitár bol uzamknutý používateľom %s dňa %s" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "on pull request" +msgid "Pull request" +msgstr "Zmena stavu" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "on pull request" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "Zmena stavu" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5288,7 +4755,7 @@ msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "" @@ -5298,73 +4765,74 @@ msgstr "" msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" +msgid "New file type" msgstr "" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 #, fuzzy msgid "Commit Changes" msgstr "Žiadne zmeny" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "" @@ -5374,7 +4842,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5387,24 +4855,20 @@ msgstr "" msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5413,50 +4877,58 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "" +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" +msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 @@ -5477,12 +4949,12 @@ msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "" @@ -5491,35 +4963,35 @@ msgstr "" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5529,40 +5001,40 @@ msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "" @@ -5571,31 +5043,36 @@ msgstr "" msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "" @@ -5607,6 +5084,10 @@ msgstr "" msgid "Vote" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5630,7 +5111,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "" @@ -5643,7 +5124,7 @@ msgid "Confirm to delete this pull reque msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:70 -#, fuzzy, python-format +#, python-format msgid "Confirm again to delete this pull request with %s comments" msgstr "" @@ -5657,108 +5138,95 @@ msgstr "" msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -#, fuzzy -msgid "There are no reviewers" -msgstr "Zatiaľ nie sú reviewers" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 -#, fuzzy -msgid "Remove reviewer" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:250 -msgid "Type name of reviewer to add" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:258 -#, fuzzy -msgid "Potential Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:261 -msgid "Click to add the repository owner as reviewer:" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:284 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 msgid "Cancel Changes" msgstr "Zrušiť zmeny" -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:234 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:240 +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:243 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5766,7 +5234,6 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -#| msgid "Open New Pull Request from {0}" msgid "Pull Requests from '%s'" msgstr "Zmena stavu" @@ -5775,35 +5242,39 @@ msgstr "Zmena stavu" msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" @@ -5817,29 +5288,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "" @@ -5849,80 +5320,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "" @@ -5930,449 +5401,90 @@ msgstr "" msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 msgid "Latest Changes" msgstr "Posledné zmeny" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:177 msgid "Quick Start" msgstr "" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +#, fuzzy +msgid "Push new repository" +msgstr "Prázdny repozitár" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" - -#~ msgid "increase diff context to %(num)s lines" -#~ msgstr "" - -#~ msgid "No comments." -#~ msgstr "Nie sú žiadne komentáre." - -#~ msgid "public journal" -#~ msgstr "" - -#~ msgid "journal" -#~ msgstr "" - -#~ msgid "forever" -#~ msgstr "" - -#~ msgid "unmodified" -#~ msgstr "" - -#~ msgid "Cannot delete %s it still contains attached forks" -#~ msgstr "" - -#~ msgid "Locked repository" -#~ msgstr "" - -#~ msgid "Unlocked repository" -#~ msgstr "" - -#~ msgid "Unlocked" -#~ msgstr "" - -#~ msgid "Locked" -#~ msgstr "" - -#~ msgid "Repository has been %s" -#~ msgstr "" - -#~ msgid "You can't edit this user" -#~ msgstr "" - -#~ msgid "compare view" -#~ msgstr "" - -#~ msgid "fork name %s" -#~ msgstr "" - -#~ msgid "Pull request #%s" -#~ msgstr "" - -#~ msgid "No Files" -#~ msgstr "" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -#~ msgstr "" - -#~ msgid "You can't remove this user since it's crucial for entire application" -#~ msgstr "" - -#~ msgid "Username \"%(username)s\" is forbidden" -#~ msgstr "" - -#~ msgid "invalid password" -#~ msgstr "" - -#~ msgid "invalid user name" -#~ msgstr "" - -#~ msgid "Your account is disabled" -#~ msgstr "" - -#~ msgid "Repository name %(repo)s is disallowed" -#~ msgstr "" - -#~ msgid "invalid clone URL" -#~ msgstr "" - -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "This email address is already taken" -#~ msgstr "" - -#~ msgid "email \"%(email)s\" does not exist." -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "" - -#~ msgid "Defaults" -#~ msgstr "" - -#~ msgid "never" -#~ msgstr "" - -#~ msgid "My Emails" -#~ msgstr "" - -#~ msgid "Watched" -#~ msgstr "" - -#~ msgid "My Permissions" -#~ msgstr "" - -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "Confirm to reset this api key: %s" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "Confirm to remove this api key: %s" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - -#~ msgid "delete" -#~ msgstr "" - -#~ msgid "current IP" -#~ msgstr "" - -#~ msgid "Permissions Administration" -#~ msgstr "" - -#~ msgid "Overview" -#~ msgstr "" - -#~ msgid "Overwrite existing settings" -#~ msgstr "" - -#~ msgid "Repository creation" -#~ msgstr "" - -#~ msgid "Default IP Whitelist for All Users" -#~ msgstr "" - -#~ msgid "Confirm to delete this ip: %s" -#~ msgstr "" - -#~ msgid "Default User Permissions Overview" -#~ msgstr "" - -#~ msgid "none" -#~ msgstr "" - -#~ msgid "read" -#~ msgstr "" - -#~ msgid "write" -#~ msgstr "" - -#~ msgid "admin" -#~ msgstr "" - -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "default" -#~ msgstr "" - -#~ msgid "revoke" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - -#~ msgid "apply to children" -#~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - -#~ msgid "Optional URL from which repository should be cloned." -#~ msgstr "" - -#~ msgid "private repository" -#~ msgstr "" - -#~ msgid "Remote URL" -#~ msgstr "" - -#~ msgid "Pull Changes from Remote Location" -#~ msgstr "" - -#~ msgid "Confirm to pull changes from remote side." -#~ msgstr "" - -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - -#~ msgid "Non-changeable id" -#~ msgstr "" - -#~ msgid "edit" -#~ msgstr "" - -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - -#~ msgid "Destroy old data" -#~ msgstr "" - -#~ msgid "check for updates" -#~ msgstr "" - -#~ msgid "Meta-Tagging" -#~ msgstr "" - -#~ msgid "Default permissions" -#~ msgstr "" - -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "Push new repo" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "merge" -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - -#~ msgid "Comment from pull request" -#~ msgstr "" - -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - -#~ msgid "Mimetype" -#~ msgstr "" +#, fuzzy +#~| msgid "Repository URL" +#~ msgid "Repository Group" +#~ msgstr "Repozitáre" + +#, fuzzy +#~ msgid "There are no reviewers" +#~ msgstr "Zatiaľ nie sú reviewers" #~ msgid "My Repos" #~ msgstr "Moje repozitáre" - -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "%s Pull Request #%s" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - -#~ msgid "owner" -#~ msgstr "" - -#~ msgid "reviewer" -#~ msgstr "" - -#~ msgid "with subrepos" -#~ msgstr "" - -#~ msgid "Your password reset link was sent" -#~ msgstr "" - -#~ msgid "Your new password" -#~ msgstr "" - -#~ msgid "Your new Kallithea password:%s" -#~ msgstr "" - -#~ msgid "Open New Pull Request for Selected Changesets" -#~ msgstr "" - -#~ msgid "Show Selected Changesets __S → __E" -#~ msgstr "" - -#~ msgid "Show Selected Changeset __S" -#~ msgstr "" - -#~ msgid "We received a request to create a new password for your account." -#~ msgstr "" - -#~ msgid "You can generate it by clicking following URL" -#~ msgstr "" - -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - -#~ msgid "Created by" -#~ msgstr "" - -#~ msgid "You can only delete files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "You can only edit files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "Changeset not found" -#~ msgstr "" - -#~ msgid "Pull Requests from %s'" -#~ msgstr "" - diff --git a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/uk/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/uk/LC_MESSAGES/kallithea.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3.2\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" "PO-Revision-Date: 2018-03-31 21:42+0000\n" "Last-Translator: Максим Якимчук \n" "Language-Team: Ukrainian =2 && n%10<=" -"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Weblate 2.20-dev\n" -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "Нічого" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "Відображати пробіли" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ігнорувати пробіли" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +msgid "No permission to change status" +msgstr "" + +#: kallithea/controllers/changeset.py:214 +#, python-format +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 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:383 -msgid "Changing status on a changeset associated with a closed pull request is not allowed" -msgstr "" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, python-format +msgid "Could not find other repository %s" +msgstr "" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "" + #: kallithea/controllers/error.py:71 -msgid "No response" -msgstr "" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Невідома помилка" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "" -#: kallithea/controllers/error.py:109 -msgid "The server encountered an unexpected condition which prevented it from fulfilling the request." -msgstr "" - -#: kallithea/controllers/feed.py:55 +#: kallithea/controllers/error.py:93 +msgid "" +"The server encountered an unexpected condition which prevented it from " +"fulfilling the request." +msgstr "" + +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#, python-format +msgid "%s %s feed" +msgstr "" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 #, python-format msgid "Changes on %s repository" msgstr "" -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:91 -msgid "Click here to add new file" -msgstr "" - #: kallithea/controllers/files.py:92 +msgid "Click here to add new file" +msgstr "" + +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:317 +#: kallithea/controllers/files.py:312 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:328 +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "Журнал" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" msgstr "" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" msgstr "" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:124 +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" msgstr "" -#: kallithea/controllers/pullrequests.py:152 +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" msgstr "" -#: kallithea/controllers/pullrequests.py:174 +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" msgstr "" -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" msgstr "" -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 +msgid "Error occurred while creating pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:375 +msgid "New pull request iteration created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 msgid "No description" msgstr "Без опису" -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 -msgid "Error occurred while creating pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "This pull request is based on another %s revision and there is no simple diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:514 +#: kallithea/controllers/pullrequests.py:432 msgid "Pull request updated" msgstr "" -#: kallithea/controllers/pullrequests.py:529 +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 +#, python-format +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "" #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "" @@ -461,149 +479,151 @@ msgstr "" msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" -msgstr "" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 хвилин" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "5 хвилин" +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" -msgstr "" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "1 день" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 -msgid "1 day" -msgstr "1 день" - -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "1 місяць" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "" +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "" + #: kallithea/controllers/admin/gists.py:233 -msgid "Unmodified" -msgstr "" - -#: kallithea/controllers/admin/gists.py:262 -msgid "Successfully updated gist content" -msgstr "" - -#: kallithea/controllers/admin/gists.py:267 -msgid "Successfully updated gist data" -msgstr "" - -#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "" +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "" + #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -msgid "Read" -msgstr "" - #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -msgid "Write" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "Read" msgstr "" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "Write" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -611,622 +631,624 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "" +#: kallithea/controllers/admin/repos.py:446 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:450 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:466 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:468 +#, python-format +msgid "Marked repository %s as fork of %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:475 +msgid "An error occurred during this operation" +msgstr "" + #: kallithea/controllers/admin/repos.py:491 -msgid "Updated repository visibility in public journal" -msgstr "" - -#: kallithea/controllers/admin/repos.py:495 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:512 -msgid "Nothing" -msgstr "" - -#: kallithea/controllers/admin/repos.py:514 -#, python-format -msgid "Marked repository %s as fork of %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:521 -msgid "An error occurred during this operation" -msgstr "" - -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 msgid "Repository has been locked" msgstr "" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" msgstr "" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" +msgstr "" + #: kallithea/controllers/admin/settings.py:174 -msgid "Unable to activate hgsubversion support. The \"hgsubversion\" library is missing" -msgstr "" - -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 -msgid "Error occurred while updating application settings" -msgstr "" - -#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, python-format msgid "Invalidated %s repositories" msgstr "" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +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 "Added new hook" msgstr "" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "" - -#: kallithea/lib/auth.py:757 +#: kallithea/lib/auth.py:824 +msgid "You need to be a registered user to perform this action" +msgstr "" + +#: kallithea/lib/auth.py:852 +msgid "You need to be signed in to view this page" +msgstr "" + +#: kallithea/lib/base.py:444 msgid "Invalid API key" msgstr "" -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 -msgid "You need to be a registered user to perform this action" -msgstr "" - -#: kallithea/lib/auth.py:864 -msgid "You need to be signed in to view this page" -msgstr "" - -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" - -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "" -#: kallithea/lib/helpers.py:610 -#, python-format -msgid "Deleted branch: %s" -msgstr "" - #: kallithea/lib/helpers.py:612 #, python-format +msgid "Deleted branch: %s" +msgstr "" + +#: kallithea/lib/helpers.py:614 +#, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, python-format msgid "Changeset %s not found" msgstr "" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1445 -#, python-format -msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" -msgstr "" - -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/helpers.py:1264 +#, python-format +msgid "" +"%s repository is not mapped to db perhaps it was created or renamed from " +"the filesystem please run the application again in order to rescan " +"repositories" +msgstr "" + +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1234,7 +1256,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1242,7 +1264,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1250,7 +1272,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1258,7 +1280,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1266,7 +1288,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" @@ -1274,1098 +1296,610 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 msgid "Only admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 msgid "Non-admins can fork repositories" msgstr "" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "" -#: kallithea/model/forms.py:57 -msgid "Please enter a login" +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2266 +msgid "Approved" msgstr "" #: kallithea/model/forms.py:58 +msgid "Please enter a login" +msgstr "" + +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 -msgid "Please enter a password" -msgstr "" - #: kallithea/model/forms.py:67 +msgid "Please enter a password" +msgstr "" + +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:309 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "" -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "" - -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" + +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 -msgid "You can't remove this user since it is crucial for the entire application" -msgstr "" - -#: kallithea/model/user.py:261 -#, python-format -msgid "User \"%s\" still owns %s repositories and cannot be removed. Switch owners or remove those repositories: %s" -msgstr "" - -#: kallithea/model/user.py:266 -#, python-format -msgid "User \"%s\" still owns %s repository groups and cannot be removed. Switch owners or remove those repository groups: %s" -msgstr "" - -#: kallithea/model/user.py:273 -#, python-format -msgid "User \"%s\" still owns %s user groups and cannot be removed. Switch owners or remove those user groups: %s" -msgstr "" - -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" +msgstr "" + +#: kallithea/model/user.py:258 +#, python-format +msgid "" +"User \"%s\" still owns %s repositories and cannot be removed. Switch " +"owners or remove those repositories: %s" +msgstr "" + +#: kallithea/model/user.py:263 +#, python-format +msgid "" +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 +#, python-format +msgid "" +"User \"%s\" still owns %s user groups and cannot be removed. Switch " +"owners or remove those user groups: %s" +msgstr "" + +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 -#, python-format -msgid "The password to your account %s has been changed using password reset form." -msgstr "" - -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/user.py:414 +#, python-format +msgid "" +"The password to your account %s has been changed using password reset " +"form." +msgstr "" + +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:99 -msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:126 +#: kallithea/model/validators.py:78 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:133 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:152 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:155 -msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character" -msgstr "" - -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:136 +msgid "" +"user group name may only contain alphanumeric characters underscores, " +"periods or dashes and must begin with alphanumeric character" +msgstr "" + +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 msgid "Invalid username or password" msgstr "" +#: kallithea/model/validators.py:312 +msgid "Token mismatch" +msgstr "" + +#: kallithea/model/validators.py:328 +#, python-format +msgid "Repository name %(repo)s is not allowed" +msgstr "" + +#: kallithea/model/validators.py:330 +#, python-format +msgid "Repository named %(repo)s already exists" +msgstr "" + #: kallithea/model/validators.py:331 -msgid "Token mismatch" -msgstr "" - -#: kallithea/model/validators.py:345 -#, python-format -msgid "Repository name %(repo)s is not allowed" -msgstr "" - -#: kallithea/model/validators.py:347 -#, python-format -msgid "Repository named %(repo)s already exists" -msgstr "" - -#: kallithea/model/validators.py:348 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 msgid "Invalid repository URL" msgstr "" -#: kallithea/model/validators.py:466 -msgid "Invalid repository URL. It must be a valid http, https, ssh, svn+http or svn+https URL" -msgstr "" - -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:420 +msgid "" +"Invalid repository URL. It must be a valid http, https, ssh, svn+http or " +"svn+https URL" +msgstr "" + +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 msgid "This email address is already in use" msgstr "" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:762 -msgid "The LDAP Login attribute of the CN must be specified - this is the name of the attribute that is equivalent to \"username\"" -msgstr "" - -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:719 +msgid "" +"The LDAP Login attribute of the CN must be specified - this is the name " +"of the attribute that is equivalent to \"username\"" +msgstr "" + +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" - -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "" - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 -msgid "Add Repository Group" -msgstr "" - +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 #: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "" @@ -2373,142 +1907,129 @@ msgstr "" msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 #, python-format msgid "Reset Your Password to %s" msgstr "" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 msgid "Reset Your Password" msgstr "" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 -msgid "Send Password Reset Email" -msgstr "" - #: kallithea/templates/password_reset.html:47 -msgid "A password reset link will be sent to the specified email address if it is registered in the system." -msgstr "" - -#: kallithea/templates/password_reset_confirmation.html:19 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 +msgid "" +"A password reset link will be sent to the specified email address if it " +"is registered in the system." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 -msgid "Note that you must use the same browser session for this as the one used to request the password reset." -msgstr "" - -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:24 +msgid "" +"Note that you must use the same browser session for this as the one used " +"to request the password reset." +msgstr "" + +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 msgid "New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 msgid "Confirm New Password" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 msgid "Admin Journal" msgstr "" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 msgid "Filter" msgstr "" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2517,30 +2038,16 @@ msgstr[1] "" msgstr[2] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "" @@ -2548,7 +2055,7 @@ msgstr "" msgid "From IP" msgstr "" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "" @@ -2557,104 +2064,108 @@ msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 -msgid "Comma-separated list of plugins; Kallithea will try user authentication in plugin order" -msgstr "" - -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:32 +msgid "" +"Comma-separated list of plugins; Kallithea will try user authentication " +"in plugin order" +msgstr "" + +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 msgid "Repository Defaults" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "" +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 +msgid "Private repository" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 +msgid "" +"Private repositories are only visible to people explicitly added as " +"collaborators." +msgstr "" + #: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 -msgid "Private repository" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 -msgid "Private repositories are only visible to people explicitly added as collaborators." +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 +msgid "Enable statistics" +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 +msgid "Enable statistics window on summary page." +msgstr "" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 +msgid "Enable downloads" msgstr "" #: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 -msgid "Enable statistics" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 -msgid "Enable statistics window on summary page." -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 -msgid "Enable downloads" -msgstr "" - -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2663,43 +2174,45 @@ msgstr "" msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 -#, python-format -msgid "Gist was update since you started editing. Copy your changes and click %(here)s to reload new version." -msgstr "" - -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: 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." +msgstr "" + +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 msgid "Never" msgstr "" @@ -2708,7 +2221,8 @@ msgid "Update Gist" msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "" @@ -2731,16 +2245,16 @@ msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "" @@ -2749,45 +2263,45 @@ msgstr "" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "" @@ -2797,182 +2311,197 @@ msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 msgid "Owned Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 msgid "Watched Repositories" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 msgid "Show Permissions" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, python-format msgid "Confirm to remove this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 msgid "Remove" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "" @@ -2980,105 +2509,68 @@ msgstr "" msgid "Change Your Account Password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, python-format +msgid "Change %s avatar at" msgstr "" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 msgid "Repositories You Own" msgstr "" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" msgstr "" #: kallithea/templates/admin/my_account/my_account_watched.html:1 msgid "Repositories You are Watching" msgstr "" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 msgid "Default Permissions" msgstr "" @@ -3092,151 +2584,173 @@ msgstr "" msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 -#, python-format -msgid "Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:25 -msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +msgid "Allow anonymous access" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 +#, python-format +msgid "" +"Allow access to Kallithea without needing to log in. Anonymous users use " +"%s user permissions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:19 +msgid "" +"All default permissions on each repository will be reset to chosen " +"permission, note that all custom default permission on repositories will " +"be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:20 msgid "Apply to all existing repositories" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:23 +msgid "Permissions for the Default user on new repositories." +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:27 -msgid "Permissions for the Default user on new repositories." +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 -msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" +msgid "" +"All default permissions on each repository group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:33 +msgid "Apply to all existing repository groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:36 +msgid "Permissions for the Default user on new repository groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:40 -msgid "Apply to all existing repository groups" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:41 -msgid "Permissions for the Default user on new repository groups." +#: kallithea/templates/data_table/_dt_elements.html:141 +msgid "User group" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:45 +msgid "" +"All default permissions on each user group will be reset to chosen " +"permission, note that all custom default permission on user groups will " +"be lost" msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 -msgid "User group" +msgid "Apply to all existing user groups" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:49 +msgid "Permissions for the Default user on new user groups." msgstr "" #: kallithea/templates/admin/permissions/permissions_globals.html:53 -msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:54 -msgid "Apply to all existing user groups" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:55 -msgid "Permissions for the Default user on new user groups." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Top level repository creation" msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 +msgid "" +"Note: This will also give all users API access to create repositories " +"everywhere. That might change in future versions." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:61 +msgid "Repository creation with group write access" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 -msgid "Note: This will also give all users API access to create repositories everywhere. That might change in future versions." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:70 -msgid "Repository creation with group write access" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:74 -msgid "With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +msgid "" +"With this, write permission to a repository group allows creating " +"repositories inside that group. Without this, group write permissions " +"mean nothing." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:75 +msgid "Repository forking" +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:78 +msgid "Enable this to allow non-admins to fork repositories." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:82 +msgid "Registration" +msgstr "" + #: kallithea/templates/admin/permissions/permissions_globals.html:88 -msgid "Repository forking" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:92 -msgid "Enable this to allow non-admins to fork repositories." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:97 -msgid "Registration" -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:105 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" @@ -3245,30 +2759,29 @@ msgstr "" msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "" @@ -3293,12 +2806,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3310,16 +2823,32 @@ msgstr[2] "" msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +msgid "Visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +msgid "Add repos" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3327,96 +2856,97 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 -msgid "Set or revoke permission to all children of that group, including non-private repositories and other groups if selected." -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 -msgid "Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +msgid "" +"Set or revoke permission to all children of that group, including non-" +"private repositories and other groups if selected." +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 #, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" +msgid "Repository group %s" msgstr "" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 msgid "Repository Groups Administration" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 msgid "Number of Top-level Repositories" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 msgid "Clone remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:22 -msgid "Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:16 +msgid "" +"Optional: URL of a remote repository. If set, the repository will be " +"created as a clone from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 -msgid "Default revision for files page, downloads, full text search index and readme generation" +#: kallithea/templates/admin/repos/repo_add_base.html:52 +msgid "" +"Default revision for files page, downloads, full text search index and " +"readme generation" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 @@ -3430,11 +2960,15 @@ msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:27 #, python-format -msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name" +msgid "" +"Repository \"%(repo_name)s\" is being created, you will be redirected " +"when this process is finished.repo_name" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:39 -msgid "We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator." +msgid "" +"We're sorry but error occurred during this operation. Please check your " +"Kallithea server logs, or contact administrator." msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 @@ -3442,22 +2976,22 @@ msgstr "" msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "" @@ -3466,75 +3000,79 @@ msgid "Parent" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 msgid "Public Journal Visibility" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 msgid "Add to Public Journal" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 -msgid "All actions done in this repository will be visible to everyone in the public journal." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 +msgid "" +"All actions done in this repository will be visible to everyone in the " +"public journal." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 msgid "Change Locking" msgstr "" +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 +msgid "Confirm to unlock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 +msgid "Unlock Repository" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -msgid "Confirm to unlock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 -msgid "Unlock Repository" +#, python-format +msgid "Locked by %s on %s" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#, python-format -msgid "Locked by %s on %s" +msgid "Confirm to lock repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 +msgid "Lock Repository" msgstr "" #: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -msgid "Confirm to lock repository." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 -msgid "Lock Repository" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 -msgid "Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 +msgid "" +"Force locking on the repository. Works only when anonymous access is " +"disabled. Triggering a pull locks the repository. The user who is " +"pulling locks the repository; only the user who pulled and locked it can " +"unlock it by doing a push." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 msgid "Delete this Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" @@ -3542,150 +3080,165 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 -msgid "The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it." +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 +msgid "" +"The deleted repository will be moved away and hidden until the " +"administrator expires it. The administrator can both permanently delete " +"it or restore it." msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:4 msgid "Invalidate Repository Cache" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -msgid "Confirm to invalidate repository cache." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 -msgid "Manually invalidate cache for this repository. On first access, the repository will be cached again." +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 +msgid "" +"Manually invalidate cache for this repository. On first access, the " +"repository will be cached again." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" msgstr "" #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 msgid "Private Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +msgid "Fork of repository" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 msgid "Remote repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 msgid "Pull Changes from Remote Repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 -msgid "Confirm to pull changes from remote repository." -msgstr "" - #: kallithea/templates/admin/repos/repo_edit_remote.html:17 +msgid "Confirm to pull changes from remote repository." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "Permanent Repository ID" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" -"In case this repository is renamed or moved into another group the repository URL changes.\n" -" Using the above permanent URL guarantees that this repository always will be accessible on that URL.\n" -" This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +"In case this repository is renamed or moved into another group the " +"repository URL changes.\n" +" Using the above permanent URL guarantees " +"that this repository always will be accessible on that URL.\n" +" This is useful for CI systems, or any " +"other cases that you need to hardcode the URL into a 3rd party service." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 msgid "Remote repository" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 msgid "Repository URL" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 -msgid "Optional: URL of a remote repository. If set, the repository can be pulled from this URL." -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +msgid "" +"Optional: URL of a remote repository. If set, the repository can be " +"pulled from this URL." +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3701,7 +3254,7 @@ msgstr "" msgid "Repositories Administration" msgstr "" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3722,7 +3275,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "" @@ -3734,336 +3287,374 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 -msgid "HTML with JavaScript for web analytics systems like Google Analytics or Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 +msgid "" +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 -msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:43 +msgid "" +"Private key for reCaptcha system. Setting this value will enable captcha " +"on registration." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 msgid "Save Settings" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 -msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications." -msgstr "" - -#: kallithea/templates/admin/settings/settings_hooks.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:17 msgid "Custom Hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:18 +msgid "" +"Hooks can be used to trigger actions on certain events such as push / " +"pull. They can trigger Python functions or external applications." +msgstr "" + +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +msgid "Rescan options" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 -msgid "Check this option to remove all comments, pull requests and other records related to repositories that no longer exist in the filesystem." +#: kallithea/templates/admin/settings/settings_mapping.html:12 +msgid "" +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version." +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 -msgid "This option completely reindexeses all of the repositories for proper fulltext search capabilities." -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:21 +msgid "" +"This option completely reindexeses all of the repositories for proper " +"fulltext search capabilities." +msgstr "" + +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "Activate to require SSL both pushing and pulling. If SSL certificate is missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 msgid "Mercurial extensions" msgstr "" +#: kallithea/templates/admin/settings/settings_vcs.html:38 +msgid "Enable largefiles extension" +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:44 +msgid "Enable hgsubversion extension" +msgstr "" + #: kallithea/templates/admin/settings/settings_vcs.html:47 -msgid "Enable largefiles extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:51 -msgid "Enable hgsubversion extension" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:53 -msgid "Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial." +msgid "" +"Requires hgsubversion library to be installed. Enables cloning of remote " +"Subversion repositories while converting them to Mercurial." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:59 +msgid "Location of repositories" msgstr "" #: kallithea/templates/admin/settings/settings_vcs.html:64 -msgid "Location of repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:69 -msgid "Click to unlock. You must restart Kallithea in order to make this setting take effect." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 -msgid "Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:8 +msgid "" +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 +msgid "" +"Filesystem location where repositories are stored. After changing this " +"value, a restart and rescan of the repository folder are both required." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" -" The following variables of the URL will be replaced accordingly.\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {email} user email,\n" -" {md5email} md5 hash of the user email (like at gravatar.com),\n" -" {size} size of the image that is expected from the server application,\n" -" {netloc} network location/server host of running Kallithea server" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:42 +" The following " +"variables of the URL will be replaced accordingly.\n" +" {scheme} " +"'http' or 'https' sent from running Kallithea server,\n" +" {email} user " +"email,\n" +" {md5email} md5 " +"hash of the user email (like at gravatar.com),\n" +" {size} size " +"of the image that is expected from the server application,\n" +" {netloc} " +"network location/server host of running Kallithea server" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +msgid "Clone URL" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.\n" -" The following variables are available:\n" -" {scheme} 'http' or 'https' sent from running Kallithea server,\n" -" {user} current user username,\n" -" {netloc} network location/server host of running Kallithea server,\n" -" {repo} full repository name,\n" -" {repoid} ID of repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 -msgid "Number of items displayed in the main page dashboard before pagination is shown." +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " +"variables are available:\n" +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " +"location/server host of running Kallithea server,\n" +" {repo} full " +"repository name,\n" +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +msgid "Repository page size" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:57 +msgid "" +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 -msgid "Number of items displayed in the admin pages grids before pagination is shown." +msgid "" +"Number of items displayed in the admin pages grids before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:70 +msgid "Icons" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:75 -msgid "Icons" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 msgid "Meta Tagging" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:97 +#: kallithea/templates/admin/settings/settings_visual.html:94 +msgid "" +"Parses meta tags from the repository description field and turns them " +"into colored tags." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:98 msgid "Stylify recognised meta tags:" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:111 -msgid "Parses meta tags from the repository description field and turns them into colored tags." -msgstr "" - #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4082,13 +3673,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4097,15 +3688,15 @@ msgstr "" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "" @@ -4119,17 +3710,17 @@ msgstr "" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "" @@ -4148,12 +3739,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4162,7 +3753,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4171,24 +3762,16 @@ msgstr "" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "" @@ -4196,220 +3779,219 @@ msgstr "" msgid "Users Administration" msgstr "" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "" - #: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 -#: kallithea/templates/forks/fork.html:9 -msgid "Fork" -msgstr "" - #: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/forks/fork.html:9 +msgid "Fork" +msgstr "" + +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "" - -#: kallithea/templates/base/base.html:221 -msgid "Show recent activity" -msgstr "" - -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 -msgid "Public journal" -msgstr "" - -#: kallithea/templates/base/base.html:233 -msgid "Show public gists" -msgstr "" - -#: kallithea/templates/base/base.html:234 -msgid "Gists" -msgstr "" - -#: kallithea/templates/base/base.html:238 -msgid "All Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:240 -msgid "My Public Gists" -msgstr "" - -#: kallithea/templates/base/base.html:241 -msgid "My Private Gists" -msgstr "" - -#: kallithea/templates/base/base.html:246 -msgid "Search in repositories" -msgstr "" - -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 -#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 -msgid "My Pull Requests" -msgstr "" - -#: kallithea/templates/base/base.html:289 -msgid "Not Logged In" +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" msgstr "" #: kallithea/templates/base/base.html:296 +msgid "Show recent activity" +msgstr "" + +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 +msgid "Public journal" +msgstr "" + +#: kallithea/templates/base/base.html:308 +msgid "Show public gists" +msgstr "" + +#: kallithea/templates/base/base.html:309 +msgid "Gists" +msgstr "" + +#: kallithea/templates/base/base.html:313 +msgid "All Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:315 +msgid "My Public Gists" +msgstr "" + +#: kallithea/templates/base/base.html:316 +msgid "My Private Gists" +msgstr "" + +#: kallithea/templates/base/base.html:321 +msgid "Search in repositories" +msgstr "" + +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:6 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:10 +msgid "My Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:360 +msgid "Not Logged In" +msgstr "" + +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" -msgstr "" - -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:379 +msgid "Forgot password?" +msgstr "" + +#: kallithea/templates/base/base.html:383 +msgid "Don't have an account?" +msgstr "" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 msgid "Inherit defaults" msgstr "" -#: kallithea/templates/base/default_perms_box.html:19 -#, python-format -msgid "Select to inherit global settings, IP whitelist and permissions from the %s." -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:15 +#, python-format +msgid "" +"Select to inherit global settings, IP whitelist and permissions from the " +"%s." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "" @@ -4418,148 +4000,140 @@ msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "" - -#: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "" - -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "" - -#: kallithea/templates/base/root.html:27 -msgid "Loading ..." -msgstr "" - #: kallithea/templates/base/root.html:28 -msgid "loading ..." +msgid "Retry" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" +msgid "Unable to post" msgstr "" #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" +msgid "Stop following this repository" msgstr "" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" +msgid "Start following this repository" msgstr "" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" +msgid "Group" msgstr "" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 -msgid "Collapse Diff" +msgid "Loading ..." msgstr "" #: kallithea/templates/base/root.html:36 -msgid "Expand Diff" +msgid "loading ..." msgstr "" #: kallithea/templates/base/root.html:37 -msgid "Failed to revoke permission" +msgid "Search truncated" msgstr "" #: kallithea/templates/base/root.html:38 -msgid "Confirm to revoke permission for {0}: {1} ?" +msgid "No matching files" msgstr "" #: kallithea/templates/base/root.html:39 -msgid "enabled" +msgid "Open New Pull Request from {0}" msgstr "" #: kallithea/templates/base/root.html:40 -msgid "disabled" +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +msgid "Show Selected Changesets {0} → {1}" msgstr "" #: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 +msgid "Collapse Diff" +msgstr "" + +#: kallithea/templates/base/root.html:44 +msgid "Expand Diff" +msgstr "" + +#: kallithea/templates/base/root.html:45 +msgid "No revisions" +msgstr "" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 +msgid "Failed to revoke permission" +msgstr "" + +#: kallithea/templates/base/root.html:48 +msgid "Confirm to revoke permission for {0}: {1} ?" +msgstr "" + +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" @@ -4567,79 +4141,31 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 msgid "Go to tip of repository" msgstr "" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "" @@ -4655,7 +4181,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "" @@ -4669,38 +4195,59 @@ msgstr "" msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -msgid "Push new repository" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, python-format +msgid "%s comments" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" msgstr "" #: kallithea/templates/changeset/changeset.html:8 @@ -4708,60 +4255,50 @@ msgstr "" msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 msgid "Merge" msgstr "" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" @@ -4769,9 +4306,9 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" @@ -4779,16 +4316,16 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -msgid "No revisions" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +msgid "comment" msgstr "" #: kallithea/templates/changeset/changeset_file_comment.html:21 @@ -4807,56 +4344,53 @@ msgstr "" msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 msgid "Status change" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +msgid "No change" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +msgid "Finish pull request" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" @@ -4864,7 +4398,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, python-format msgid "%d inline" msgid_plural "%d inline" @@ -4872,7 +4406,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" @@ -4880,101 +4414,100 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -msgid "Set changeset status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -msgid "No change" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +msgid "File before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:40 +msgid "Modified" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:42 +msgid "Deleted" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:44 +msgid "Renamed" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown error" +msgid "Unknown operation: %r" +msgstr "Невідома помилка" + +#: kallithea/templates/changeset/diff_block.html:52 +msgid "No file after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:55 +msgid "File after" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:60 #: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 msgid "Show full side-by-side diff for this file" msgstr "" -#: kallithea/templates/changeset/diff_block.html:38 +#: kallithea/templates/changeset/diff_block.html:72 msgid "Show inline comments" msgstr "" -#: kallithea/templates/changeset/diff_block.html:86 -msgid "Deleted" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:89 -msgid "Renamed" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 +#: kallithea/templates/compare/compare_cs.html:55 #, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 msgid "behind" msgstr "" @@ -4985,20 +4518,20 @@ msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" @@ -5006,103 +4539,149 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +msgid "Changeset on" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +msgid "branch" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Latest Changes" +msgid "Status change:" +msgstr "Останні зміни" + +#: kallithea/templates/email_templates/comment.html:33 +msgid "The pull request has been closed." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 -msgid "Should you not be able to use the link above, please type the following code into the password reset form" -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:12 -msgid "If it weren't you who requested the password reset, just disregard this message." -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/password_reset.html:33 +msgid "" +"Should you not be able to use the link above, please type the following " +"code into the password reset form" +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:44 +msgid "" +"If it weren't you who requested the password reset, just disregard this " +"message." +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +msgid "Pull request" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Pull Request %s \"%s\" Closed" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, python-format +msgid "Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/registration.html:22 +msgid "Full Name" msgstr "" #: kallithea/templates/files/diff_2way.html:15 @@ -5121,7 +4700,7 @@ msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "" @@ -5131,72 +4710,73 @@ msgstr "" msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" +msgid "New file type" msgstr "" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 msgid "Commit Changes" msgstr "" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "" -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 msgid "Last Modified" msgstr "" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 msgid "Last Committer" msgstr "" @@ -5206,7 +4786,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5219,24 +4799,20 @@ msgstr "" msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" @@ -5245,50 +4821,58 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "" +#: kallithea/templates/files/files_source.html:69 +msgid "File is too big to display." +msgstr "" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" +msgid "Show as raw." msgstr "" #: kallithea/templates/files/files_ypjax.html:5 @@ -5309,12 +4893,12 @@ msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "" @@ -5323,35 +4907,35 @@ msgstr "" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5361,40 +4945,40 @@ msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "" -#: kallithea/templates/journal/journal.html:21 -msgid "ATOM journal feed" -msgstr "" - #: kallithea/templates/journal/journal.html:22 +msgid "ATOM journal feed" +msgstr "" + +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "" @@ -5403,31 +4987,36 @@ msgstr "" msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "" @@ -5439,6 +5028,10 @@ msgstr "" msgid "Vote" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5462,7 +5055,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "" @@ -5489,103 +5082,95 @@ msgstr "" msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Summarize the changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -msgid "There are no reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 msgid "on" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 -msgid "This is just a range of changesets and doesn't have a target or a real merge ancestor." -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 +msgid "" +"This is just a range of changesets and doesn't have a target or a real " +"merge ancestor." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -msgid "Update" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +msgid "Next iteration" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +msgid "Cancel Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 msgid "Remove reviewer" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 msgid "Potential Reviewers" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -msgid "Cancel Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 msgid "Pull Request Content" msgstr "" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5601,35 +5186,39 @@ msgstr "" msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" @@ -5643,29 +5232,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "" @@ -5675,80 +5264,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "файли" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "Показати більше" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "" @@ -5756,82 +5345,77 @@ msgstr "" msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "Клонувати з" -#: kallithea/templates/summary/summary.html:72 -msgid "Clone URL" -msgstr "" - -#: kallithea/templates/summary/summary.html:78 -msgid "Show by Name" -msgstr "" - -#: kallithea/templates/summary/summary.html:79 +#: kallithea/templates/summary/summary.html:68 msgid "Show by ID" msgstr "" -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:73 +msgid "Show by Name" +msgstr "" + +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 msgid "Latest Changes" msgstr "Останні зміни" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:177 msgid "Quick Start" msgstr "Швидкий старт" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +msgid "Push new repository" +msgstr "" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "" - -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" diff --git a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po @@ -9,619 +9,633 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" -"PO-Revision-Date: 2014-12-12 14:19+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Simplified Chinese " -"\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" +"PO-Revision-Date: 2018-04-12 03:35+0000\n" +"Last-Translator: Pheng Heong Tan \n" +"Language-Team: Chinese (Simplified) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +"X-Generator: Weblate 2.20\n" +"Generated-By: Babel 1.3\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "还没有修订集" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "无" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" -msgstr "" - -#: kallithea/controllers/changeset.py:89 +msgstr "(已关闭)" + +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" -msgstr "" - -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +msgstr "显示空白" + +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" -msgstr "" - -#: kallithea/controllers/changeset.py:169 +msgstr "忽略空白" + +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" -msgstr "" - -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +msgstr "增加差异上下文到 %(num)s 行" + +#: kallithea/controllers/changeset.py:203 +#, fuzzy +#| msgid "Set changeset status" +msgid "No permission to change status" +msgstr "设置修订集状态" + +#: kallithea/controllers/changeset.py:214 +#, fuzzy, python-format +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 msgid "Such revision does not exist for this repository" -msgstr "" - -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +msgstr "在此代码库内，此修改并不存在" + +#: kallithea/controllers/compare.py:66 +#, python-format +msgid "Could not find other repository %s" +msgstr "找不到那个版本库 %s" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" +#: kallithea/controllers/error.py:70 +msgid "No response" +msgstr "无响应" + #: kallithea/controllers/error.py:71 -#, fuzzy -msgid "No response" -msgstr "修订" - -#: kallithea/controllers/error.py:72 msgid "Unknown error" -msgstr "" - -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." +msgstr "未知错误" + +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." msgstr "由于错误的语法，服务器无法对请求进行响应。" -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "未授权的资源访问" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "无权访问该页面" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "资源未找到" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "服务进入非预期的混乱状态，这会阻止它对请求进行响应。" -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "%s库的修改" - -#: kallithea/controllers/feed.py:56 +#: kallithea/controllers/feed.py:63 +#, python-format +msgid "%s committed on %s" +msgstr "" + +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "修订集太大并已被截断..." + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 #, python-format msgid "%s %s feed" msgstr "%s %s订阅" -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "修订集太大已被截断......" - -#: kallithea/controllers/feed.py:91 -#, python-format -msgid "%s committed on %s" -msgstr "" - -#: kallithea/controllers/files.py:91 -msgid "Click here to add new file" -msgstr "" +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" +msgstr "%s库的修改" #: kallithea/controllers/files.py:92 +msgid "Click here to add new file" +msgstr "点击这里添加新文件" + +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" -msgstr "" - -#: kallithea/controllers/files.py:193 -#, fuzzy, python-format +msgstr "这里还没有文件。%s" + +#: kallithea/controllers/files.py:194 +#, python-format msgid "%s at %s" -msgstr "%s零%s" - -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +msgstr "%s 在 %s" + +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, python-format msgid "This repository has been locked by %s on %s" msgstr "版本库由%s于%s锁定" -#: kallithea/controllers/files.py:317 +#: kallithea/controllers/files.py:312 msgid "You can only delete files with revision being a valid branch" -msgstr "" - -#: kallithea/controllers/files.py:328 +msgstr "您只能删除有效分支的修订中的文件" + +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" -msgstr "" - -#: kallithea/controllers/files.py:350 +msgstr "删除文件 %s 通过 Kallithea" + +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" -msgstr "" - -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +msgstr "成功删除文件 %s" + +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 msgid "You can only edit files with revision being a valid branch" -msgstr "" - -#: kallithea/controllers/files.py:391 +msgstr "您只能编辑有效分支的修订中的文件" + +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" -msgstr "" - -#: kallithea/controllers/files.py:407 +msgstr "已编辑文件 %s 通过 Kallithea" + +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "无变更" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到%s" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" -msgstr "" - -#: kallithea/controllers/files.py:464 +msgstr "已添加文件通过 Kallithea" + +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "无内容" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "无文件名" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" -msgstr "" - -#: kallithea/controllers/files.py:537 +msgstr "下载已禁用" + +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "未知版本%s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "空版本库" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "未知包类型" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "修订集" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "标签" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "在复刻版本库%s的时候发生错误" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" -msgstr "" - -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +msgstr "组" + +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "版本库" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" -msgstr "" - -#: kallithea/controllers/home.py:136 +msgstr "分支" + +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "已关闭分支" + +#: kallithea/controllers/home.py:133 msgid "Tag" -msgstr "" - -#: kallithea/controllers/home.py:142 +msgstr "标签" + +#: kallithea/controllers/home.py:139 msgid "Bookmark" -msgstr "" - -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +msgstr "书签" + +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "公共日志" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "日志" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" -msgstr "" - -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "" - -#: kallithea/controllers/login.py:197 -#, fuzzy +msgstr "验证码错误" + +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "您已成功注册 %s" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" -msgstr "密码重置链接已经发送" - -#: kallithea/controllers/login.py:246 -#, fuzzy +msgstr "密码重置确认码已经发送" + +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" -msgstr "密码重置链接已经发送" - -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +msgstr "无效的密码重置令牌" + +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" -msgstr "" - -#: kallithea/controllers/pullrequests.py:124 +msgstr "成功更新密码" + +#: kallithea/controllers/pullrequests.py:71 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "指定的审核者 \"%s\" 无效" + +#: kallithea/controllers/pullrequests.py:133 #, python-format msgid "%s (closed)" -msgstr "" - -#: kallithea/controllers/pullrequests.py:152 +msgstr "%s (已关闭)" + +#: kallithea/controllers/pullrequests.py:160 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "修订集" -#: kallithea/controllers/pullrequests.py:173 +#: kallithea/controllers/pullrequests.py:181 msgid "Special" -msgstr "" - -#: kallithea/controllers/pullrequests.py:174 +msgstr "特殊" + +#: kallithea/controllers/pullrequests.py:182 msgid "Peer branches" -msgstr "" - -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 +msgstr "同等分支" + +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 msgid "Bookmarks" msgstr "书签" -#: kallithea/controllers/pullrequests.py:310 +#: kallithea/controllers/pullrequests.py:320 #, python-format msgid "Error creating pull request: %s" -msgstr "" - -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -#, fuzzy -msgid "No description" -msgstr "描述" - -#: kallithea/controllers/pullrequests.py:363 +msgstr "创建拉取请求出错：%s" + +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 +msgid "Error occurred while creating pull request" +msgstr "创建拉取请求时发生错误" + +#: kallithea/controllers/pullrequests.py:352 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "" - -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 -#, fuzzy -msgid "Error occurred while creating pull request" -msgstr "提交拉取请求时发生错误" - -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 -#, python-format -msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -#, fuzzy -msgid "Pull request update created" -msgstr "拉取请求检视人员" - -#: kallithea/controllers/pullrequests.py:514 -#, fuzzy +#: kallithea/controllers/pullrequests.py:375 +#, fuzzy +#| msgid "Pull request update created" +msgid "New pull request iteration created" +msgstr "拉取请求更新已创建" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "无描述" + +#: kallithea/controllers/pullrequests.py:432 msgid "Pull request updated" -msgstr "拉取请求" - -#: kallithea/controllers/pullrequests.py:529 +msgstr "拉取请求已更新" + +#: kallithea/controllers/pullrequests.py:445 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: kallithea/controllers/pullrequests.py:595 +#: kallithea/controllers/pullrequests.py:481 +#, fuzzy, python-format +#| msgid "Changeset for %s %s not found in %s" +msgid "Revision %s not found in %s" +msgstr "未找到修订集" + +#: kallithea/controllers/pullrequests.py:508 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "没有找到更新此拉取请求的修订集。" + +#: kallithea/controllers/pullrequests.py:522 #, python-format msgid "This pull request has already been merged to %s." msgstr "" -#: kallithea/controllers/pullrequests.py:597 +#: kallithea/controllers/pullrequests.py:524 msgid "This pull request has been closed and can not be updated." msgstr "" -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +#, fuzzy +#| msgid "No changesets found for updating this pull request." +msgid "No additional changesets found for iterating on this pull request." +msgstr "没有找到更新此拉取请求的修订集。" + +#: kallithea/controllers/pullrequests.py:557 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "" -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "" - -#: kallithea/controllers/pullrequests.py:729 -#, fuzzy -msgid "Closing." -msgstr "使用中" - -#: kallithea/controllers/search.py:135 +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 +#, fuzzy, python-format +#| msgid "No changesets found for updating this pull request." +msgid "" +"Error: some changesets not found when displaying pull request from %s." +msgstr "没有找到更新此拉取请求的修订集。" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "错误的搜索。请尝试用引号包含它。" #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "没有索引用于搜索。请运行whoosh索引器" - -#: kallithea/controllers/search.py:144 -#, fuzzy +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." -msgstr "在搜索操作中发生异常" - -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 -#, fuzzy +msgstr "搜索操作期间发生错误。" + +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" -msgstr "数据未加载" - -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +msgstr "数据尚未就绪" + +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" #: kallithea/controllers/admin/auth_settings.py:135 msgid "Auth settings updated successfully" -msgstr "" +msgstr "验证设置更新成功" #: kallithea/controllers/admin/auth_settings.py:146 msgid "error occurred during update of auth settings" -msgstr "" - -#: kallithea/controllers/admin/defaults.py:97 +msgstr "验证设置更新时发生错误" + +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "默认设置已经成功更新" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" -msgstr "" - -#: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 +msgstr "默认值更新时发生错误" + +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 #, fuzzy msgid "Forever" msgstr "检视者" +#: kallithea/controllers/admin/gists.py:59 +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" +msgstr "5 分钟" + #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" -msgstr "" +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" +msgstr "1 小时" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" -msgstr "" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" +msgstr "1 天" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" -msgstr "" - -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +msgstr "1 个月" + +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" -msgstr "" - -#: kallithea/controllers/admin/gists.py:146 +msgstr "终身" + +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" -msgstr "" - -#: kallithea/controllers/admin/gists.py:184 +msgstr "gist 创建时发生错误" + +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" -msgstr "" +msgstr "已删除 gist %s" + +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "未修改" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "成功更新 gist 内容" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "成功更新 gist 数据" #: kallithea/controllers/admin/gists.py:233 -#, fuzzy -msgid "Unmodified" -msgstr "最后修改于" - -#: kallithea/controllers/admin/gists.py:262 -msgid "Successfully updated gist content" -msgstr "" - -#: kallithea/controllers/admin/gists.py:267 -msgid "Successfully updated gist data" -msgstr "" - -#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +msgstr "gist %s 更新时发生错误" + +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:178 +msgstr "用户 %s 更新时发生错误" + +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +msgstr "用户密码更新时发生错误" + +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "已为用户添加电子邮件 %s" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "保存电子邮件时发生错误" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "成功删除用户电子邮件" +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "API 密钥创建成功" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "API 密钥重置成功" + #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +msgstr "API 密钥删除成功" + +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "读" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "写" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -629,1791 +643,1302 @@ msgstr "写" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "停用" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "停用" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "已允许手动激活账号" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "已允许自动激活账号" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "外部账号手动激活" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "外部账号自动激活" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "启用" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:139 +msgstr "全局权限更新成功" + +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" -msgstr "" - -#: kallithea/controllers/admin/repo_groups.py:188 +msgstr "权限更新时发生错误" + +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "这个组内有%s个版本库因而无法删除" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "版本库%s成功更新" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, fuzzy, python-format msgid "Cannot delete repository %s which still has forks" msgstr "无法删除%s因为它还有其他分复刻本库" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "在删除%s的时候发生错误" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, fuzzy, python-format +#| msgid "An error occurred during deletion of user" +msgid "An error occurred during creation of field: %r" +msgstr "删除用户时发生错误" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "" -#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:446 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" -#: kallithea/controllers/admin/repos.py:495 +#: kallithea/controllers/admin/repos.py:450 msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: kallithea/controllers/admin/repos.py:512 +#: kallithea/controllers/admin/repos.py:466 msgid "Nothing" msgstr "无" -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:468 #, python-format msgid "Marked repository %s as fork of %s" msgstr "成功将版本库%s标记为复刻自%s" -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:475 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 +#: kallithea/controllers/admin/repos.py:491 +#: kallithea/controllers/admin/repos.py:512 #, fuzzy msgid "Repository has been locked" msgstr "版本库未锁定" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 #, fuzzy msgid "Repository has been unlocked" msgstr "版本库未锁定" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "解锁时发生错误" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "清除缓存时发生错误" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "成功拉取自远程路径" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "从远程路径拉取时发生错误" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "删除版本库统计时发生错误" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "成功更新版本控制系统设置" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" msgstr "" -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 msgid "Error occurred while updating application settings" msgstr "" -#: kallithea/controllers/admin/settings.py:211 +#: kallithea/controllers/admin/settings.py:174 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, fuzzy, python-format -#| msgid "Invalidate Repository Cache" msgid "Invalidated %s repositories" msgstr "清除版本库缓存" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "更新应用设置" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +#, fuzzy +#| msgid "No data ready yet" +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 "Added new hook" msgstr "新建钩子" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "更新钩子" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Whoosh重新索引任务调度" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "保存权限时发生错误" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "用户更新成功" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "删除用户时发生错误" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "" - -#: kallithea/lib/auth.py:757 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 +#: kallithea/lib/auth.py:824 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: kallithea/lib/auth.py:864 +#: kallithea/lib/auth.py:852 msgid "You need to be signed in to view this page" msgstr "必须登录才能访问该页面" -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:444 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, fuzzy, python-format -#| msgid "Changeset not found" msgid "Changeset for %s %s not found in %s" msgstr "未找到修订集" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "修订集因过大而被截断，可查看原始修订集作为替代" - -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "修订集过大并已被截断，使用差异菜单查看此差异" + +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "未发现差异" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Deleted branch: %s" msgstr "已经删除分支%s" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:614 #, python-format msgid "Created tag: %s" msgstr "创建标签%s" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, fuzzy, python-format -#| msgid "Changeset not found" msgid "Changeset %s not found" msgstr "未找到修订集" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" -msgstr "显示合并的修订集%s->%s" - -#: kallithea/lib/helpers.py:678 +msgstr "显示所有合并的修订集 %s->%s" + +#: kallithea/lib/helpers.py:680 #, fuzzy msgid "Compare view" msgstr "比较显示" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "还有" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "%s个" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "修订" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, fuzzy, python-format msgid "Fork name %s" msgstr "复刻名称%s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, fuzzy, python-format msgid "Pull request %s" msgstr "拉取请求#%s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "[删除]版本库" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "[创建]版本库" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "[创建]复刻版本库" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "[复刻]版本库" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "[更新]版本库" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "[删除]版本库" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "[创建]用户" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "[更新]用户" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "[评论]了版本库中的修订" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "[评论]拉取请求" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "[关闭] 拉取请求" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "[推送]到" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "[通过Kallithea提交]到版本库" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "[远程拉取]到版本库" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "[拉取]自" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "[开始关注]版本库" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr " 还有%s个" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "无文件" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " "the filesystem please run the application again in order to rescan " "repositories" -msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启Kallithea以重新扫描版本库" - -#: kallithea/lib/utils2.py:415 +msgstr "" +"版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启Kallithea" +"以重新扫描版本库" + +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d时" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "%s" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "%s前" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "%s零%s" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "%s零%s前" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "刚才" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "无版本库访问权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "版本库读取权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "版本库写入权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "版本库管理权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "无版本库组访问权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "版本库组读取权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "版本库组写入" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "版本库组管理权限" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "Kallithea 管理员" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "禁用创建版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "允许创建版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "禁用复刻版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "允许复刻版本库" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "禁用注册" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "用手动激活注册新用户" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "用自动激活注册新用户" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "未检视" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "已批准" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "驳回" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "检视中" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "在%s行" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "[提及]" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "Kallithea 管理员" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 #, fuzzy msgid "Default user has read access to new repositories" msgstr "未授权的资源访问" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 #, fuzzy msgid "Default user has write access to new repositories" msgstr "未授权的资源访问" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 #, fuzzy msgid "Only admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 #, fuzzy msgid "Non-admins can create repository groups" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 #, fuzzy msgid "Only admins can fork repositories" msgstr "创建版本库" -#: kallithea/model/db.py:1696 -#, fuzzy -#| msgid "Non-admins can can fork repositories" +#: kallithea/model/db.py:1733 +#, fuzzy msgid "Non-admins can fork repositories" msgstr "创建版本库" -#: kallithea/model/db.py:1699 +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2263 #, fuzzy msgid "Not reviewed" msgstr "未检视" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 #, fuzzy msgid "Under review" msgstr "检视中" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2265 +#, fuzzy +#| msgid "Approved" +msgid "Not approved" +msgstr "已批准" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "已批准" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "请登录" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "输入一个不少于%(min)i个字符的值" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "请输入密码" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "输入少于%(min)i个字符" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, fuzzy, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "成功提交拉取请求" - -#: kallithea/model/notification.py:260 +#: kallithea/model/notification.py:165 #, fuzzy, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "[评论]拉取请求" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#| msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "[评论] %(repo_name)s 修订集 %(short_id)s 在 %(branch)s" + +#: kallithea/model/notification.py:168 #, fuzzy, python-format msgid "New user %(new_username)s registered" msgstr "用户名称 %(new_username)s 无效" -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:309 -#, fuzzy, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "[评论]拉取请求" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 #, fuzzy msgid "Closing" msgstr "使用中" -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "" - -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" + +#: kallithea/model/pull_request.py:211 +#, fuzzy +#| msgid "Error creating pull request: %s" +msgid "Cannot create empty pull request" +msgstr "创建拉取请求出错：%s" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +#, fuzzy +#| msgid "Confirm to delete this pull request" +msgid "You are not authorized to create the pull request" +msgstr "确认删除拉取请求" + +#: kallithea/model/pull_request.py:341 +#, fuzzy +#| msgid "Missing changesets since the previous pull request:" +msgid "Missing changesets since the previous iteration:" +msgstr "缺少上次拉取请求之后的修订集：" + +#: kallithea/model/pull_request.py:348 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "New changesets on %s %s since the previous iteration:" +msgstr "在上次拉取请求之后，在 %s %s 上的新修订集：" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, fuzzy, python-format +#| msgid "New changesets on %s %s since the previous pull request:" +msgid "No changes found on %s %s since previous iteration." +msgstr "在上次拉取请求之后，在 %s %s 上的新修订集：" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "最新tip版本" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 -#, fuzzy -msgid "You can't remove this user since it is crucial for the entire application" +#: kallithea/model/user.py:253 +#, fuzzy +msgid "" +"You can't remove this user since it is crucial for the entire application" msgstr "由于是系统帐号，无法删除该用户" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" -msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" - -#: kallithea/model/user.py:266 +msgstr "" +"由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本" +"库。%s" + +#: kallithea/model/user.py:263 #, fuzzy, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" - -#: kallithea/model/user.py:273 +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" +"由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本" +"库。%s" + +#: kallithea/model/user.py:270 #, fuzzy, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" -msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" - -#: kallithea/model/user.py:360 +msgstr "" +"由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本" +"库。%s" + +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 #, fuzzy msgid "Password reset notification" msgstr "确认密码" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "值不能为空" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "用户名称%(username)s已经存在" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, fuzzy, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "用户名称 %(username)s 无效" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:126 +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" -#: kallithea/model/validators.py:133 +#: kallithea/model/validators.py:112 #, python-format msgid "Username %(username)s is not valid" msgstr "用户名称 %(username)s 无效" -#: kallithea/model/validators.py:152 +#: kallithea/model/validators.py:133 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: kallithea/model/validators.py:193 +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "不能将这个组作为parent" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "组 \"%(group_name)s\" 已经存在" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "已经存在名为 \"%(group_name)s\" 的版本库" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "密码含有无效（非ASCII）字符" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "密码不符" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 #, fuzzy msgid "Invalid username or password" msgstr "无效密码" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:312 msgid "Token mismatch" msgstr "令牌不匹配" -#: kallithea/model/validators.py:345 +#: kallithea/model/validators.py:328 #, fuzzy, python-format msgid "Repository name %(repo)s is not allowed" msgstr "版本库名称不能为%(repo)s" -#: kallithea/model/validators.py:347 +#: kallithea/model/validators.py:330 #, python-format msgid "Repository named %(repo)s already exists" msgstr "已经存在版本库%(repo)s" -#: kallithea/model/validators.py:348 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "版本库组 \"%(group)s\" 中已经存在版本库 \"%(repo)s\"" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 #, fuzzy msgid "Invalid repository URL" msgstr "私有版本库" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "复刻版本库必须和父版本库类型相同" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "没有在该版本库组中创建版本库的权限" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "不是一个合法的路径" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 #, fuzzy msgid "This email address is already in use" msgstr "该邮件地址已被使用" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, fuzzy, python-format msgid "Email address \"%(email)s\" not found" msgstr "邮件地址\"%(email)s\"不存在" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" - -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "控制面板" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "快速过滤..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "版本库" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 -msgid "Add Repository Group" -msgstr "" - +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 #: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "版本库" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "描述" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "名称" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "最后修改" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "Tip" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "所有者" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "点击以升序排列" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "点击以降序排列" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "数据错误" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "载入中..." - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "登录" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "帐号" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "密码" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "记住密码" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "忘记了密码？" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "还没有帐号？" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "登录" @@ -2421,183 +1946,152 @@ msgstr "登录" msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 -#, fuzzy, python-format +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 +#, python-format msgid "Reset Your Password to %s" msgstr "" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 #, fuzzy msgid "Reset Your Password" msgstr "忘记了密码？" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 +#: kallithea/templates/password_reset.html:47 #, fuzzy msgid "Send Password Reset Email" msgstr "确认新密码" -#: kallithea/templates/password_reset.html:47 +#: kallithea/templates/password_reset.html:52 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "密码重置地址已经发送到邮件" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 #, fuzzy msgid "New Password" msgstr "新密码" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 #, fuzzy msgid "Confirm New Password" msgstr "新密码" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "注册" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "确认密码" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "名" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "姓" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "电子邮件" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "没有任何分支" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "没有任何标签" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "无书签" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 #, fuzzy msgid "Admin Journal" msgstr "系统日志" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "日志过滤..." #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 #, fuzzy msgid "Filter" msgstr "过滤" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/templates/journal/journal.html:13 #, fuzzy, python-format msgid "%s Entry" msgid_plural "%s Entries" msgstr[0] "%s条" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "操作" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "版本库" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "日期" @@ -2605,7 +2099,7 @@ msgstr "日期" msgid "From IP" msgstr "来源IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "无操作" @@ -2614,156 +2108,156 @@ msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "保存" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 #, fuzzy msgid "Repository Defaults" msgstr "版本库默认设置" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "类型" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "私有版本库" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "私有版本库只对成员可见。" -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 msgid "Enable statistics" msgstr "启用统计" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 msgid "Enable statistics window on summary page." -msgstr "启用概况页的统计窗口" - -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +msgstr "启用概况页面上的统计窗口。" + +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 msgid "Enable downloads" msgstr "启用下载" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." -msgstr "启用概况页的下载菜单" - -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +msgstr "启用概况页面上的下载菜单。" + +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "启用锁定" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." -msgstr "启用版本库的拉取锁定" +msgstr "启用版本库的拉取锁定。" #: kallithea/templates/admin/gists/edit.html:5 #: kallithea/templates/admin/gists/edit.html:18 msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 #, fuzzy msgid "Never" msgstr "检视者" @@ -2773,7 +2267,8 @@ msgid "Update Gist" msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "" @@ -2796,16 +2291,16 @@ msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "" @@ -2814,45 +2309,45 @@ msgstr "" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "重置" @@ -2862,113 +2357,111 @@ msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "删除" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "我的账户" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 #, fuzzy msgid "Email Addresses" msgstr "增加邮箱" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 #, fuzzy msgid "Owned Repositories" msgstr "版本库" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "创建版本库" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 @@ -2976,73 +2469,90 @@ msgstr "创建版本库" msgid "Show Permissions" msgstr "拷贝权限" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, fuzzy, python-format msgid "Confirm to reset this API key: %s" msgstr "确认删除用户：%s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "确认删除用户：%s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 #, fuzzy msgid "Remove" msgstr "移除" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "增加" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "确认删除邮箱：%s" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "增加邮箱" @@ -3051,109 +2561,71 @@ msgstr "增加邮箱" msgid "Change Your Account Password" msgstr "忘记了密码？" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "新密码" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "修改你的头像" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "使用中" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 #, fuzzy msgid "Repositories You Own" msgstr "版本库" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "没有找到记录" +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "名称" #: kallithea/templates/admin/my_account/my_account_watched.html:1 #, fuzzy msgid "Repositories You are Watching" msgstr "版本库路径" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "我的通知" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "全部" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "评论" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:30 -#, fuzzy -msgid "Mark All Read" -msgstr "全部标记为已读" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "无通知" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -#, fuzzy -msgid "Show Notification" -msgstr "显示通知" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "通知" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 #, fuzzy msgid "Default Permissions" msgstr "默认权限" @@ -3168,202 +2640,209 @@ msgstr "" msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "匿名访问" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +#, fuzzy +#| msgid "Anonymous access" +msgid "Allow anonymous access" +msgstr "匿名访问" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:20 #, fuzzy msgid "Apply to all existing repositories" msgstr "已有版本库？" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 msgid "Permissions for the Default user on new repositories." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "版本库组" + #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "版本库组" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:33 #, fuzzy msgid "Apply to all existing repository groups" msgstr "已有版本库？" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy msgid "Top level repository creation" msgstr "建立版本库" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:61 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:64 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:75 msgid "Repository forking" msgstr "版本库复刻" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:78 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:82 msgid "Registration" msgstr "注册" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:88 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 #, fuzzy, python-format msgid "Confirm to delete this IP address: %s" msgstr "确认删除用户：%s" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "组名" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "上级组" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "设置" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "权限" @@ -3388,12 +2867,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "创建于" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3403,16 +2882,36 @@ msgstr[0] "确认删除这个版本库组：%s包含%s个版本库" msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "Disabled" +msgid "Visible" +msgstr "停用" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "无响应" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3421,114 +2920,108 @@ msgstr "默认" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 #, fuzzy msgid "Revoke" msgstr "移除" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 #, fuzzy msgid "Apply to children" msgstr "应用到成员" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 #, fuzzy msgid "Confirm to delete this group" msgstr "确认删除用户：%s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "首页" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "有" +#, fuzzy, python-format +#| msgid "Repository group" +msgid "Repository group %s" +msgstr "版本库组" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 #, fuzzy msgid "Repository Groups Administration" msgstr "版本库管理员" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 #, fuzzy msgid "Number of Top-level Repositories" msgstr "顶层版本库数量" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 #, fuzzy msgid "Clone remote repository" msgstr "[创建]版本库" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." msgstr "保持简短。用README文件来写更长的描述。" -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." -msgstr "可选的，选择一个组将版本库放到其中" - -#: kallithea/templates/admin/repos/repo_add_base.html:59 +msgstr "可选的选择一个组将版本库放到其中。" + +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." -msgstr "要创建的版本库类型" - -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +msgstr "要创建的版本库类型。" + +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "默认修订" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, fuzzy, python-format +#, python-format msgid "%s Creating Repository" msgstr "" @@ -3550,26 +3043,26 @@ msgid "" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, fuzzy, python-format +#, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "远程" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "统计" @@ -3579,72 +3072,70 @@ msgid "Parent" msgstr "上级组" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 #, fuzzy msgid "Manually set this repository as a fork of another from the list." msgstr "从列表中手动设置这个版本库复刻自另一版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 #, fuzzy msgid "Public Journal Visibility" msgstr "公共日志" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "从公共日志删除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 #, fuzzy msgid "Add to Public Journal" msgstr "公共日志" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 #, fuzzy msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #, fuzzy msgid "Change Locking" msgstr "启用锁定" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 #, fuzzy msgid "Confirm to unlock repository." msgstr "确认解锁版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 #, fuzzy msgid "Unlock Repository" msgstr "公共版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 #, fuzzy msgid "Confirm to lock repository." msgstr "确认锁定版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 #, fuzzy msgid "Lock Repository" msgstr "公共版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "版本库未锁定" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3652,32 +3143,32 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "确认删除版本库：%s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 #, fuzzy msgid "Delete this Repository" msgstr "[删除]版本库" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 -#, fuzzy, python-format +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3689,114 +3180,115 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "清除版本库缓存" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -#, fuzzy -msgid "Confirm to invalidate repository cache." -msgstr "确认清除版本库缓存" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 #, fuzzy msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存" -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 #, fuzzy msgid "List of Cached Values" msgstr "缓存值列表" -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "Prefix" msgstr "前缀" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "键" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "启用" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 #, fuzzy msgid "Extra fields are disabled." msgstr "禁用注册" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "私有版本库" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "[forked] repository" +msgid "Fork of repository" +msgstr "[复刻]版本库" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "[创建]版本库" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "[远程拉取]到版本库" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "确认从远程拉取修订集" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "私有版本库" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3806,35 +3298,40 @@ msgid "" "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "[创建]版本库" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "版本库" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "文件浏览、下载、whoosh和README的默认修订版本" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." -msgstr "修改这个版本库的所有者" +msgstr "修改这个版本库的所有者。" + +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3853,7 +3350,7 @@ msgstr "确认移除当前统计" msgid "Repositories Administration" msgstr "版本库管理员" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3875,7 +3372,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "钩子" @@ -3887,281 +3384,273 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "发送" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 #, fuzzy msgid "Save Settings" msgstr "保存设置" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +#, fuzzy +msgid "Custom Hooks" +msgstr "自定义钩子" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -#, fuzzy -msgid "Custom Hooks" -msgstr "自定义钩子" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "移除钩子失败" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Description" +msgid "Rescan options" +msgstr "描述" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. " -"Current hooks will be updated to the latest version." +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "重新索引" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 +msgid "Kallithea configuration file" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:9 +msgid "Python version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 #, fuzzy msgid "Git version" msgstr "编辑权限" -#: kallithea/templates/admin/settings/settings_system.html:9 +#: kallithea/templates/admin/settings/settings_system.html:12 msgid "Git path" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "网络" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "推送后显示版本库大小" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "记录用户推送命令" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "记录用户拉取命令" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "推送后更新版本库（hg update）" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 #, fuzzy msgid "Mercurial extensions" msgstr "Mercurial扩展" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 msgid "Enable hgsubversion extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 #, fuzzy msgid "Location of repositories" msgstr "创建版本库" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "通用" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4178,94 +3667,103 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +#, fuzzy +msgid "Clone URL" +msgstr "克隆地址" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "repositories" +msgid "Repository page size" +msgstr "版本库" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "图标" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "显示公共版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:84 +#: kallithea/templates/admin/settings/settings_visual.html:81 msgid "Show private repository icon on repositories" msgstr "显示私有版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:86 +#: kallithea/templates/admin/settings/settings_visual.html:84 #, fuzzy msgid "Show public/private icons next to repository names." msgstr "显示公共版本库图标" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 #, fuzzy msgid "Meta Tagging" msgstr "元标记" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4285,13 +3783,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "成员" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4300,15 +3798,15 @@ msgstr "" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "还没有成员" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "启用成员" @@ -4323,17 +3821,17 @@ msgstr "添加用户" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "用户" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "确认密码" @@ -4352,12 +3850,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4366,7 +3864,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "确认删除用户：%s" @@ -4375,24 +3873,16 @@ msgstr "确认删除用户：%s" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "确认新密码" @@ -4401,227 +3891,228 @@ msgstr "确认新密码" msgid "Users Administration" msgstr "用户管理员" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "Mercurial版本库" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "Git版本库" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 #, fuzzy msgid "Create Fork" msgstr "创建于" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "概况" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "修订记录" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "浏览" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "选项" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 #, fuzzy msgid "Compare Fork" msgstr "比较复刻" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "比较显示" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "搜索" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "" - #: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "复刻" -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "公共日志" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 #, fuzzy msgid "My Pull Requests" msgstr "拉取请求" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 #, fuzzy msgid "Login to Your Account" msgstr "登录" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:379 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "忘记密码？" -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:383 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "还没有帐号？" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "退出" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 #, fuzzy msgid "Inherit defaults" msgstr "版本库默认设置" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "创建版本库" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "复刻版本库" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "显示" @@ -4630,235 +4121,181 @@ msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "权限" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "编辑权限" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 +#: kallithea/templates/base/root.html:28 +msgid "Retry" +msgstr "" + +#: kallithea/templates/base/root.html:29 +#: kallithea/templates/changeset/changeset_file_comment.html:65 +#, fuzzy +msgid "Submitting ..." +msgstr "提交中……" + +#: kallithea/templates/base/root.html:30 +#, fuzzy +#| msgid "Enable downloads" +msgid "Unable to post" +msgstr "启用下载" + +#: kallithea/templates/base/root.html:31 #, fuzzy msgid "Add Another Comment" msgstr "%d条评论" -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 +#: kallithea/templates/base/root.html:32 msgid "Stop following this repository" msgstr "停止关注该版本库" -#: kallithea/templates/base/root.html:24 +#: kallithea/templates/base/root.html:33 msgid "Start following this repository" msgstr "开始关注该版本库" -#: kallithea/templates/base/root.html:25 +#: kallithea/templates/base/root.html:34 msgid "Group" msgstr "组" -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "成员" - -#: kallithea/templates/base/root.html:27 +#: kallithea/templates/base/root.html:35 msgid "Loading ..." msgstr "" -#: kallithea/templates/base/root.html:28 +#: kallithea/templates/base/root.html:36 msgid "loading ..." msgstr "" -#: kallithea/templates/base/root.html:29 +#: kallithea/templates/base/root.html:37 msgid "Search truncated" msgstr "" -#: kallithea/templates/base/root.html:30 +#: kallithea/templates/base/root.html:38 msgid "No matching files" msgstr "" -#: kallithea/templates/base/root.html:31 +#: kallithea/templates/base/root.html:39 #, fuzzy msgid "Open New Pull Request from {0}" msgstr "[评论]拉取请求" -#: kallithea/templates/base/root.html:32 +#: kallithea/templates/base/root.html:40 msgid "Open New Pull Request for {0} → {1}" msgstr "" -#: kallithea/templates/base/root.html:33 -#, fuzzy +#: kallithea/templates/base/root.html:41 msgid "Show Selected Changesets {0} → {1}" -msgstr "显示合并的修订集%s->%s" - -#: kallithea/templates/base/root.html:34 +msgstr "显示选中的修订集 {0} → {1}" + +#: kallithea/templates/base/root.html:42 #, fuzzy msgid "Selection Link" msgstr "选择链接" -#: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 #, fuzzy msgid "Collapse Diff" msgstr "文件差异" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:44 #, fuzzy msgid "Expand Diff" msgstr "文件差异" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:45 +#, fuzzy +msgid "No revisions" +msgstr "修订" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:48 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 -#, fuzzy +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "选择修订集" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" -msgstr "%s修订集" - -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "%s书签" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "作者" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "修订" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "%s分支" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +msgstr "指定修订集" + +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "点击以升序排列" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "点击以降序排列" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "没有找到记录。" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "数据错误。" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "载入中..." + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "%s修订记录" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "显示%d/%d个版本" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "清除选择" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 #, fuzzy msgid "Go to tip of repository" msgstr "确认锁定版本库" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 #, fuzzy msgid "Branch filter:" msgstr "过滤" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "没有任何变更" @@ -4874,7 +4311,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "" @@ -4888,129 +4325,144 @@ msgstr "" msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "通过Kallithea直接添加或者上传文件" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -#, fuzzy -msgid "Push new repository" -msgstr "推送新版本库" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" -msgstr "已有版本库？" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "此列表中首个（最旧）修订集" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "此列表中末个（最近）修订集" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "修订集在此列表中的位置" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" +"修订集状态：%s 由 %s\n" +"点击打开相关联的拉取请求 %s" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, python-format +msgid "Changeset status: %s by %s" +msgstr "修订集状态：%s 由 %s" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%d comment" +#| msgid_plural "%d comments" +msgid "%s comments" +msgstr "%d条评论" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" +msgstr "" #: kallithea/templates/changeset/changeset.html:8 #, python-format msgid "%s Changeset" -msgstr "%s修订集" - -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +msgstr "%s 修订集" + +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "修订集状态" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 #, fuzzy msgid "Merge" msgstr "合并" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 #, fuzzy msgid "Grafted from:" msgstr "创建于" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 #, fuzzy msgid "Replaced by:" msgstr "创建于" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 #, fuzzy msgid "Preceded by:" msgstr "创建于" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "修改%s个文件" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "修改%s个文件包括%s行插入和%s行删除" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 -#, fuzzy -msgid "No revisions" -msgstr "修订" +#: kallithea/templates/changeset/changeset_file_comment.html:20 +#, fuzzy +#| msgid "Comment" +msgid "comment" +msgstr "评论" #: kallithea/templates/changeset/changeset_file_comment.html:21 #, fuzzy @@ -5023,186 +4475,187 @@ msgid "No title" msgstr "无文件" #: kallithea/templates/changeset/changeset_file_comment.html:24 -#, fuzzy msgid "on this changeset" -msgstr "无修订" +msgstr "在此修订集" #: kallithea/templates/changeset/changeset_file_comment.html:30 #, fuzzy msgid "Delete comment?" msgstr "%d条评论" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 #, fuzzy msgid "Status change" msgstr "文件已更改" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "在{1}行上评论" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "评论使用%s语法并支持%s" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -#, fuzzy -msgid "Use @username inside this text to notify another user" +#: kallithea/templates/changeset/changeset_file_comment.html:87 +#, fuzzy +msgid "Comments are in plain text. Use @username to notify another user." msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -#, fuzzy -msgid "Submitting ..." -msgstr "提交中……" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:93 +msgid "Set changeset status" +msgstr "设置修订集状态" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +#, fuzzy +msgid "No change" +msgstr "无变更" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "[评论]拉取请求" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +#, fuzzy +msgid "Close" +msgstr "已关闭" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "评论" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." -msgstr "必须登录才能评论" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +msgstr "您必须登录才能评论。" + +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "现在登陆" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "隐藏" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d条评论" -#: kallithea/templates/changeset/changeset_file_comment.html:107 +#: kallithea/templates/changeset/changeset_file_comment.html:154 #, fuzzy, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "(%d内嵌)" -#: kallithea/templates/changeset/changeset_file_comment.html:108 -#, fuzzy, python-format +#: kallithea/templates/changeset/changeset_file_comment.html:155 +#, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -#, fuzzy -msgid "Use @username inside this text to notify another user." -msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -#, fuzzy -msgid "Set changeset status" -msgstr "修订集状态" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -#, fuzzy -msgid "No change" -msgstr "无变更" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -#, fuzzy -msgid "Close" -msgstr "已关闭" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" -msgstr "%s修订集" - -#: kallithea/templates/changeset/changeset_range.html:56 +msgstr "%s 修订集" + +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "修订集状态：%s" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "影响文件" -#: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:43 -msgid "Show full diff for this file" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 -msgid "Show full side-by-side diff for this file" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:38 -msgid "Show inline comments" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:86 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "文件已删除" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "未修改" + +#: kallithea/templates/changeset/diff_block.html:42 #, fuzzy msgid "Deleted" msgstr "删除" -#: kallithea/templates/changeset/diff_block.html:89 +#: kallithea/templates/changeset/diff_block.html:44 #, fuzzy msgid "Renamed" msgstr "读" -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "未知版本%s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "No filename" +msgid "No file after" +msgstr "无文件名" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "文件已添加" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:43 +msgid "Show full diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 +msgid "Show full side-by-side diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:72 +msgid "Show inline comments" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" -msgstr "无修订" - -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +msgstr "无修订集" + +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 -#, fuzzy, python-format +#: kallithea/templates/compare/compare_cs.html:55 +#, python-format msgid "%s changesets" -msgstr "%s修订集" - -#: kallithea/templates/compare/compare_cs.html:100 +msgstr "%s 修订集" + +#: kallithea/templates/compare/compare_cs.html:56 #, fuzzy msgid "behind" msgstr "重新索引" @@ -5214,129 +4667,185 @@ msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "显示%s个提交" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "公共版本库" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" -msgstr "无修订" - -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +msgstr "尚无任何修订集" + +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "订阅%s的RSS" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "订阅%s的Atom" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "%(user)s 已评论修订集在 %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "%(user)s commented on changeset %(age)s" +msgid "Comment on Changeset \"%s\"" +msgstr "%(user)s 已评论修订集在 %(age)s" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changeset" +msgid "Changeset on" +msgstr "修订集" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branch" +msgid "branch" +msgstr "分支" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "文件已更改" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "版本库未锁定" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 #, fuzzy msgid "We have received a request to reset the password for your account." msgstr "我们收到重置你用户密码的请求。" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 +#: kallithea/templates/email_templates/pull_request.html:4 #, fuzzy, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, fuzzy, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#| msgid "[commented] on pull request for" +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "[评论]拉取请求" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +msgid "Pull request" +msgstr "拉取请求#%s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, fuzzy, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -#, fuzzy -msgid "The comment closed the pull request with status" +#| msgid "%(user)s commented on pull request %(age)s" +msgid "Mention in Comment on Pull Request %s \"%s\"" msgstr "[评论]拉取请求" -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "查看用户" +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s from %s#%s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "拉取请求#%s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "[commented] on pull request for" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "[评论]拉取请求" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "组名" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5354,7 +4863,7 @@ msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "" @@ -5364,74 +4873,76 @@ msgstr "" msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "位置" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "或者" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "" +#, fuzzy +msgid "New file type" +msgstr "未知包类型" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 #, fuzzy msgid "Commit Changes" msgstr "提交修改" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "加载文件列表..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "大小" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "最后修订号" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 #, fuzzy msgid "Last Modified" msgstr "最后修改于" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 #, fuzzy msgid "Last Committer" msgstr "最后提交者" @@ -5442,7 +4953,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5455,75 +4966,81 @@ msgstr "" msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "编辑文件" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s个作者" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, fuzzy, python-format +#| msgid "Deleted branch: %s" +msgid "Edit on Branch: %s" +msgstr "已经删除分支%s" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "二进制文件（%s）" +#: kallithea/templates/files/files_source.html:69 +#, fuzzy +msgid "File is too big to display." +msgstr "文件过大，不能显示" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" -msgstr "文件过大，不能显示" +msgid "Show as raw." +msgstr "" #: kallithea/templates/files/files_ypjax.html:5 msgid "annotation" @@ -5543,50 +5060,50 @@ msgid "%s Followers" msgstr "%s个关注者" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "关注者" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" -msgstr "开始关注 - " +msgstr "开始关注 -" #: kallithea/templates/forks/fork.html:5 #, python-format msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "复刻名称" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 #, fuzzy msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "文件浏览、下载、whoosh和README的默认修订版本" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "私有" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "拷贝权限" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "从被复刻版本库拷贝权限" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "克隆后更新" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "完成克隆后检出源代码" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5596,40 +5113,40 @@ msgid "%s Forks" msgstr "%s个复刻" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "复刻" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "无复刻" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 msgid "ATOM journal feed" msgstr "订阅日志ATOM" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "订阅日志RSS" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "没有条目" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "订阅公共日志ATOM" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "订阅公共日志RSS" @@ -5639,31 +5156,36 @@ msgstr "订阅公共日志RSS" msgid "New Pull Request" msgstr "新建拉取请求" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "标题" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "修订" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "" @@ -5677,6 +5199,10 @@ msgstr "没有条目" msgid "Vote" msgstr "移除" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5700,7 +5226,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "已关闭" @@ -5728,113 +5254,106 @@ msgstr "拉取请求#%s" msgid "Pull request %s from %s#%s" msgstr "拉取请求#%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 #, fuzzy msgid "Summarize the changes" msgstr "提交修改" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "还未检视的检视人员" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "%d个检视者" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -#, fuzzy -msgid "There are no reviewers" -msgstr "没有任何分支" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 #, fuzzy msgid "on" msgstr "无" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -#, fuzzy -msgid "Update" -msgstr "[更新]用户" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 +#, fuzzy +#| msgid "Registration" +msgid "Next iteration" +msgstr "注册" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 msgid "Current revision - no change" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -#, fuzzy -msgid "Pull Request Reviewers" -msgstr "拉取请求检视人员" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 +msgid "Save Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 +#, fuzzy +msgid "Cancel Changes" +msgstr "无变更" + +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +#, fuzzy +#| msgid "%d reviewer" +#| msgid_plural "%d reviewers" +msgid "Reviewers" +msgstr "%d个检视者" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 #, fuzzy msgid "Remove reviewer" msgstr "检视者" -#: kallithea/templates/pullrequests/pullrequest_show.html:250 +#: kallithea/templates/pullrequests/pullrequest_show.html:234 msgid "Type name of reviewer to add" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:258 +#: kallithea/templates/pullrequests/pullrequest_show.html:240 #, fuzzy msgid "Potential Reviewers" msgstr "%d个检视者" -#: kallithea/templates/pullrequests/pullrequest_show.html:261 +#: kallithea/templates/pullrequests/pullrequest_show.html:243 msgid "Click to add the repository owner as reviewer:" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:284 -msgid "Save Changes" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -#, fuzzy -msgid "Save as New Pull Request" -msgstr "新建拉取请求" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 -#, fuzzy -msgid "Cancel Changes" -msgstr "无变更" - -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:268 #, fuzzy msgid "Pull Request Content" msgstr "拉取请求" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5842,7 +5361,6 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -#| msgid "Pull Requests from %s'" msgid "Pull Requests from '%s'" msgstr "拉取请求#%s" @@ -5851,37 +5369,43 @@ msgstr "拉取请求#%s" msgid "Pull Requests to '%s'" msgstr "拉取请求#%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 #, fuzzy msgid "Open New Pull Request" msgstr "新建拉取请求" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, fuzzy, python-format msgid "Show Pull Requests to %s" msgstr "拉取请求#%s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 -#, fuzzy, python-format +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 +#, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 #, fuzzy msgid "Pull Requests Created by Me" msgstr "拉取请求检视人员" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +#, fuzzy +#| msgid "Pull Request Reviewers" +msgid "Pull Requests Needing My Review" +msgstr "拉取请求检视人员" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 #, fuzzy msgid "Pull Requests I Participate In" msgstr "我参与的" @@ -5897,29 +5421,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "在所有的版本库中搜索" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "搜索短语" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "搜索范围" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "文件内容" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "提交信息" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "文件名" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "权限不足" @@ -5929,80 +5453,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " -msgstr "已收集的统计：" - -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +msgstr "已收集的统计： " + +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "文件" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "提交" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "文件已添加" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "文件已更改" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "文件已删除" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "提交" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "文件已添加" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "文件已更改" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "文件已删除" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "%s概要" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "版本库由%s锁定" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "版本库未锁定" @@ -6010,93 +5534,202 @@ msgstr "版本库未锁定" msgid "Fork of" msgstr "复刻自" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "克隆自" -#: kallithea/templates/summary/summary.html:72 -#, fuzzy -msgid "Clone URL" -msgstr "克隆地址" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "按ID显示" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" msgstr "以名字显示" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "按ID显示" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "文件趋势图" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "下载" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "无下载" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "这个版本库的下载已经禁用" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "zip打包下载" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "勾选以下载包含子版本库的压缩包" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 #, fuzzy msgid "With subrepos" msgstr "包括子版本库" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 #, fuzzy msgid "Latest Changes" msgstr "文件已更改" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:177 #, fuzzy msgid "Quick Start" msgstr "快速入门" -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "通过Kallithea直接添加或者上传文件" + +#: kallithea/templates/summary/summary.html:196 +#, fuzzy +msgid "Push new repository" +msgstr "推送新版本库" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "已有版本库？" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "下载%s为%s包" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "%s标签" - -#: kallithea/templates/tags/tags.html:26 -#, fuzzy -msgid "Compare Tags" -msgstr "比较标签" - -#~ msgid "increase diff context to %(num)s lines" -#~ msgstr "" +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "没有索引用于搜索。请运行whoosh索引器" + +#~ msgid "%(user)s commented on changeset %(age)s" +#~ msgstr "%(user)s 已评论修订集在 %(age)s" + +#, fuzzy +#~ msgid "%(user)s opened new pull request %(age)s" +#~ msgstr "成功提交拉取请求" + +#, fuzzy +#~ msgid "%(user)s commented on pull request %(age)s" +#~ msgstr "[评论]拉取请求" + +#~ msgid "%(user)s commented on changeset at %(when)s" +#~ msgstr "%(user)s 已评论修订集于 %(when)s" + +#, fuzzy +#~| msgid "Repository group" +#~ msgid "Repository Group" +#~ msgstr "版本库组" + +#~ msgid "My Notifications" +#~ msgstr "我的通知" + +#~ msgid "All" +#~ msgstr "全部" + +#~ msgid "Comments" +#~ msgstr "评论" + +#, fuzzy +#~ msgid "Mark All Read" +#~ msgstr "全部标记为已读" + +#, fuzzy +#~| msgid "Mark All Read" +#~ msgid "Mark as read" +#~ msgstr "全部标记为已读" + +#~ msgid "No notifications here yet" +#~ msgstr "无通知" + +#, fuzzy +#~ msgid "Show Notification" +#~ msgstr "显示通知" + +#~ msgid "Notifications" +#~ msgstr "通知" + +#~ msgid "Home" +#~ msgstr "首页" + +#~ msgid "with" +#~ msgstr "有" + +#~ msgid "members" +#~ msgstr "成员" + +#~ msgid "Changeset has comments" +#~ msgstr "修订集有评论" + +#~ msgid "Author" +#~ msgstr "作者" + +#, fuzzy +#~ msgid "Commenting on line." +#~ msgstr "在{1}行上评论" + +#, fuzzy +#~| msgid "on pull request" +#~ msgid "Pull request from" +#~ msgstr "[评论]拉取请求" + +#, fuzzy +#~| msgid "Date" +#~ msgid "at" +#~ msgstr "日期" + +#~ msgid "Still not reviewed by" +#~ msgstr "还未检视的检视人员" + +#, fuzzy +#~ msgid "There are no reviewers" +#~ msgstr "没有任何分支" + +#, fuzzy +#~ msgid "Pull Request Reviewers" +#~ msgstr "拉取请求检视人员" + +#~ msgid "Dashboard" +#~ msgstr "控制面板" + +#~ msgid "Remember me" +#~ msgstr "记住密码" + +#~ msgid "Change your avatar at" +#~ msgstr "修改你的头像" + +#~ msgid "Using" +#~ msgstr "使用" + +#~ msgid "Web" +#~ msgstr "网络" + +#~ msgid "quick filter..." +#~ msgstr "快速过滤..." + +#~ msgid "Forgot password ?" +#~ msgstr "忘记密码？" + +#, fuzzy +#~ msgid "The comment closed the pull request with status" +#~ msgstr "[评论]拉取请求" + +#~ msgid "View this user here" +#~ msgstr "查看用户" #~ msgid "No comments." #~ msgstr "%d条评论" @@ -6107,27 +5740,6 @@ msgstr "比较标签" #~ msgid "journal" #~ msgstr "日志" -#~ msgid "bad captcha" -#~ msgstr "" - -#~ msgid "forever" -#~ msgstr "" - -#~ msgid "unmodified" -#~ msgstr "" - -#~ msgid "Locked repository" -#~ msgstr "" - -#~ msgid "Unlocked repository" -#~ msgstr "" - -#~ msgid "Unlocked" -#~ msgstr "" - -#~ msgid "Locked" -#~ msgstr "" - #~ msgid "Repository has been %s" #~ msgstr "版本库已被%s" @@ -6137,12 +5749,6 @@ msgstr "比较标签" #~ msgid "No Files" #~ msgstr "没有文件" -#~ msgid "" -#~ msgstr "" - -#~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -#~ msgstr "" - #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "不允许用户名 \"%(username)s\"" @@ -6155,72 +5761,29 @@ msgstr "比较标签" #~ msgid "invalid clone URL" #~ msgstr "无效的克隆地址" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +#~ msgid "" +#~ "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" #~ msgstr "无效的克隆地址，提供一个有效的克隆 http(s)或svn+http(s)地址" -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" +#~ msgid "" +#~ "Revisions %(revs)s are already part of pull request or have set status" #~ msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态" #~ msgid "Defaults" #~ msgstr "默认设置" -#~ msgid "never" -#~ msgstr "" - -#~ msgid "My Emails" -#~ msgstr "" - #~ msgid "Watched" #~ msgstr "关注的" #~ msgid "My Permissions" #~ msgstr "我的权限" -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "Confirm to reset this api key: %s" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "Confirm to remove this api key: %s" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - #~ msgid "delete" #~ msgstr "删除" -#~ msgid "current IP" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "权限管理" -#~ msgid "Overview" -#~ msgstr "" - -#~ msgid "Overwrite existing settings" -#~ msgstr "" - -#~ msgid "Default IP Whitelist for All Users" -#~ msgstr "" - -#~ msgid "Confirm to delete this ip: %s" -#~ msgstr "" - #~ msgid "Default User Permissions Overview" #~ msgstr "默认权限" @@ -6236,15 +5799,6 @@ msgstr "比较标签" #~ msgid "admin" #~ msgstr "管理" -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - #~ msgid "Optional URL from which repository should be cloned." #~ msgstr "可选的，指定版本库应该从哪个http[s]地址克隆。" @@ -6254,138 +5808,146 @@ msgstr "比较标签" #~ msgid "Pull Changes from Remote Location" #~ msgstr "从远程路径拉取修订集" -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - -#~ msgid "Non-changeable id" -#~ msgstr "" - #~ msgid "edit" #~ msgstr "编辑" -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - -#~ msgid "Destroy old data" -#~ msgstr "" - -#~ msgid "check for updates" -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "默认权限" -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - #~ msgid "Status change from pull request" #~ msgstr "状态修改为%s" -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - #~ msgid "Mimetype" #~ msgstr "MIME类型" #~ msgid "My Repos" #~ msgstr "我的版本库" -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "%s Pull Request #%s" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - #~ msgid "owner" #~ msgstr "所有者" -#~ msgid "Your new password" -#~ msgstr "" - -#~ msgid "Your new Kallithea password:%s" -#~ msgstr "" - #~ msgid "Open New Pull Request for Selected Changesets" #~ msgstr "为选择的变更集创建新的拉取请求" -#~ msgid "Show Selected Changesets __S → __E" -#~ msgstr "" - #~ msgid "You can generate it by clicking following URL" #~ msgstr "点击下面的链接以重新生成密码：" -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - #~ msgid "Created by" #~ msgstr "创建于" -#~ msgid "You can only delete files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "You can only edit files with revision being a valid branch " -#~ msgstr "" - +#~ msgid "Closed, replaced by %s ." +#~ msgstr "已关闭，被 %s 替换。" + +#~ msgid "Closing." +#~ msgstr "关闭。" + +#~ msgid "Changeset not found" +#~ msgstr "未找到修订集" + +#~ msgid "Repository no access" +#~ msgstr "无版本库访问权限" + +#~ msgid "Repository read access" +#~ msgstr "版本库读取权限" + +#~ msgid "Repository write access" +#~ msgstr "版本库写入权限" + +#~ msgid "Repository admin access" +#~ msgstr "版本库管理权限" + +#~ msgid "Repository Group no access" +#~ msgstr "无版本库组访问权限" + +#~ msgid "Repository Group read access" +#~ msgstr "版本库组读取权限" + +#~ msgid "Repository Group write access" +#~ msgstr "版本库组写入" + +#~ msgid "Repository Group admin access" +#~ msgstr "版本库组管理权限" + +#~ msgid "Repository creation disabled" +#~ msgstr "禁用创建版本库" + +#~ msgid "Repository creation enabled" +#~ msgstr "允许创建版本库" + +#~ msgid "Repository forking disabled" +#~ msgstr "禁用复刻版本库" + +#~ msgid "Repository forking enabled" +#~ msgstr "允许复刻版本库" + +#~ msgid "Register disabled" +#~ msgstr "禁用注册" + +#~ msgid "Register new user with Kallithea with manual activation" +#~ msgstr "用手动激活注册新用户" + +#~ msgid "Register new user with Kallithea with auto activation" +#~ msgstr "用自动激活注册新用户" + +#~ msgid "Not Reviewed" +#~ msgstr "未检视" + +#~ msgid "Rejected" +#~ msgstr "驳回" + +#~ msgid "Under Review" +#~ msgstr "检视中" + +#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" +#~ msgstr "[评论]拉取请求" + +#~ msgid "There are no branches yet" +#~ msgstr "没有任何分支" + +#~ msgid "There are no tags yet" +#~ msgstr "没有任何标签" + +#~ msgid "There are no bookmarks yet" +#~ msgstr "无书签" + +#~ msgid "%s Bookmarks" +#~ msgstr "%s书签" + +#~ msgid "%s Branches" +#~ msgstr "%s分支" + +#~ msgid "Editing file" +#~ msgstr "编辑文件" + +#~ msgid "Update" +#~ msgstr "[更新]用户" + +#~ msgid "Save Updates as New Pull Request" +#~ msgstr "新建拉取请求" + +#~ msgid "%s Tags" +#~ msgstr "%s标签" + +#~ msgid "Compare Tags" +#~ msgstr "比较标签" + +#~ msgid "Confirm to invalidate repository cache." +#~ msgstr "确认清除版本库缓存" + +#~ msgid "Commenting on line {1}." +#~ msgstr "在{1}行上评论" + +#~ msgid "Comments parsed using %s syntax with %s support." +#~ msgstr "评论使用%s语法并支持%s" + +#~ msgid "Use @username inside this text to notify another user" +#~ msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" + +#~ msgid "Use @username inside this text to notify another user." +#~ msgstr "在文本中使用 @用户名 以发送通知到该Kallithea用户" + +#~ msgid "File is too big to display" +#~ msgstr "文件过大，不能显示" + +#~ msgid "Save as New Pull Request" +#~ msgstr "新建拉取请求" diff --git a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po --- a/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po +++ b/kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po @@ -7,454 +7,469 @@ msgid "" msgstr "" "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" -"POT-Creation-Date: 2017-07-25 16:37+0200\n" +"POT-Creation-Date: 2019-03-26 22:07+0100\n" "PO-Revision-Date: 2017-03-10 18:26+0000\n" "Last-Translator: mao \n" -"Language-Team: Chinese (Traditional) " -"\n" +"Language-Team: Chinese (Traditional) \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 2.12\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:238 kallithea/lib/base.py:512 +"Generated-By: Babel 1.3\n" + +#: kallithea/controllers/changelog.py:67 +#: kallithea/controllers/pullrequests.py:252 kallithea/lib/base.py:605 msgid "There are no changesets yet" msgstr "" -#: kallithea/controllers/changelog.py:165 -#: kallithea/controllers/admin/permissions.py:61 -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/changelog.py:136 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 msgid "None" msgstr "無" -#: kallithea/controllers/changelog.py:168 kallithea/controllers/files.py:196 +#: kallithea/controllers/changelog.py:139 kallithea/controllers/files.py:197 msgid "(closed)" msgstr "（已關閉）" -#: kallithea/controllers/changeset.py:89 +#: kallithea/controllers/changeset.py:83 msgid "Show whitespace" msgstr "顯示空格" -#: kallithea/controllers/changeset.py:96 kallithea/controllers/changeset.py:103 +#: kallithea/controllers/changeset.py:90 +#: kallithea/controllers/changeset.py:97 #: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "忽略空格" -#: kallithea/controllers/changeset.py:169 +#: kallithea/controllers/changeset.py:163 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "增加 diff 上下文至 %(num)s 行" -#: kallithea/controllers/changeset.py:212 kallithea/controllers/files.py:96 -#: kallithea/controllers/files.py:116 kallithea/controllers/files.py:742 +#: kallithea/controllers/changeset.py:203 +#, fuzzy +msgid "No permission to change status" +msgstr "尚未有任何變更" + +#: kallithea/controllers/changeset.py:214 +#, fuzzy, python-format +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 msgid "Such revision does not exist for this repository" msgstr "" -#: kallithea/controllers/changeset.py:383 -msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" - -#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 -msgid "Select changeset" -msgstr "" - -#: kallithea/controllers/compare.py:261 +#: kallithea/controllers/compare.py:66 +#, fuzzy, python-format +#| msgid "Go to tip of repository" +msgid "Could not find other repository %s" +msgstr "Git 版本庫" + +#: kallithea/controllers/compare.py:72 +msgid "Cannot compare repositories of different types" +msgstr "" + +#: kallithea/controllers/compare.py:244 +msgid "Cannot show empty diff" +msgstr "" + +#: kallithea/controllers/compare.py:246 +msgid "No ancestor found for merge diff" +msgstr "" + +#: kallithea/controllers/compare.py:250 +msgid "Multiple merge ancestors found for merge compare" +msgstr "" + +#: kallithea/controllers/compare.py:266 msgid "Cannot compare repositories without using common ancestor" msgstr "" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:70 msgid "No response" msgstr "未回應" -#: kallithea/controllers/error.py:72 +#: kallithea/controllers/error.py:71 msgid "Unknown error" msgstr "" -#: kallithea/controllers/error.py:100 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" - -#: kallithea/controllers/error.py:103 +#: kallithea/controllers/error.py:84 +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "" + +#: kallithea/controllers/error.py:87 msgid "Unauthorized access to resource" msgstr "" -#: kallithea/controllers/error.py:105 +#: kallithea/controllers/error.py:89 msgid "You don't have permission to view this page" msgstr "您沒有權限瀏覽這個頁面" -#: kallithea/controllers/error.py:107 +#: kallithea/controllers/error.py:91 msgid "The resource could not be found" msgstr "找不到這個資源" -#: kallithea/controllers/error.py:109 +#: kallithea/controllers/error.py:93 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." msgstr "" -#: kallithea/controllers/feed.py:55 -#, python-format -msgid "Changes on %s repository" -msgstr "修改於版本庫 %s" - -#: kallithea/controllers/feed.py:56 -#, python-format -msgid "%s %s feed" -msgstr "" - -#: kallithea/controllers/feed.py:87 -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 -msgid "Changeset was too big and was cut off..." -msgstr "" - -#: kallithea/controllers/feed.py:91 +#: kallithea/controllers/feed.py:63 #, python-format msgid "%s committed on %s" msgstr "%s 評論於 %s" -#: kallithea/controllers/files.py:91 -msgid "Click here to add new file" -msgstr "" +#: kallithea/controllers/feed.py:88 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/compare/compare_diff.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 +msgid "Changeset was too big and was cut off..." +msgstr "" + +#: kallithea/controllers/feed.py:111 kallithea/controllers/feed.py:143 +#, python-format +msgid "%s %s feed" +msgstr "" + +#: kallithea/controllers/feed.py:113 kallithea/controllers/feed.py:145 +#, python-format +msgid "Changes on %s repository" +msgstr "修改於版本庫 %s" #: kallithea/controllers/files.py:92 +msgid "Click here to add new file" +msgstr "" + +#: kallithea/controllers/files.py:93 #, python-format msgid "There are no files yet. %s" msgstr "" -#: kallithea/controllers/files.py:193 +#: kallithea/controllers/files.py:194 #, python-format msgid "%s at %s" msgstr "" -#: kallithea/controllers/files.py:305 kallithea/controllers/files.py:365 -#: kallithea/controllers/files.py:432 +#: kallithea/controllers/files.py:300 kallithea/controllers/files.py:360 +#: kallithea/controllers/files.py:427 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: kallithea/controllers/files.py:317 +#: kallithea/controllers/files.py:312 msgid "You can only delete files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:328 +#: kallithea/controllers/files.py:323 #, python-format msgid "Deleted file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:350 +#: kallithea/controllers/files.py:345 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: kallithea/controllers/files.py:354 kallithea/controllers/files.py:420 -#: kallithea/controllers/files.py:501 +#: kallithea/controllers/files.py:349 kallithea/controllers/files.py:415 +#: kallithea/controllers/files.py:496 msgid "Error occurred during commit" msgstr "" -#: kallithea/controllers/files.py:377 +#: kallithea/controllers/files.py:372 msgid "You can only edit files with revision being a valid branch" msgstr "" -#: kallithea/controllers/files.py:391 +#: kallithea/controllers/files.py:386 #, python-format msgid "Edited file %s via Kallithea" msgstr "" -#: kallithea/controllers/files.py:407 +#: kallithea/controllers/files.py:402 msgid "No changes" msgstr "沒有修改" -#: kallithea/controllers/files.py:416 kallithea/controllers/files.py:490 +#: kallithea/controllers/files.py:411 kallithea/controllers/files.py:485 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: kallithea/controllers/files.py:443 +#: kallithea/controllers/files.py:438 msgid "Added file via Kallithea" msgstr "" -#: kallithea/controllers/files.py:464 +#: kallithea/controllers/files.py:459 msgid "No content" msgstr "" -#: kallithea/controllers/files.py:468 +#: kallithea/controllers/files.py:463 msgid "No filename" msgstr "" -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:488 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: kallithea/controllers/files.py:526 +#: kallithea/controllers/files.py:520 msgid "Downloads disabled" msgstr "" -#: kallithea/controllers/files.py:537 +#: kallithea/controllers/files.py:531 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: kallithea/controllers/files.py:539 +#: kallithea/controllers/files.py:533 msgid "Empty repository" msgstr "空的版本庫" -#: kallithea/controllers/files.py:541 +#: kallithea/controllers/files.py:535 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: kallithea/controllers/files.py:771 +#: kallithea/controllers/files.py:756 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/pullrequests/pullrequest.html:97 +#: kallithea/templates/email_templates/pull_request.html:64 +#: kallithea/templates/pullrequests/pullrequest.html:84 msgid "Changesets" msgstr "變更" -#: kallithea/controllers/files.py:772 kallithea/controllers/pullrequests.py:176 -#: kallithea/model/scm.py:820 kallithea/templates/switch_to_list.html:3 -#: kallithea/templates/branches/branches.html:10 +#: kallithea/controllers/files.py:757 +#: kallithea/controllers/pullrequests.py:184 kallithea/model/scm.py:706 msgid "Branches" msgstr "分支" -#: kallithea/controllers/files.py:773 kallithea/controllers/pullrequests.py:177 -#: kallithea/model/scm.py:831 kallithea/templates/switch_to_list.html:25 -#: kallithea/templates/tags/tags.html:10 +#: kallithea/controllers/files.py:758 +#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:717 msgid "Tags" msgstr "標籤" -#: kallithea/controllers/forks.py:186 +#: kallithea/controllers/forks.py:174 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: kallithea/controllers/home.py:84 +#: kallithea/controllers/home.py:78 msgid "Groups" msgstr "" -#: kallithea/controllers/home.py:89 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 +#: kallithea/controllers/home.py:88 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 -#: kallithea/templates/base/base.html:124 -#: kallithea/templates/base/base.html:390 -#: kallithea/templates/base/base.html:562 +#: kallithea/templates/base/base.html:56 +#: kallithea/templates/base/base.html:73 +#: kallithea/templates/base/base.html:444 kallithea/templates/index.html:5 msgid "Repositories" msgstr "版本庫" -#: kallithea/controllers/home.py:130 +#: kallithea/controllers/home.py:121 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 msgid "Branch" msgstr "" -#: kallithea/controllers/home.py:136 +#: kallithea/controllers/home.py:127 +msgid "Closed Branches" +msgstr "" + +#: kallithea/controllers/home.py:133 msgid "Tag" msgstr "" -#: kallithea/controllers/home.py:142 +#: kallithea/controllers/home.py:139 msgid "Bookmark" msgstr "" -#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 +#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 #: kallithea/templates/journal/public_journal.html:4 -#: kallithea/templates/journal/public_journal.html:21 +#: kallithea/templates/journal/public_journal.html:18 msgid "Public Journal" msgstr "開放日誌" -#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 -#: kallithea/templates/base/base.html:222 -#: kallithea/templates/journal/journal.html:4 -#: kallithea/templates/journal/journal.html:12 +#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 +#: kallithea/templates/base/base.html:297 +#: kallithea/templates/journal/journal.html:5 +#: kallithea/templates/journal/journal.html:13 msgid "Journal" msgstr "日誌" -#: kallithea/controllers/login.py:146 kallithea/controllers/login.py:192 +#: kallithea/controllers/login.py:139 kallithea/controllers/login.py:184 msgid "Bad captcha" msgstr "" -#: kallithea/controllers/login.py:152 -msgid "You have successfully registered into Kallithea" -msgstr "" - -#: kallithea/controllers/login.py:197 +#: kallithea/controllers/login.py:145 +#, python-format +msgid "You have successfully registered with %s" +msgstr "" + +#: kallithea/controllers/login.py:189 msgid "A password reset confirmation code has been sent" msgstr "密碼重設的確認碼已寄出" -#: kallithea/controllers/login.py:246 +#: kallithea/controllers/login.py:238 msgid "Invalid password reset token" msgstr "無效的密碼重設確認碼" -#: kallithea/controllers/login.py:251 -#: kallithea/controllers/admin/my_account.py:167 +#: kallithea/controllers/admin/my_account.py:155 +#: kallithea/controllers/login.py:243 msgid "Successfully updated password" msgstr "" -#: kallithea/controllers/pullrequests.py:124 -#, python-format -msgid "%s (closed)" -msgstr "" - -#: kallithea/controllers/pullrequests.py:152 -#: kallithea/templates/changeset/changeset.html:12 -#: kallithea/templates/email_templates/changeset_comment.html:17 -msgid "Changeset" -msgstr "" - -#: kallithea/controllers/pullrequests.py:173 -msgid "Special" -msgstr "" - -#: kallithea/controllers/pullrequests.py:174 -msgid "Peer branches" -msgstr "" - -#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:826 -#: kallithea/templates/switch_to_list.html:38 -#: kallithea/templates/bookmarks/bookmarks.html:10 -msgid "Bookmarks" -msgstr "" - -#: kallithea/controllers/pullrequests.py:310 -#, python-format -msgid "Error creating pull request: %s" -msgstr "" - -#: kallithea/controllers/pullrequests.py:356 -#: kallithea/controllers/pullrequests.py:503 -msgid "No description" -msgstr "無描述" - -#: kallithea/controllers/pullrequests.py:363 -msgid "Successfully opened new pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:366 -#: kallithea/controllers/pullrequests.py:453 -#: kallithea/controllers/pullrequests.py:510 +#: kallithea/controllers/pullrequests.py:71 #, python-format msgid "Invalid reviewer \"%s\" specified" msgstr "" -#: kallithea/controllers/pullrequests.py:369 -#: kallithea/controllers/pullrequests.py:456 +#: kallithea/controllers/pullrequests.py:133 +#, python-format +msgid "%s (closed)" +msgstr "" + +#: kallithea/controllers/pullrequests.py:160 +#: kallithea/templates/changeset/changeset.html:12 +msgid "Changeset" +msgstr "" + +#: kallithea/controllers/pullrequests.py:181 +msgid "Special" +msgstr "" + +#: kallithea/controllers/pullrequests.py:182 +msgid "Peer branches" +msgstr "" + +#: kallithea/controllers/pullrequests.py:183 kallithea/model/scm.py:712 +msgid "Bookmarks" +msgstr "" + +#: kallithea/controllers/pullrequests.py:320 +#, python-format +msgid "Error creating pull request: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:347 +#: kallithea/controllers/pullrequests.py:370 msgid "Error occurred while creating pull request" msgstr "" -#: kallithea/controllers/pullrequests.py:401 -msgid "Missing changesets since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:408 -#, python-format -msgid "New changesets on %s %s since the previous pull request:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:415 -msgid "Ancestor didn't change - show diff since previous version:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:422 +#: kallithea/controllers/pullrequests.py:352 +msgid "Successfully opened new pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:375 +msgid "New pull request iteration created" +msgstr "" + +#: kallithea/controllers/pullrequests.py:403 +#, python-format +msgid "Meanwhile, the following reviewers have been added: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:407 +#, python-format +msgid "Meanwhile, the following reviewers have been removed: %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:423 +#: kallithea/model/pull_request.py:234 +msgid "No description" +msgstr "無描述" + +#: kallithea/controllers/pullrequests.py:432 +msgid "Pull request updated" +msgstr "" + +#: kallithea/controllers/pullrequests.py:445 +msgid "Successfully deleted pull request" +msgstr "" + +#: kallithea/controllers/pullrequests.py:481 +#, python-format +msgid "Revision %s not found in %s" +msgstr "" + +#: kallithea/controllers/pullrequests.py:508 +#, python-format +msgid "Error: changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:522 +#, python-format +msgid "This pull request has already been merged to %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:524 +msgid "This pull request has been closed and can not be updated." +msgstr "" + +#: kallithea/controllers/pullrequests.py:543 +#, python-format +msgid "The following additional changes are available on %s:" +msgstr "" + +#: kallithea/controllers/pullrequests.py:545 +#: kallithea/controllers/pullrequests.py:549 +msgid "No additional changesets found for iterating on this pull request." +msgstr "" + +#: kallithea/controllers/pullrequests.py:557 +#, python-format +msgid "Note: Branch %s has another head: %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:564 +msgid "Git pull requests don't support iterating yet." +msgstr "" + +#: kallithea/controllers/pullrequests.py:566 #, python-format msgid "" -"This pull request is based on another %s revision and there is no simple " -"diff." -msgstr "" - -#: kallithea/controllers/pullrequests.py:424 -#, python-format -msgid "No changes found on %s %s since previous version." -msgstr "" - -#: kallithea/controllers/pullrequests.py:462 -#, python-format -msgid "Closed, replaced by %s ." -msgstr "" - -#: kallithea/controllers/pullrequests.py:470 -msgid "Pull request update created" -msgstr "" - -#: kallithea/controllers/pullrequests.py:514 -msgid "Pull request updated" -msgstr "" - -#: kallithea/controllers/pullrequests.py:529 -msgid "Successfully deleted pull request" -msgstr "" - -#: kallithea/controllers/pullrequests.py:595 -#, python-format -msgid "This pull request has already been merged to %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:597 -msgid "This pull request has been closed and can not be updated." -msgstr "" - -#: kallithea/controllers/pullrequests.py:615 -#, python-format -msgid "This pull request can be updated with changes on %s:" -msgstr "" - -#: kallithea/controllers/pullrequests.py:619 -msgid "No changesets found for updating this pull request." -msgstr "" - -#: kallithea/controllers/pullrequests.py:627 -#, python-format -msgid "Note: Branch %s has another head: %s." -msgstr "" - -#: kallithea/controllers/pullrequests.py:633 -msgid "Git pull requests don't support updates yet." -msgstr "" - -#: kallithea/controllers/pullrequests.py:724 -msgid "No permission to change pull request status" -msgstr "" - -#: kallithea/controllers/pullrequests.py:729 -msgid "Closing." -msgstr "關閉中。" - -#: kallithea/controllers/search.py:135 +"Error: some changesets not found when displaying pull request from %s." +msgstr "" + +#: kallithea/controllers/pullrequests.py:590 +msgid "The diff can't be shown - the PR revisions could not be found." +msgstr "" + +#: kallithea/controllers/search.py:136 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元。" #: kallithea/controllers/search.py:140 -msgid "There is no index to search in. Please run whoosh indexer" -msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" - -#: kallithea/controllers/search.py:144 +msgid "The server has no search index." +msgstr "" + +#: kallithea/controllers/search.py:143 msgid "An error occurred during search operation." msgstr "" -#: kallithea/controllers/summary.py:180 -#: kallithea/templates/summary/summary.html:384 +#: kallithea/controllers/summary.py:179 +#: kallithea/templates/summary/summary.html:395 msgid "No data ready yet" msgstr "" -#: kallithea/controllers/summary.py:183 -#: kallithea/templates/summary/summary.html:98 +#: kallithea/controllers/summary.py:182 +#: kallithea/templates/summary/summary.html:89 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" @@ -466,149 +481,151 @@ msgstr "" msgid "error occurred during update of auth settings" msgstr "" -#: kallithea/controllers/admin/defaults.py:97 +#: kallithea/controllers/admin/defaults.py:75 msgid "Default settings updated successfully" msgstr "" -#: kallithea/controllers/admin/defaults.py:112 +#: kallithea/controllers/admin/defaults.py:90 msgid "Error occurred during update of defaults" msgstr "" +#: kallithea/controllers/admin/gists.py:58 +#: kallithea/controllers/admin/my_account.py:230 +#: kallithea/controllers/admin/users.py:248 +msgid "Forever" +msgstr "" + #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:243 -#: kallithea/controllers/admin/users.py:285 -msgid "Forever" +#: kallithea/controllers/admin/my_account.py:231 +#: kallithea/controllers/admin/users.py:249 +msgid "5 minutes" msgstr "" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:244 -#: kallithea/controllers/admin/users.py:286 -msgid "5 minutes" +#: kallithea/controllers/admin/my_account.py:232 +#: kallithea/controllers/admin/users.py:250 +msgid "1 hour" msgstr "" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:245 -#: kallithea/controllers/admin/users.py:287 -msgid "1 hour" +#: kallithea/controllers/admin/my_account.py:233 +#: kallithea/controllers/admin/users.py:251 +msgid "1 day" msgstr "" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:246 -#: kallithea/controllers/admin/users.py:288 -msgid "1 day" -msgstr "" - -#: kallithea/controllers/admin/gists.py:63 -#: kallithea/controllers/admin/my_account.py:247 -#: kallithea/controllers/admin/users.py:289 +#: kallithea/controllers/admin/my_account.py:234 +#: kallithea/controllers/admin/users.py:252 msgid "1 month" msgstr "" -#: kallithea/controllers/admin/gists.py:67 -#: kallithea/controllers/admin/my_account.py:249 -#: kallithea/controllers/admin/users.py:291 +#: kallithea/controllers/admin/gists.py:66 +#: kallithea/controllers/admin/my_account.py:236 +#: kallithea/controllers/admin/users.py:254 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 +#: kallithea/templates/admin/users/user_edit_api_keys.html:65 msgid "Lifetime" msgstr "" -#: kallithea/controllers/admin/gists.py:146 +#: kallithea/controllers/admin/gists.py:140 msgid "Error occurred during gist creation" msgstr "" -#: kallithea/controllers/admin/gists.py:184 +#: kallithea/controllers/admin/gists.py:156 #, python-format msgid "Deleted gist %s" msgstr "" +#: kallithea/controllers/admin/gists.py:196 +msgid "Unmodified" +msgstr "未修改" + +#: kallithea/controllers/admin/gists.py:225 +msgid "Successfully updated gist content" +msgstr "" + +#: kallithea/controllers/admin/gists.py:230 +msgid "Successfully updated gist data" +msgstr "" + #: kallithea/controllers/admin/gists.py:233 -msgid "Unmodified" -msgstr "未修改" - -#: kallithea/controllers/admin/gists.py:262 -msgid "Successfully updated gist content" -msgstr "" - -#: kallithea/controllers/admin/gists.py:267 -msgid "Successfully updated gist data" -msgstr "" - -#: kallithea/controllers/admin/gists.py:270 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 -#: kallithea/model/user.py:237 +#: kallithea/controllers/admin/my_account.py:68 kallithea/model/user.py:214 +#: kallithea/model/user.py:235 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: kallithea/controllers/admin/my_account.py:129 +#: kallithea/controllers/admin/my_account.py:117 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: kallithea/controllers/admin/my_account.py:144 -#: kallithea/controllers/admin/users.py:202 +#: kallithea/controllers/admin/my_account.py:132 +#: kallithea/controllers/admin/users.py:181 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: kallithea/controllers/admin/my_account.py:178 +#: kallithea/controllers/admin/my_account.py:166 msgid "Error occurred during update of user password" msgstr "" -#: kallithea/controllers/admin/my_account.py:220 -#: kallithea/controllers/admin/users.py:415 +#: kallithea/controllers/admin/my_account.py:207 +#: kallithea/controllers/admin/users.py:369 #, python-format msgid "Added email %s to user" msgstr "" -#: kallithea/controllers/admin/my_account.py:226 -#: kallithea/controllers/admin/users.py:421 +#: kallithea/controllers/admin/my_account.py:213 +#: kallithea/controllers/admin/users.py:375 msgid "An error occurred during email saving" msgstr "" -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:433 +#: kallithea/controllers/admin/my_account.py:222 +#: kallithea/controllers/admin/users.py:385 msgid "Removed email from user" msgstr "" +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:271 +msgid "API key successfully created" +msgstr "" + +#: kallithea/controllers/admin/my_account.py:255 +#: kallithea/controllers/admin/users.py:281 +msgid "API key successfully reset" +msgstr "" + #: kallithea/controllers/admin/my_account.py:259 -#: kallithea/controllers/admin/users.py:308 -msgid "API key successfully created" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:271 -#: kallithea/controllers/admin/users.py:321 -msgid "API key successfully reset" -msgstr "" - -#: kallithea/controllers/admin/my_account.py:275 -#: kallithea/controllers/admin/users.py:325 +#: kallithea/controllers/admin/users.py:285 msgid "API key successfully deleted" msgstr "" -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:63 +#: kallithea/controllers/admin/permissions.py:67 +#: kallithea/controllers/admin/permissions.py:71 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 #: kallithea/templates/base/perms_summary.html:15 msgid "Read" msgstr "讀" -#: kallithea/controllers/admin/permissions.py:63 -#: kallithea/controllers/admin/permissions.py:67 -#: kallithea/controllers/admin/permissions.py:71 +#: kallithea/controllers/admin/permissions.py:64 +#: kallithea/controllers/admin/permissions.py:68 +#: kallithea/controllers/admin/permissions.py:72 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 #: kallithea/templates/base/perms_summary.html:16 msgid "Write" msgstr "寫" -#: kallithea/controllers/admin/permissions.py:64 -#: kallithea/controllers/admin/permissions.py:68 -#: kallithea/controllers/admin/permissions.py:72 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 +#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -616,621 +633,618 @@ msgstr "寫" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 -#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:9 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:105 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/admin/users/users.html:55 -#: kallithea/templates/base/base.html:252 -#: kallithea/templates/base/base.html:253 -#: kallithea/templates/base/base.html:259 -#: kallithea/templates/base/base.html:260 +#: kallithea/templates/admin/users/user_edit_profile.html:81 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/admin/users/users.html:43 +#: kallithea/templates/base/base.html:327 +#: kallithea/templates/base/base.html:328 +#: kallithea/templates/base/base.html:334 +#: kallithea/templates/base/base.html:335 #: kallithea/templates/base/perms_summary.html:17 msgid "Admin" msgstr "管理" -#: kallithea/controllers/admin/permissions.py:75 -#: kallithea/controllers/admin/permissions.py:86 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:94 -#: kallithea/controllers/admin/permissions.py:97 -#: kallithea/controllers/admin/permissions.py:100 -#: kallithea/templates/admin/auth/auth_settings.html:40 -msgid "Disabled" -msgstr "停用" - -#: kallithea/controllers/admin/permissions.py:77 -msgid "Allowed with manual account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:79 -msgid "Allowed with automatic account activation" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:82 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1702 -msgid "Manual activation of external account" -msgstr "" - -#: kallithea/controllers/admin/permissions.py:83 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1703 -msgid "Automatic activation of external account" -msgstr "" - +#: kallithea/controllers/admin/permissions.py:76 #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:90 +#: kallithea/controllers/admin/permissions.py:92 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:40 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:50 +msgid "Disabled" +msgstr "停用" + +#: kallithea/controllers/admin/permissions.py:78 +msgid "Allowed with manual account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:80 +msgid "Allowed with automatic account activation" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1739 +msgid "Manual activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1740 +msgid "Automatic activation of external account" +msgstr "" + +#: kallithea/controllers/admin/permissions.py:88 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:96 +#: kallithea/controllers/admin/permissions.py:99 +#: kallithea/controllers/admin/permissions.py:102 +#: kallithea/templates/admin/auth/auth_settings.html:42 +#: kallithea/templates/base/root.html:49 msgid "Enabled" msgstr "啟用" -#: kallithea/controllers/admin/permissions.py:124 +#: kallithea/controllers/admin/permissions.py:125 msgid "Global permissions updated successfully" msgstr "" -#: kallithea/controllers/admin/permissions.py:139 +#: kallithea/controllers/admin/permissions.py:140 msgid "Error occurred during update of permissions" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:188 +#: kallithea/controllers/admin/repo_groups.py:174 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:193 +#: kallithea/controllers/admin/repo_groups.py:179 #, python-format msgid "Created repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:250 +#: kallithea/controllers/admin/repo_groups.py:226 #, python-format msgid "Updated repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:266 +#: kallithea/controllers/admin/repo_groups.py:242 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:284 +#: kallithea/controllers/admin/repo_groups.py:252 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:291 +#: kallithea/controllers/admin/repo_groups.py:259 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:297 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Removed repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:302 +#: kallithea/controllers/admin/repo_groups.py:270 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:405 -#: kallithea/controllers/admin/repo_groups.py:440 -#: kallithea/controllers/admin/user_groups.py:340 +#: kallithea/controllers/admin/repo_groups.py:354 +#: kallithea/controllers/admin/repo_groups.py:384 +#: kallithea/controllers/admin/user_groups.py:299 msgid "Cannot revoke permission for yourself as admin" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:420 +#: kallithea/controllers/admin/repo_groups.py:369 msgid "Repository group permissions updated" msgstr "" -#: kallithea/controllers/admin/repo_groups.py:457 -#: kallithea/controllers/admin/repos.py:398 -#: kallithea/controllers/admin/user_groups.py:352 +#: kallithea/controllers/admin/repo_groups.py:401 +#: kallithea/controllers/admin/repos.py:357 +#: kallithea/controllers/admin/user_groups.py:311 msgid "An error occurred during revoking of permission" msgstr "" -#: kallithea/controllers/admin/repos.py:152 +#: kallithea/controllers/admin/repos.py:137 #, python-format msgid "Error creating repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:213 +#: kallithea/controllers/admin/repos.py:195 #, python-format msgid "Created repository %s from %s" msgstr "" -#: kallithea/controllers/admin/repos.py:222 +#: kallithea/controllers/admin/repos.py:204 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: kallithea/controllers/admin/repos.py:225 +#: kallithea/controllers/admin/repos.py:207 #, python-format msgid "Created repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:262 +#: kallithea/controllers/admin/repos.py:236 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: kallithea/controllers/admin/repos.py:283 +#: kallithea/controllers/admin/repos.py:256 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:310 +#: kallithea/controllers/admin/repos.py:274 #, python-format msgid "Detached %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:313 +#: kallithea/controllers/admin/repos.py:277 #, python-format msgid "Deleted %s forks" msgstr "" -#: kallithea/controllers/admin/repos.py:318 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Deleted repository %s" msgstr "" -#: kallithea/controllers/admin/repos.py:321 +#: kallithea/controllers/admin/repos.py:285 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "" -#: kallithea/controllers/admin/repos.py:326 +#: kallithea/controllers/admin/repos.py:290 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: kallithea/controllers/admin/repos.py:374 +#: kallithea/controllers/admin/repos.py:330 msgid "Repository permissions updated" msgstr "" -#: kallithea/controllers/admin/repos.py:430 -msgid "An error occurred during creation of field" -msgstr "" - -#: kallithea/controllers/admin/repos.py:444 +#: kallithea/controllers/admin/repos.py:387 +#, python-format +msgid "Field validation error: %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:390 +#, python-format +msgid "An error occurred during creation of field: %r" +msgstr "" + +#: kallithea/controllers/admin/repos.py:401 msgid "An error occurred during removal of field" msgstr "" -#: kallithea/controllers/admin/repos.py:460 +#: kallithea/controllers/admin/repos.py:415 msgid "-- Not a fork --" msgstr "" +#: kallithea/controllers/admin/repos.py:446 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:450 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: kallithea/controllers/admin/repos.py:466 +msgid "Nothing" +msgstr "" + +#: kallithea/controllers/admin/repos.py:468 +#, python-format +msgid "Marked repository %s as fork of %s" +msgstr "" + +#: kallithea/controllers/admin/repos.py:475 +msgid "An error occurred during this operation" +msgstr "" + #: kallithea/controllers/admin/repos.py:491 -msgid "Updated repository visibility in public journal" -msgstr "" - -#: kallithea/controllers/admin/repos.py:495 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - #: kallithea/controllers/admin/repos.py:512 -msgid "Nothing" -msgstr "" - -#: kallithea/controllers/admin/repos.py:514 -#, python-format -msgid "Marked repository %s as fork of %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:521 -msgid "An error occurred during this operation" -msgstr "" - -#: kallithea/controllers/admin/repos.py:537 -#: kallithea/controllers/admin/repos.py:564 msgid "Repository has been locked" msgstr "儲存所已被鎖定" -#: kallithea/controllers/admin/repos.py:540 -#: kallithea/controllers/admin/repos.py:561 +#: kallithea/controllers/admin/repos.py:494 +#: kallithea/controllers/admin/repos.py:509 msgid "Repository has been unlocked" msgstr "儲存所已打開" -#: kallithea/controllers/admin/repos.py:543 -#: kallithea/controllers/admin/repos.py:568 +#: kallithea/controllers/admin/repos.py:497 +#: kallithea/controllers/admin/repos.py:516 msgid "An error occurred during unlocking" msgstr "" -#: kallithea/controllers/admin/repos.py:582 +#: kallithea/controllers/admin/repos.py:528 msgid "Cache invalidation successful" msgstr "" -#: kallithea/controllers/admin/repos.py:586 +#: kallithea/controllers/admin/repos.py:532 msgid "An error occurred during cache invalidation" msgstr "" -#: kallithea/controllers/admin/repos.py:601 +#: kallithea/controllers/admin/repos.py:545 msgid "Pulled from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:604 +#: kallithea/controllers/admin/repos.py:548 msgid "An error occurred during pull from remote location" msgstr "" -#: kallithea/controllers/admin/repos.py:637 +#: kallithea/controllers/admin/repos.py:579 msgid "An error occurred during deletion of repository stats" msgstr "" -#: kallithea/controllers/admin/settings.py:170 +#: kallithea/controllers/admin/settings.py:135 msgid "Updated VCS settings" msgstr "" +#: kallithea/controllers/admin/settings.py:139 kallithea/lib/utils.py:231 +msgid "" +"Unable to activate hgsubversion support. The \"hgsubversion\" library is " +"missing" +msgstr "" + +#: kallithea/controllers/admin/settings.py:145 +#: kallithea/controllers/admin/settings.py:234 +msgid "Error occurred while updating application settings" +msgstr "" + #: kallithea/controllers/admin/settings.py:174 -msgid "" -"Unable to activate hgsubversion support. The \"hgsubversion\" library is " -"missing" -msgstr "" - -#: kallithea/controllers/admin/settings.py:180 -#: kallithea/controllers/admin/settings.py:284 -msgid "Error occurred while updating application settings" -msgstr "" - -#: kallithea/controllers/admin/settings.py:211 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "" -#: kallithea/controllers/admin/settings.py:226 +#: kallithea/controllers/admin/settings.py:189 #, fuzzy, python-format #| msgid "Invalidate Repository Cache" msgid "Invalidated %s repositories" msgstr "確認廢止版本庫快取" -#: kallithea/controllers/admin/settings.py:280 +#: kallithea/controllers/admin/settings.py:230 msgid "Updated application settings" msgstr "更新應用設定" -#: kallithea/controllers/admin/settings.py:337 +#: kallithea/controllers/admin/settings.py:283 msgid "Updated visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:342 +#: kallithea/controllers/admin/settings.py:288 msgid "Error occurred during updating visualisation settings" msgstr "" -#: kallithea/controllers/admin/settings.py:368 +#: kallithea/controllers/admin/settings.py:312 msgid "Please enter email address" msgstr "" -#: kallithea/controllers/admin/settings.py:383 +#: kallithea/controllers/admin/settings.py:327 msgid "Send email task created" msgstr "" -#: kallithea/controllers/admin/settings.py:414 +#: kallithea/controllers/admin/settings.py:355 +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 "Added new hook" msgstr "新增hook" -#: kallithea/controllers/admin/settings.py:428 +#: kallithea/controllers/admin/settings.py:376 msgid "Updated hooks" msgstr "更新hook" -#: kallithea/controllers/admin/settings.py:432 +#: kallithea/controllers/admin/settings.py:380 msgid "Error occurred during hook creation" msgstr "" -#: kallithea/controllers/admin/settings.py:458 +#: kallithea/controllers/admin/settings.py:404 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: kallithea/controllers/admin/user_groups.py:150 +#: kallithea/controllers/admin/user_groups.py:143 #, python-format msgid "Created user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:163 +#: kallithea/controllers/admin/user_groups.py:156 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:201 +#: kallithea/controllers/admin/user_groups.py:184 #, python-format msgid "Updated user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:206 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: kallithea/controllers/admin/user_groups.py:242 +#: kallithea/controllers/admin/user_groups.py:217 msgid "Successfully deleted user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:247 +#: kallithea/controllers/admin/user_groups.py:222 msgid "An error occurred during deletion of user group" msgstr "" -#: kallithea/controllers/admin/user_groups.py:314 +#: kallithea/controllers/admin/user_groups.py:278 msgid "Target group cannot be the same" msgstr "" -#: kallithea/controllers/admin/user_groups.py:320 +#: kallithea/controllers/admin/user_groups.py:284 msgid "User group permissions updated" msgstr "" -#: kallithea/controllers/admin/user_groups.py:440 -#: kallithea/controllers/admin/users.py:384 +#: kallithea/controllers/admin/user_groups.py:395 +#: kallithea/controllers/admin/users.py:340 msgid "Updated permissions" msgstr "" -#: kallithea/controllers/admin/user_groups.py:444 -#: kallithea/controllers/admin/users.py:388 +#: kallithea/controllers/admin/user_groups.py:399 +#: kallithea/controllers/admin/users.py:344 msgid "An error occurred during permissions saving" msgstr "" -#: kallithea/controllers/admin/users.py:134 +#: kallithea/controllers/admin/users.py:123 #, python-format msgid "Created user %s" msgstr "" -#: kallithea/controllers/admin/users.py:149 +#: kallithea/controllers/admin/users.py:138 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: kallithea/controllers/admin/users.py:182 +#: kallithea/controllers/admin/users.py:162 msgid "User updated successfully" msgstr "使用者更新完成" -#: kallithea/controllers/admin/users.py:218 +#: kallithea/controllers/admin/users.py:190 msgid "Successfully deleted user" msgstr "" -#: kallithea/controllers/admin/users.py:223 +#: kallithea/controllers/admin/users.py:195 msgid "An error occurred during deletion of user" msgstr "" -#: kallithea/controllers/admin/users.py:236 +#: kallithea/controllers/admin/users.py:203 msgid "The default user cannot be edited" msgstr "" -#: kallithea/controllers/admin/users.py:463 +#: kallithea/controllers/admin/users.py:412 #, python-format msgid "Added IP address %s to user whitelist" msgstr "" -#: kallithea/controllers/admin/users.py:469 +#: kallithea/controllers/admin/users.py:418 msgid "An error occurred while adding IP address" msgstr "" -#: kallithea/controllers/admin/users.py:483 +#: kallithea/controllers/admin/users.py:430 msgid "Removed IP address from user whitelist" msgstr "" -#: kallithea/lib/auth.py:744 -#, python-format -msgid "IP %s not allowed" -msgstr "" - -#: kallithea/lib/auth.py:757 -msgid "Invalid API key" -msgstr "" - -#: kallithea/lib/auth.py:785 -msgid "CSRF token leak has been detected - all form tokens have been expired" -msgstr "" - -#: kallithea/lib/auth.py:832 +#: kallithea/lib/auth.py:824 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: kallithea/lib/auth.py:864 +#: kallithea/lib/auth.py:852 msgid "You need to be signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" -#: kallithea/lib/base.py:490 +#: kallithea/lib/base.py:444 +msgid "Invalid API key" +msgstr "" + +#: kallithea/lib/base.py:495 +msgid "" +"CSRF token leak has been detected - all form tokens have been expired" +msgstr "" + +#: kallithea/lib/base.py:583 msgid "Repository not found in the filesystem" msgstr "" -#: kallithea/lib/base.py:516 +#: kallithea/lib/base.py:608 #, python-format msgid "Changeset for %s %s not found in %s" msgstr "" -#: kallithea/lib/diffs.py:66 +#: kallithea/lib/diffs.py:193 msgid "Binary file" msgstr "" -#: kallithea/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" - -#: kallithea/lib/diffs.py:92 +#: kallithea/lib/diffs.py:213 +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "" + +#: kallithea/lib/diffs.py:223 msgid "No changes detected" msgstr "尚未有任何變更" -#: kallithea/lib/helpers.py:610 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Deleted branch: %s" msgstr "" -#: kallithea/lib/helpers.py:612 +#: kallithea/lib/helpers.py:614 #, python-format msgid "Created tag: %s" msgstr "" -#: kallithea/lib/helpers.py:623 +#: kallithea/lib/helpers.py:625 #, fuzzy, python-format #| msgid "Set changeset status" msgid "Changeset %s not found" msgstr "尚未有任何變更" -#: kallithea/lib/helpers.py:672 +#: kallithea/lib/helpers.py:674 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: kallithea/lib/helpers.py:678 +#: kallithea/lib/helpers.py:680 msgid "Compare view" msgstr "" -#: kallithea/lib/helpers.py:697 +#: kallithea/lib/helpers.py:699 msgid "and" msgstr "和" -#: kallithea/lib/helpers.py:698 +#: kallithea/lib/helpers.py:700 #, python-format msgid "%s more" msgstr "" -#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 +#: kallithea/lib/helpers.py:701 +#: kallithea/templates/changelog/changelog.html:43 msgid "revisions" msgstr "修訂" -#: kallithea/lib/helpers.py:723 +#: kallithea/lib/helpers.py:725 #, python-format msgid "Fork name %s" msgstr "分支名稱 %s" -#: kallithea/lib/helpers.py:743 +#: kallithea/lib/helpers.py:746 #, python-format msgid "Pull request %s" msgstr "提取要求 %s" -#: kallithea/lib/helpers.py:753 +#: kallithea/lib/helpers.py:756 msgid "[deleted] repository" msgstr "" -#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 +#: kallithea/lib/helpers.py:758 kallithea/lib/helpers.py:770 msgid "[created] repository" msgstr "" -#: kallithea/lib/helpers.py:757 +#: kallithea/lib/helpers.py:760 msgid "[created] repository as fork" msgstr "" -#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 +#: kallithea/lib/helpers.py:762 kallithea/lib/helpers.py:772 msgid "[forked] repository" msgstr "" -#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 +#: kallithea/lib/helpers.py:764 kallithea/lib/helpers.py:774 msgid "[updated] repository" msgstr "" -#: kallithea/lib/helpers.py:763 +#: kallithea/lib/helpers.py:766 msgid "[downloaded] archive from repository" msgstr "" -#: kallithea/lib/helpers.py:765 +#: kallithea/lib/helpers.py:768 msgid "[delete] repository" msgstr "" -#: kallithea/lib/helpers.py:773 +#: kallithea/lib/helpers.py:776 msgid "[created] user" msgstr "" -#: kallithea/lib/helpers.py:775 +#: kallithea/lib/helpers.py:778 msgid "[updated] user" msgstr "" -#: kallithea/lib/helpers.py:777 +#: kallithea/lib/helpers.py:780 msgid "[created] user group" msgstr "" -#: kallithea/lib/helpers.py:779 +#: kallithea/lib/helpers.py:782 msgid "[updated] user group" msgstr "" -#: kallithea/lib/helpers.py:781 +#: kallithea/lib/helpers.py:784 msgid "[commented] on revision in repository" msgstr "" -#: kallithea/lib/helpers.py:783 +#: kallithea/lib/helpers.py:786 msgid "[commented] on pull request for" msgstr "" -#: kallithea/lib/helpers.py:785 +#: kallithea/lib/helpers.py:788 msgid "[closed] pull request for" msgstr "" -#: kallithea/lib/helpers.py:787 +#: kallithea/lib/helpers.py:790 msgid "[pushed] into" msgstr "" -#: kallithea/lib/helpers.py:789 +#: kallithea/lib/helpers.py:792 msgid "[committed via Kallithea] into repository" msgstr "" -#: kallithea/lib/helpers.py:791 +#: kallithea/lib/helpers.py:794 msgid "[pulled from remote] into repository" msgstr "" -#: kallithea/lib/helpers.py:793 +#: kallithea/lib/helpers.py:796 msgid "[pulled] from" msgstr "" -#: kallithea/lib/helpers.py:795 +#: kallithea/lib/helpers.py:798 msgid "[started following] repository" msgstr "" -#: kallithea/lib/helpers.py:797 +#: kallithea/lib/helpers.py:800 msgid "[stopped following] repository" msgstr "" -#: kallithea/lib/helpers.py:1125 +#: kallithea/lib/helpers.py:928 #, python-format msgid " and %s more" msgstr "" -#: kallithea/lib/helpers.py:1129 -#: kallithea/templates/compare/compare_diff.html:65 -#: kallithea/templates/pullrequests/pullrequest_show.html:326 +#: kallithea/lib/helpers.py:932 +#: kallithea/templates/compare/compare_diff.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "No files" msgstr "" -#: kallithea/lib/helpers.py:1195 +#: kallithea/lib/helpers.py:957 msgid "new file" msgstr "" -#: kallithea/lib/helpers.py:1198 +#: kallithea/lib/helpers.py:960 msgid "mod" msgstr "" -#: kallithea/lib/helpers.py:1201 +#: kallithea/lib/helpers.py:963 msgid "del" msgstr "" -#: kallithea/lib/helpers.py:1204 +#: kallithea/lib/helpers.py:966 msgid "rename" msgstr "" -#: kallithea/lib/helpers.py:1209 +#: kallithea/lib/helpers.py:971 msgid "chmod" msgstr "" -#: kallithea/lib/helpers.py:1445 +#: kallithea/lib/helpers.py:1264 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1238,1153 +1252,649 @@ msgid "" "repositories" msgstr "" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:333 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" -#: kallithea/lib/utils2.py:416 +#: kallithea/lib/utils2.py:334 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" -#: kallithea/lib/utils2.py:417 +#: kallithea/lib/utils2.py:335 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:336 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" -#: kallithea/lib/utils2.py:419 +#: kallithea/lib/utils2.py:337 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" -#: kallithea/lib/utils2.py:420 +#: kallithea/lib/utils2.py:338 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "" -#: kallithea/lib/utils2.py:436 +#: kallithea/lib/utils2.py:354 #, python-format msgid "in %s" msgstr "" -#: kallithea/lib/utils2.py:438 +#: kallithea/lib/utils2.py:356 #, python-format msgid "%s ago" msgstr "" -#: kallithea/lib/utils2.py:440 +#: kallithea/lib/utils2.py:358 #, python-format msgid "in %s and %s" msgstr "" -#: kallithea/lib/utils2.py:443 +#: kallithea/lib/utils2.py:361 #, python-format msgid "%s and %s ago" msgstr "" -#: kallithea/lib/utils2.py:446 +#: kallithea/lib/utils2.py:364 msgid "just now" msgstr "現在" -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 -msgid "Repository no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 -msgid "Repository read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 -msgid "Repository write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 -msgid "Repository admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 -msgid "Repository Group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 -msgid "Repository Group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 -msgid "Repository Group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 -msgid "Repository Group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1666 -msgid "Kallithea Administrator" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 -msgid "Repository creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 -msgid "Repository creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 -msgid "Repository forking disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 -msgid "Repository forking enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 -msgid "Register disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 -msgid "Register new user with Kallithea with manual activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 -msgid "Register new user with Kallithea with auto activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 -msgid "Not Reviewed" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2239 -msgid "Approved" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2240 -msgid "Rejected" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 -#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 -msgid "Under Review" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1515 -msgid "top level" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 -msgid "Repository group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 -msgid "Repository group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 -msgid "Repository group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 -msgid "Repository group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 -msgid "User group no access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 -msgid "User group read access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 -msgid "User group write access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 -msgid "User group admin access" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 -msgid "Repository Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 -msgid "Repository Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 -msgid "User Group creation disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 -msgid "User Group creation enabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1698 -msgid "Registration disabled" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 -msgid "User Registration with manual account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 -#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 -#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 -#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 -#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 -#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 -msgid "User Registration with automatic account activation" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1692 -msgid "Repository creation enabled with write permission to a repository group" -msgstr "" - -#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 -#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1693 -msgid "Repository creation disabled with write permission to a repository group" -msgstr "" - -#: kallithea/model/comment.py:72 +#: kallithea/model/comment.py:68 #, python-format msgid "on line %s" msgstr "" -#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:169 +#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 msgid "[Mention]" msgstr "" -#: kallithea/model/db.py:1668 +#: kallithea/model/db.py:1562 +msgid "top level" +msgstr "" + +#: kallithea/model/db.py:1703 +msgid "Kallithea Administrator" +msgstr "" + +#: kallithea/model/db.py:1705 msgid "Default user has no access to new repositories" msgstr "" -#: kallithea/model/db.py:1669 +#: kallithea/model/db.py:1706 msgid "Default user has read access to new repositories" msgstr "" -#: kallithea/model/db.py:1670 +#: kallithea/model/db.py:1707 msgid "Default user has write access to new repositories" msgstr "" -#: kallithea/model/db.py:1671 +#: kallithea/model/db.py:1708 msgid "Default user has admin access to new repositories" msgstr "" -#: kallithea/model/db.py:1673 +#: kallithea/model/db.py:1710 msgid "Default user has no access to new repository groups" msgstr "" -#: kallithea/model/db.py:1674 +#: kallithea/model/db.py:1711 msgid "Default user has read access to new repository groups" msgstr "" -#: kallithea/model/db.py:1675 +#: kallithea/model/db.py:1712 msgid "Default user has write access to new repository groups" msgstr "" -#: kallithea/model/db.py:1676 +#: kallithea/model/db.py:1713 msgid "Default user has admin access to new repository groups" msgstr "" -#: kallithea/model/db.py:1678 +#: kallithea/model/db.py:1715 msgid "Default user has no access to new user groups" msgstr "" -#: kallithea/model/db.py:1679 +#: kallithea/model/db.py:1716 msgid "Default user has read access to new user groups" msgstr "" -#: kallithea/model/db.py:1680 +#: kallithea/model/db.py:1717 msgid "Default user has write access to new user groups" msgstr "" -#: kallithea/model/db.py:1681 +#: kallithea/model/db.py:1718 msgid "Default user has admin access to new user groups" msgstr "" -#: kallithea/model/db.py:1683 +#: kallithea/model/db.py:1720 msgid "Only admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1684 +#: kallithea/model/db.py:1721 msgid "Non-admins can create repository groups" msgstr "" -#: kallithea/model/db.py:1686 +#: kallithea/model/db.py:1723 msgid "Only admins can create user groups" msgstr "" -#: kallithea/model/db.py:1687 +#: kallithea/model/db.py:1724 msgid "Non-admins can create user groups" msgstr "" -#: kallithea/model/db.py:1689 +#: kallithea/model/db.py:1726 msgid "Only admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1690 +#: kallithea/model/db.py:1727 msgid "Non-admins can create top level repositories" msgstr "" -#: kallithea/model/db.py:1695 +#: kallithea/model/db.py:1729 +msgid "" +"Repository creation enabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1730 +msgid "" +"Repository creation disabled with write permission to a repository group" +msgstr "" + +#: kallithea/model/db.py:1732 msgid "Only admins can fork repositories" msgstr "祗有管理者才能分歧版本庫" -#: kallithea/model/db.py:1696 +#: kallithea/model/db.py:1733 #, fuzzy -#| msgid "Non-admins can can fork repositories" msgid "Non-admins can fork repositories" -msgstr "非管理者可以建立分歧版本庫" - -#: kallithea/model/db.py:1699 +msgstr "建立版本庫" + +#: kallithea/model/db.py:1735 +msgid "Registration disabled" +msgstr "" + +#: kallithea/model/db.py:1736 msgid "User registration with manual account activation" msgstr "" -#: kallithea/model/db.py:1700 +#: kallithea/model/db.py:1737 msgid "User registration with automatic account activation" msgstr "" -#: kallithea/model/db.py:2238 +#: kallithea/model/db.py:2263 msgid "Not reviewed" msgstr "未審核" -#: kallithea/model/db.py:2241 +#: kallithea/model/db.py:2264 msgid "Under review" msgstr "審核中" -#: kallithea/model/forms.py:57 +#: kallithea/model/db.py:2265 +msgid "Not approved" +msgstr "" + +#: kallithea/model/db.py:2266 +msgid "Approved" +msgstr "" + +#: kallithea/model/forms.py:58 msgid "Please enter a login" msgstr "請登入" -#: kallithea/model/forms.py:58 +#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "" -#: kallithea/model/forms.py:66 +#: kallithea/model/forms.py:67 msgid "Please enter a password" msgstr "請輸入密碼" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:68 #, python-format msgid "Enter %(min)i characters or more" msgstr "" -#: kallithea/model/forms.py:160 +#: kallithea/model/forms.py:170 msgid "Name must not contain only digits" msgstr "" -#: kallithea/model/notification.py:255 -#, python-format -msgid "%(user)s commented on changeset %(age)s" -msgstr "" - -#: kallithea/model/notification.py:256 -#, python-format -msgid "%(user)s sent message %(age)s" -msgstr "" - -#: kallithea/model/notification.py:257 -#, python-format -msgid "%(user)s mentioned you %(age)s" -msgstr "" - -#: kallithea/model/notification.py:258 -#, python-format -msgid "%(user)s registered in Kallithea %(age)s" -msgstr "" - -#: kallithea/model/notification.py:259 -#, python-format -msgid "%(user)s opened new pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:260 -#, python-format -msgid "%(user)s commented on pull request %(age)s" -msgstr "" - -#: kallithea/model/notification.py:267 -#, python-format -msgid "%(user)s commented on changeset at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:268 -#, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:269 -#, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:270 -#, python-format -msgid "%(user)s registered in Kallithea at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:271 -#, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:272 -#, python-format -msgid "%(user)s commented on pull request at %(when)s" -msgstr "" - -#: kallithea/model/notification.py:303 -#, python-format -msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgstr "" - -#: kallithea/model/notification.py:306 +#: kallithea/model/notification.py:165 +#, python-format +msgid "" +"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " +"%(branch)s" +msgstr "" + +#: kallithea/model/notification.py:168 #, python-format msgid "New user %(new_username)s registered" msgstr "" -#: kallithea/model/notification.py:308 -#, python-format -msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:309 -#, python-format -msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -msgstr "" - -#: kallithea/model/notification.py:322 +#: kallithea/model/notification.py:170 +#, python-format +msgid "" +"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:171 +#, python-format +msgid "" +"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " +"%(pr_source_branch)s by %(pr_owner_username)s" +msgstr "" + +#: kallithea/model/notification.py:184 msgid "Closing" msgstr "關閉中" -#: kallithea/model/pull_request.py:137 -#, python-format -msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" -msgstr "" - -#: kallithea/model/scm.py:812 +#: kallithea/model/pull_request.py:76 +#, python-format +msgid "" +"%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" +msgstr "" + +#: kallithea/model/pull_request.py:211 +msgid "Cannot create empty pull request" +msgstr "" + +#: kallithea/model/pull_request.py:219 +#, python-format +msgid "" +"Cannot create pull request - criss cross merge detected, please merge a " +"later %s revision to %s" +msgstr "" + +#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 +msgid "You are not authorized to create the pull request" +msgstr "" + +#: kallithea/model/pull_request.py:341 +msgid "Missing changesets since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:348 +#, python-format +msgid "New changesets on %s %s since the previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:355 +msgid "Ancestor didn't change - diff since previous iteration:" +msgstr "" + +#: kallithea/model/pull_request.py:362 +#, python-format +msgid "" +"This iteration is based on another %s revision and there is no simple " +"diff." +msgstr "" + +#: kallithea/model/pull_request.py:364 +#, python-format +msgid "No changes found on %s %s since previous iteration." +msgstr "" + +#: kallithea/model/pull_request.py:390 +#, python-format +msgid "Closed, next iteration: %s ." +msgstr "" + +#: kallithea/model/scm.py:698 msgid "latest tip" msgstr "" -#: kallithea/model/user.py:192 +#: kallithea/model/user.py:189 msgid "New user registration" msgstr "" -#: kallithea/model/user.py:256 -msgid "You can't remove this user since it is crucial for the entire application" +#: kallithea/model/user.py:253 +msgid "" +"You can't remove this user since it is crucial for the entire application" msgstr "您無法移除這個使用者，因為係供整個應用使用" -#: kallithea/model/user.py:261 +#: kallithea/model/user.py:258 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories: %s" msgstr "" -#: kallithea/model/user.py:266 +#: kallithea/model/user.py:263 #, python-format msgid "" -"User \"%s\" still owns %s repository groups and cannot be removed. Switch" -" owners or remove those repository groups: %s" -msgstr "" - -#: kallithea/model/user.py:273 +"User \"%s\" still owns %s repository groups and cannot be removed. Switch " +"owners or remove those repository groups: %s" +msgstr "" + +#: kallithea/model/user.py:270 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " "owners or remove those user groups: %s" msgstr "" -#: kallithea/model/user.py:360 +#: kallithea/model/user.py:364 msgid "Password reset link" msgstr "" -#: kallithea/model/user.py:408 +#: kallithea/model/user.py:413 msgid "Password reset notification" msgstr "" -#: kallithea/model/user.py:409 +#: kallithea/model/user.py:414 #, python-format msgid "" "The password to your account %s has been changed using password reset " "form." msgstr "" -#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 +#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 msgid "Value cannot be an empty list" msgstr "" -#: kallithea/model/validators.py:95 +#: kallithea/model/validators.py:74 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: kallithea/model/validators.py:97 +#: kallithea/model/validators.py:76 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "" -#: kallithea/model/validators.py:99 +#: kallithea/model/validators.py:78 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with an alphanumeric character or underscore" -msgstr "" - -#: kallithea/model/validators.py:126 +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with an alphanumeric character or underscore" +msgstr "" + +#: kallithea/model/validators.py:105 msgid "The input is not valid" msgstr "" +#: kallithea/model/validators.py:112 +#, python-format +msgid "Username %(username)s is not valid" +msgstr "" + #: kallithea/model/validators.py:133 -#, python-format -msgid "Username %(username)s is not valid" -msgstr "" - -#: kallithea/model/validators.py:152 msgid "Invalid user group name" msgstr "" -#: kallithea/model/validators.py:153 +#: kallithea/model/validators.py:134 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "" -#: kallithea/model/validators.py:155 +#: kallithea/model/validators.py:136 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "使用者羣組名稱可以包括文數字字元、底線、句點或破折號，必須以文數字啟頭" - -#: kallithea/model/validators.py:193 +msgstr "" +"使用者羣組名稱可以包括文數字字元、底線、句點或破折號，必須以文數字啟頭" + +#: kallithea/model/validators.py:176 msgid "Cannot assign this group as parent" msgstr "" -#: kallithea/model/validators.py:194 +#: kallithea/model/validators.py:177 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:196 +#: kallithea/model/validators.py:179 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: kallithea/model/validators.py:254 +#: kallithea/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: kallithea/model/validators.py:269 +#: kallithea/model/validators.py:250 msgid "Invalid old password" msgstr "" -#: kallithea/model/validators.py:285 +#: kallithea/model/validators.py:266 msgid "Passwords do not match" msgstr "密碼不相符" -#: kallithea/model/validators.py:300 +#: kallithea/model/validators.py:281 msgid "Invalid username or password" msgstr "無效的用戶名稱或密碼" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:312 msgid "Token mismatch" msgstr "" -#: kallithea/model/validators.py:345 +#: kallithea/model/validators.py:328 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "" -#: kallithea/model/validators.py:347 +#: kallithea/model/validators.py:330 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: kallithea/model/validators.py:348 +#: kallithea/model/validators.py:331 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: kallithea/model/validators.py:350 +#: kallithea/model/validators.py:333 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "" -#: kallithea/model/validators.py:465 +#: kallithea/model/validators.py:419 msgid "Invalid repository URL" msgstr "無效的版本庫 URL" -#: kallithea/model/validators.py:466 +#: kallithea/model/validators.py:420 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" msgstr "" -#: kallithea/model/validators.py:489 +#: kallithea/model/validators.py:445 msgid "Fork has to be the same type as parent" msgstr "" -#: kallithea/model/validators.py:504 +#: kallithea/model/validators.py:460 msgid "You don't have permissions to create repository in this group" msgstr "" -#: kallithea/model/validators.py:506 +#: kallithea/model/validators.py:462 msgid "no permission to create repository in root location" msgstr "" -#: kallithea/model/validators.py:556 +#: kallithea/model/validators.py:512 msgid "You don't have permissions to create a group in this location" msgstr "" -#: kallithea/model/validators.py:597 +#: kallithea/model/validators.py:552 msgid "This username or user group name is not valid" msgstr "" -#: kallithea/model/validators.py:690 +#: kallithea/model/validators.py:645 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: kallithea/model/validators.py:705 +#: kallithea/model/validators.py:662 #, fuzzy msgid "This email address is already in use" msgstr "這個郵件位址已經使用了" -#: kallithea/model/validators.py:725 +#: kallithea/model/validators.py:682 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:719 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" -#: kallithea/model/validators.py:774 +#: kallithea/model/validators.py:731 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "" -#: kallithea/model/validators.py:775 -#, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" - -#: kallithea/model/validators.py:808 +#: kallithea/model/validators.py:732 +#, python-format +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: kallithea/model/validators.py:765 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" -#: kallithea/model/validators.py:822 +#: kallithea/model/validators.py:779 msgid "Filename cannot be inside a directory" msgstr "" -#: kallithea/model/validators.py:838 +#: kallithea/model/validators.py:795 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:13 msgid "About" msgstr "" -#: kallithea/templates/index.html:5 -msgid "Dashboard" -msgstr "儀表板" - -#: kallithea/templates/index_base.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:3 -#: kallithea/templates/admin/my_account/my_account_watched.html:3 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/admin/repos/repos.html:9 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/bookmarks/bookmarks.html:9 -#: kallithea/templates/branches/branches.html:9 -#: kallithea/templates/journal/journal.html:9 -#: kallithea/templates/journal/journal.html:48 -#: kallithea/templates/journal/journal.html:49 -#: kallithea/templates/tags/tags.html:9 -msgid "quick filter..." -msgstr "快速過濾..." - -#: kallithea/templates/index_base.html:6 -msgid "repositories" -msgstr "個版本庫" - -#: kallithea/templates/index_base.html:20 -#: kallithea/templates/index_base.html:25 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:22 +#: kallithea/templates/admin/repos/repos.html:23 +#: kallithea/templates/index_base.html:25 +#: kallithea/templates/index_base.html:30 msgid "Add Repository" msgstr "" -#: kallithea/templates/index_base.html:22 -#: kallithea/templates/index_base.html:27 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:26 -msgid "Add Repository Group" -msgstr "" - +#: kallithea/templates/admin/repo_groups/repo_groups.html:25 +#: kallithea/templates/index_base.html:27 #: kallithea/templates/index_base.html:32 +msgid "Add Repository Group" +msgstr "" + +#: kallithea/templates/index_base.html:37 msgid "You have admin right to this group, and can edit it" msgstr "" -#: kallithea/templates/index_base.html:32 +#: kallithea/templates/index_base.html:37 msgid "Edit Repository Group" msgstr "" -#: kallithea/templates/index_base.html:45 -msgid "Group Name" -msgstr "" - -#: kallithea/templates/index_base.html:46 -#: kallithea/templates/index_base.html:127 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 -#: kallithea/templates/admin/repo_groups/repo_groups.html:47 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:65 -#: kallithea/templates/admin/repos/repos.html:48 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 -#: kallithea/templates/admin/user_groups/user_groups.html:47 -#: kallithea/templates/admin/users/user_edit_api_keys.html:64 -#: kallithea/templates/email_templates/changeset_comment.html:18 -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/forks/fork.html:38 -#: kallithea/templates/pullrequests/pullrequest.html:40 +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:14 +#: kallithea/templates/index_base.html:53 +msgid "Repository" +msgstr "版本庫" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 +#: kallithea/templates/admin/repo_groups/repo_groups.html:40 +#: kallithea/templates/admin/repos/repo_add_base.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:49 +#: kallithea/templates/admin/repos/repos.html:39 +#: kallithea/templates/admin/user_groups/user_group_add.html:33 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 +#: kallithea/templates/admin/user_groups/user_groups.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:59 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/email_templates/pull_request.html:37 +#: kallithea/templates/forks/fork.html:34 +#: kallithea/templates/index_base.html:58 +#: kallithea/templates/pullrequests/pullrequest.html:33 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:63 -#: kallithea/templates/summary/summary.html:85 +#: kallithea/templates/pullrequests/pullrequest_show.html:59 +#: kallithea/templates/summary/summary.html:79 msgid "Description" msgstr "描述" -#: kallithea/templates/index_base.html:125 -#: kallithea/templates/admin/my_account/my_account_repos.html:46 -#: kallithea/templates/admin/my_account/my_account_watched.html:46 -#: kallithea/templates/admin/repo_groups/repo_groups.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:9 -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 -#: kallithea/templates/admin/repos/repos.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:46 -#: kallithea/templates/base/perms_summary.html:53 -#: kallithea/templates/bookmarks/bookmarks.html:49 -#: kallithea/templates/bookmarks/bookmarks_data.html:7 -#: kallithea/templates/branches/branches.html:49 -#: kallithea/templates/branches/branches_data.html:7 -#: kallithea/templates/files/files_browser.html:60 -#: kallithea/templates/journal/journal.html:187 -#: kallithea/templates/journal/journal.html:278 -#: kallithea/templates/tags/tags.html:49 -#: kallithea/templates/tags/tags_data.html:7 -msgid "Name" -msgstr "名稱" - -#: kallithea/templates/index_base.html:128 +#: kallithea/templates/index_base.html:60 msgid "Last Change" msgstr "" -#: kallithea/templates/index_base.html:130 -#: kallithea/templates/admin/my_account/my_account_repos.html:48 -#: kallithea/templates/admin/my_account/my_account_watched.html:48 -#: kallithea/templates/admin/repos/repos.html:49 -#: kallithea/templates/journal/journal.html:189 -#: kallithea/templates/journal/journal.html:280 +#: kallithea/templates/admin/my_account/my_account_repos.html:15 +#: kallithea/templates/admin/my_account/my_account_watched.html:15 +#: kallithea/templates/admin/repos/repos.html:41 +#: kallithea/templates/index_base.html:62 msgid "Tip" msgstr "" -#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:53 -#: kallithea/templates/admin/repos/repos.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:42 +#: kallithea/templates/admin/repos/repos.html:42 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:50 +#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/index_base.html:63 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:156 -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/templates/summary/summary.html:134 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:219 +#: kallithea/templates/summary/summary.html:124 msgid "Owner" msgstr "擁有者" -#: kallithea/templates/index_base.html:140 -#: kallithea/templates/admin/my_account/my_account_repos.html:57 -#: kallithea/templates/admin/my_account/my_account_watched.html:57 -#: kallithea/templates/base/root.html:43 -#: kallithea/templates/bookmarks/bookmarks.html:79 -#: kallithea/templates/branches/branches.html:79 -#: kallithea/templates/journal/journal.html:198 -#: kallithea/templates/journal/journal.html:289 -#: kallithea/templates/tags/tags.html:79 -msgid "Click to sort ascending" -msgstr "" - -#: kallithea/templates/index_base.html:141 -#: kallithea/templates/admin/my_account/my_account_repos.html:58 -#: kallithea/templates/admin/my_account/my_account_watched.html:58 -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/bookmarks/bookmarks.html:80 -#: kallithea/templates/branches/branches.html:80 -#: kallithea/templates/journal/journal.html:199 -#: kallithea/templates/journal/journal.html:290 -#: kallithea/templates/tags/tags.html:80 -msgid "Click to sort descending" -msgstr "" - -#: kallithea/templates/index_base.html:142 -msgid "No repositories found." -msgstr "" - -#: kallithea/templates/index_base.html:143 -#: kallithea/templates/admin/my_account/my_account_repos.html:60 -#: kallithea/templates/admin/my_account/my_account_watched.html:60 -#: kallithea/templates/base/root.html:46 -#: kallithea/templates/bookmarks/bookmarks.html:82 -#: kallithea/templates/branches/branches.html:82 -#: kallithea/templates/journal/journal.html:201 -#: kallithea/templates/journal/journal.html:292 -#: kallithea/templates/tags/tags.html:82 -msgid "Data error." -msgstr "" - -#: kallithea/templates/index_base.html:144 -#: kallithea/templates/admin/my_account/my_account_repos.html:61 -#: kallithea/templates/admin/my_account/my_account_watched.html:61 -#: kallithea/templates/base/base.html:140 kallithea/templates/base/root.html:47 -#: kallithea/templates/bookmarks/bookmarks.html:83 -#: kallithea/templates/branches/branches.html:83 -#: kallithea/templates/journal/journal.html:202 -#: kallithea/templates/journal/journal.html:293 -#: kallithea/templates/tags/tags.html:83 -msgid "Loading..." -msgstr "" - -#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 -#: kallithea/templates/base/base.html:326 +#: kallithea/templates/base/base.html:387 kallithea/templates/login.html:5 +#: kallithea/templates/login.html:19 msgid "Log In" msgstr "" -#: kallithea/templates/login.html:13 +#: kallithea/templates/login.html:17 #, python-format msgid "Log In to %s" msgstr "" -#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:32 -#: kallithea/templates/admin/users/user_edit_profile.html:24 -#: kallithea/templates/admin/users/users.html:50 -#: kallithea/templates/base/base.html:302 -#: kallithea/templates/pullrequests/pullrequest_show.html:166 +#: kallithea/templates/admin/my_account/my_account_profile.html:18 +#: kallithea/templates/admin/users/user_add.html:27 +#: kallithea/templates/admin/users/user_edit_profile.html:18 +#: kallithea/templates/admin/users/users.html:37 +#: kallithea/templates/base/base.html:371 +#: kallithea/templates/email_templates/registration.html:11 +#: kallithea/templates/login.html:28 kallithea/templates/register.html:31 msgid "Username" msgstr "帳號" -#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 -#: kallithea/templates/admin/my_account/my_account.html:37 -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/templates/base/base.html:311 +#: kallithea/templates/admin/my_account/my_account.html:27 +#: kallithea/templates/admin/users/user_add.html:34 +#: kallithea/templates/base/base.html:375 kallithea/templates/login.html:34 +#: kallithea/templates/register.html:38 msgid "Password" msgstr "密碼" #: kallithea/templates/login.html:44 -msgid "Remember me" -msgstr "" - -#: kallithea/templates/login.html:53 +msgid "Stay logged in after browser restart" +msgstr "" + +#: kallithea/templates/login.html:52 msgid "Forgot your password ?" msgstr "忘記您的密碼?" -#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:322 +#: kallithea/templates/login.html:55 msgid "Don't have an account ?" msgstr "沒有帳號?" -#: kallithea/templates/login.html:59 +#: kallithea/templates/login.html:62 msgid "Sign In" msgstr "登入" @@ -2392,182 +1902,151 @@ msgstr "登入" msgid "Password Reset" msgstr "" -#: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:12 -#, fuzzy, python-format +#: kallithea/templates/password_reset.html:21 +#: kallithea/templates/password_reset_confirmation.html:16 +#, python-format msgid "Reset Your Password to %s" msgstr "" -#: kallithea/templates/password_reset.html:14 +#: kallithea/templates/password_reset.html:23 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:14 +#: kallithea/templates/password_reset_confirmation.html:18 #, fuzzy msgid "Reset Your Password" msgstr "忘記您的密碼?" -#: kallithea/templates/password_reset.html:25 +#: kallithea/templates/password_reset.html:30 msgid "Email Address" msgstr "" -#: kallithea/templates/password_reset.html:35 -#: kallithea/templates/register.html:79 +#: kallithea/templates/password_reset.html:38 +#: kallithea/templates/register.html:74 msgid "Captcha" msgstr "" -#: kallithea/templates/password_reset.html:46 -msgid "Send Password Reset Email" -msgstr "" - #: kallithea/templates/password_reset.html:47 +msgid "Send Password Reset Email" +msgstr "" + +#: kallithea/templates/password_reset.html:52 #, fuzzy msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." msgstr "密碼重設連結已郵寄至您的信箱" -#: kallithea/templates/password_reset_confirmation.html:19 +#: kallithea/templates/password_reset_confirmation.html:23 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:20 +#: kallithea/templates/password_reset_confirmation.html:24 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." msgstr "" -#: kallithea/templates/password_reset_confirmation.html:30 +#: kallithea/templates/password_reset_confirmation.html:29 msgid "Code you received in the email" msgstr "" -#: kallithea/templates/password_reset_confirmation.html:39 +#: kallithea/templates/password_reset_confirmation.html:36 #, fuzzy msgid "New Password" msgstr "新密碼" -#: kallithea/templates/password_reset_confirmation.html:48 +#: kallithea/templates/password_reset_confirmation.html:43 #, fuzzy msgid "Confirm New Password" msgstr "新密碼" -#: kallithea/templates/password_reset_confirmation.html:56 +#: kallithea/templates/password_reset_confirmation.html:51 msgid "Confirm" msgstr "" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 -#: kallithea/templates/register.html:90 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:24 +#: kallithea/templates/register.html:83 msgid "Sign Up" msgstr "登入" -#: kallithea/templates/register.html:12 +#: kallithea/templates/register.html:22 #, python-format msgid "Sign Up to %s" msgstr "" -#: kallithea/templates/register.html:42 +#: kallithea/templates/register.html:45 msgid "Re-enter password" msgstr "確認密碼" -#: kallithea/templates/register.html:51 -#: kallithea/templates/admin/my_account/my_account_profile.html:34 -#: kallithea/templates/admin/users/user_add.html:59 -#: kallithea/templates/admin/users/user_edit_profile.html:78 -#: kallithea/templates/admin/users/users.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:48 +#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/users/users.html:38 +#: kallithea/templates/register.html:52 msgid "First Name" msgstr "名" -#: kallithea/templates/register.html:60 -#: kallithea/templates/admin/my_account/my_account_profile.html:43 -#: kallithea/templates/admin/users/user_add.html:68 -#: kallithea/templates/admin/users/user_edit_profile.html:87 -#: kallithea/templates/admin/users/users.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:32 +#: kallithea/templates/admin/users/user_add.html:55 +#: kallithea/templates/admin/users/user_edit_profile.html:67 +#: kallithea/templates/admin/users/users.html:39 +#: kallithea/templates/register.html:59 msgid "Last Name" msgstr "姓" -#: kallithea/templates/register.html:69 -#: kallithea/templates/admin/my_account/my_account_profile.html:52 +#: kallithea/templates/admin/my_account/my_account_profile.html:39 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:77 -#: kallithea/templates/admin/users/user_edit_profile.html:33 +#: kallithea/templates/admin/users/user_add.html:62 +#: kallithea/templates/admin/users/user_edit_profile.html:25 +#: kallithea/templates/email_templates/registration.html:33 +#: kallithea/templates/register.html:66 msgid "Email" msgstr "電子郵件" -#: kallithea/templates/register.html:92 +#: kallithea/templates/register.html:85 msgid "Registered accounts are ready to use and need no further action." msgstr "" -#: kallithea/templates/register.html:94 +#: kallithea/templates/register.html:87 msgid "Please wait for an administrator to activate your account." msgstr "" -#: kallithea/templates/switch_to_list.html:10 -#: kallithea/templates/branches/branches_data.html:69 -msgid "There are no branches yet" -msgstr "沒有任何分支" - -#: kallithea/templates/switch_to_list.html:16 -msgid "Closed Branches" -msgstr "" - -#: kallithea/templates/switch_to_list.html:32 -#: kallithea/templates/tags/tags_data.html:44 -msgid "There are no tags yet" -msgstr "沒有任何標籤" - -#: kallithea/templates/switch_to_list.html:45 -#: kallithea/templates/bookmarks/bookmarks_data.html:43 -msgid "There are no bookmarks yet" -msgstr "" - #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:55 #, fuzzy msgid "Admin Journal" msgstr "管理員日誌" #: kallithea/templates/admin/admin.html:10 +#: kallithea/templates/journal/journal.html:10 msgid "journal filter..." msgstr "" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:11 +#: kallithea/templates/journal/journal.html:12 #, fuzzy msgid "Filter" msgstr "檔案" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:12 -#, fuzzy, python-format +#: kallithea/templates/journal/journal.html:13 +#, python-format msgid "%s Entry" msgid_plural "%s Entries" msgstr[0] "" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:50 -#: kallithea/templates/admin/my_account/my_account_watched.html:50 -#: kallithea/templates/admin/repo_groups/repo_groups.html:50 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/templates/admin/repos/repos.html:52 -#: kallithea/templates/admin/user_groups/user_groups.html:51 -#: kallithea/templates/admin/users/users.html:57 -#: kallithea/templates/journal/journal.html:191 -#: kallithea/templates/journal/journal.html:282 +#: kallithea/templates/admin/my_account/my_account_repos.html:16 +#: kallithea/templates/admin/repo_groups/repo_groups.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:9 +#: kallithea/templates/admin/repos/repos.html:44 +#: kallithea/templates/admin/user_groups/user_groups.html:43 +#: kallithea/templates/admin/users/users.html:45 msgid "Action" msgstr "動作" -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -msgid "Repository" -msgstr "版本庫" - #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/templates/bookmarks/bookmarks.html:51 -#: kallithea/templates/bookmarks/bookmarks_data.html:9 -#: kallithea/templates/branches/branches.html:51 -#: kallithea/templates/branches/branches_data.html:9 -#: kallithea/templates/tags/tags.html:51 -#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "時間" @@ -2575,7 +2054,7 @@ msgstr "時間" msgid "From IP" msgstr "來源IP" -#: kallithea/templates/admin/admin_log.html:63 +#: kallithea/templates/admin/admin_log.html:61 msgid "No actions yet" msgstr "" @@ -2584,109 +2063,109 @@ msgid "Authentication Settings" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:65 +#: kallithea/templates/base/base.html:61 msgid "Authentication" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:28 +#: kallithea/templates/admin/auth/auth_settings.html:27 msgid "Authentication Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:31 +#: kallithea/templates/admin/auth/auth_settings.html:29 msgid "Enabled Plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:33 +#: kallithea/templates/admin/auth/auth_settings.html:32 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:34 +#: kallithea/templates/admin/auth/auth_settings.html:36 msgid "Available built-in plugins" msgstr "" -#: kallithea/templates/admin/auth/auth_settings.html:51 +#: kallithea/templates/admin/auth/auth_settings.html:53 msgid "Plugin" msgstr "" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:82 -#: kallithea/templates/admin/my_account/my_account_password.html:36 -#: kallithea/templates/admin/my_account/my_account_profile.html:60 -#: kallithea/templates/admin/permissions/permissions_globals.html:112 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 -#: kallithea/templates/admin/repos/repo_edit_settings.html:127 -#: kallithea/templates/admin/settings/settings_hooks.html:53 -#: kallithea/templates/admin/user_groups/user_group_add.html:57 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 -#: kallithea/templates/admin/users/user_add.html:96 -#: kallithea/templates/admin/users/user_edit_profile.html:113 -#: kallithea/templates/base/default_perms_box.html:64 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/my_account/my_account_password.html:30 +#: kallithea/templates/admin/my_account/my_account_profile.html:47 +#: kallithea/templates/admin/permissions/permissions_globals.html:95 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 +#: kallithea/templates/admin/repos/repo_edit_settings.html:101 +#: kallithea/templates/admin/settings/settings_hooks.html:46 +#: kallithea/templates/admin/user_groups/user_group_add.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 +#: kallithea/templates/admin/users/user_add.html:80 +#: kallithea/templates/admin/users/user_edit_profile.html:89 +#: kallithea/templates/base/default_perms_box.html:56 msgid "Save" msgstr "儲存" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:66 +#: kallithea/templates/base/base.html:62 #, fuzzy msgid "Repository Defaults" msgstr "個版本庫" -#: kallithea/templates/admin/defaults/defaults.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:55 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/defaults/defaults.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:42 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 msgid "Type" msgstr "類型" -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_add_base.html:73 -#: kallithea/templates/admin/repos/repo_edit_settings.html:75 -#: kallithea/templates/data_table/_dt_elements.html:72 +#: kallithea/templates/admin/defaults/defaults.html:34 +#: kallithea/templates/admin/repos/repo_add_base.html:56 +#: kallithea/templates/admin/repos/repo_edit_settings.html:57 +#: kallithea/templates/data_table/_dt_elements.html:21 msgid "Private repository" msgstr "私有的版本庫" -#: kallithea/templates/admin/defaults/defaults.html:46 -#: kallithea/templates/admin/repos/repo_add_base.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:79 -#: kallithea/templates/forks/fork.html:72 +#: kallithea/templates/admin/defaults/defaults.html:37 +#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_edit_settings.html:60 +#: kallithea/templates/forks/fork.html:61 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_edit_settings.html:64 msgid "Enable statistics" msgstr "啟用統計" -#: kallithea/templates/admin/defaults/defaults.html:57 -#: kallithea/templates/admin/repos/repo_edit_settings.html:88 +#: kallithea/templates/admin/defaults/defaults.html:45 +#: kallithea/templates/admin/repos/repo_edit_settings.html:67 msgid "Enable statistics window on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:63 -#: kallithea/templates/admin/repos/repo_edit_settings.html:93 +#: kallithea/templates/admin/defaults/defaults.html:50 +#: kallithea/templates/admin/repos/repo_edit_settings.html:71 msgid "Enable downloads" msgstr "啟用下載" -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/repos/repo_edit_settings.html:97 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:74 msgid "Enable download menu on summary page." msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:73 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 -#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/defaults/defaults.html:58 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repos/repo_edit_settings.html:78 msgid "Enable locking" msgstr "" -#: kallithea/templates/admin/defaults/defaults.html:77 -#: kallithea/templates/admin/repos/repo_edit_settings.html:106 +#: kallithea/templates/admin/defaults/defaults.html:61 +#: kallithea/templates/admin/repos/repo_edit_settings.html:81 msgid "Enable lock-by-pulling on repository." msgstr "" @@ -2695,45 +2174,45 @@ msgstr "" msgid "Edit Gist" msgstr "" -#: kallithea/templates/admin/gists/edit.html:36 +#: 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." msgstr "" -#: kallithea/templates/admin/gists/edit.html:55 -#: kallithea/templates/admin/gists/new.html:39 +#: kallithea/templates/admin/gists/edit.html:51 +#: kallithea/templates/admin/gists/new.html:35 msgid "Gist description ..." msgstr "" -#: kallithea/templates/admin/gists/edit.html:57 -#: kallithea/templates/admin/gists/new.html:41 +#: kallithea/templates/admin/gists/edit.html:54 +#: kallithea/templates/admin/gists/new.html:38 msgid "Gist lifetime" msgstr "" +#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/edit.html:63 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/index.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/index.html:56 +#: kallithea/templates/admin/gists/show.html:45 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/gists/show.html:49 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:32 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:31 msgid "Expires" msgstr "" -#: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:57 -#: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 -#: kallithea/templates/admin/users/user_edit_api_keys.html:8 -#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/gists/edit.html:59 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 +#: kallithea/templates/admin/users/user_edit_api_keys.html:7 +#: kallithea/templates/admin/users/user_edit_api_keys.html:26 #, fuzzy msgid "Never" msgstr "擁有者" @@ -2743,7 +2222,8 @@ msgid "Update Gist" msgstr "" #: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:81 +#: kallithea/templates/base/root.html:27 +#: kallithea/templates/changeset/changeset_file_comment.html:130 msgid "Cancel" msgstr "" @@ -2766,16 +2246,16 @@ msgstr "" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:237 +#: kallithea/templates/base/base.html:312 msgid "Create New Gist" msgstr "" -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/data_table/_dt_elements.html:141 +#: kallithea/templates/admin/gists/index.html:51 +#: kallithea/templates/data_table/_dt_elements.html:78 msgid "Created" msgstr "" -#: kallithea/templates/admin/gists/index.html:74 +#: kallithea/templates/admin/gists/index.html:66 msgid "There are no gists yet" msgstr "" @@ -2784,45 +2264,45 @@ msgstr "" msgid "New Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:47 -msgid "name this file..." -msgstr "" - -#: kallithea/templates/admin/gists/new.html:56 +#: kallithea/templates/admin/gists/new.html:45 +msgid "Name this gist ..." +msgstr "" + +#: kallithea/templates/admin/gists/new.html:53 msgid "Create Private Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:57 +#: kallithea/templates/admin/gists/new.html:54 msgid "Create Public Gist" msgstr "" -#: kallithea/templates/admin/gists/new.html:58 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/my_account/my_account_password.html:37 -#: kallithea/templates/admin/my_account/my_account_profile.html:61 -#: kallithea/templates/admin/permissions/permissions_globals.html:113 -#: kallithea/templates/admin/permissions/permissions_ips.html:39 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:59 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 -#: kallithea/templates/admin/repos/repo_edit_settings.html:128 -#: kallithea/templates/admin/settings/settings_global.html:57 -#: kallithea/templates/admin/settings/settings_vcs.html:81 -#: kallithea/templates/admin/settings/settings_visual.html:117 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 -#: kallithea/templates/admin/users/user_edit_api_keys.html:15 -#: kallithea/templates/admin/users/user_edit_api_keys.html:70 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:50 -#: kallithea/templates/admin/users/user_edit_profile.html:114 -#: kallithea/templates/base/default_perms_box.html:65 -#: kallithea/templates/files/files_add.html:65 -#: kallithea/templates/files/files_delete.html:44 -#: kallithea/templates/files/files_edit.html:68 -#: kallithea/templates/pullrequests/pullrequest.html:89 +#: kallithea/templates/admin/gists/new.html:55 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:47 +#: kallithea/templates/admin/my_account/my_account_password.html:31 +#: kallithea/templates/admin/my_account/my_account_profile.html:48 +#: kallithea/templates/admin/permissions/permissions_globals.html:96 +#: kallithea/templates/admin/permissions/permissions_ips.html:34 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 +#: kallithea/templates/admin/repos/repo_edit_fields.html:54 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 +#: kallithea/templates/admin/settings/settings_global.html:50 +#: kallithea/templates/admin/settings/settings_vcs.html:78 +#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:73 +#: kallithea/templates/admin/users/user_edit_emails.html:47 +#: kallithea/templates/admin/users/user_edit_ips.html:45 +#: kallithea/templates/admin/users/user_edit_profile.html:90 +#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/files/files_add.html:69 +#: kallithea/templates/files/files_delete.html:41 +#: kallithea/templates/files/files_edit.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:78 msgid "Reset" msgstr "重設" @@ -2832,112 +2312,110 @@ msgid "Gist" msgstr "" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/templates/email_templates/changeset_comment.html:15 -#: kallithea/templates/email_templates/pull_request.html:10 -#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "" +#: kallithea/templates/admin/gists/show.html:35 +msgid "Public Gist" +msgstr "" + #: kallithea/templates/admin/gists/show.html:37 -msgid "Public Gist" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "" -#: kallithea/templates/admin/gists/show.html:56 -#: kallithea/templates/admin/my_account/my_account_emails.html:19 -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 -#: kallithea/templates/admin/repos/repo_edit_fields.html:18 -#: kallithea/templates/admin/settings/settings_hooks.html:36 -#: kallithea/templates/admin/users/user_edit_emails.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/admin/gists/show.html:54 +#: kallithea/templates/admin/my_account/my_account_emails.html:23 +#: kallithea/templates/admin/permissions/permissions_ips.html:11 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/settings/settings_hooks.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:23 +#: kallithea/templates/admin/users/user_edit_ips.html:21 #: kallithea/templates/changeset/changeset_file_comment.html:30 -#: kallithea/templates/data_table/_dt_elements.html:129 -#: kallithea/templates/data_table/_dt_elements.html:157 -#: kallithea/templates/data_table/_dt_elements.html:173 -#: kallithea/templates/data_table/_dt_elements.html:189 -#: kallithea/templates/files/files_source.html:39 -#: kallithea/templates/files/files_source.html:42 -#: kallithea/templates/files/files_source.html:45 +#: kallithea/templates/changeset/changeset_file_comment.html:121 +#: kallithea/templates/data_table/_dt_elements.html:69 +#: kallithea/templates/data_table/_dt_elements.html:89 +#: kallithea/templates/data_table/_dt_elements.html:91 +#: kallithea/templates/data_table/_dt_elements.html:101 +#: kallithea/templates/data_table/_dt_elements.html:103 +#: kallithea/templates/data_table/_dt_elements.html:120 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/files/files_source.html:35 +#: kallithea/templates/files/files_source.html:38 +#: kallithea/templates/files/files_source.html:41 #: kallithea/templates/pullrequests/pullrequest_data.html:20 msgid "Delete" msgstr "移除" -#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/gists/show.html:54 msgid "Confirm to delete this Gist" msgstr "" +#: kallithea/templates/admin/gists/show.html:61 +#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/base/perms_summary.html:81 +#: kallithea/templates/base/perms_summary.html:83 +#: kallithea/templates/data_table/_dt_elements.html:63 +#: kallithea/templates/data_table/_dt_elements.html:64 +#: kallithea/templates/data_table/_dt_elements.html:85 +#: kallithea/templates/data_table/_dt_elements.html:86 +#: kallithea/templates/data_table/_dt_elements.html:97 +#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:116 +#: kallithea/templates/data_table/_dt_elements.html:117 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:37 +#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/pullrequests/pullrequest_show.html:41 +msgid "Edit" +msgstr "" + #: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/base/perms_summary.html:43 -#: kallithea/templates/base/perms_summary.html:79 -#: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/changeset/changeset_file_comment.html:83 -#: kallithea/templates/changeset/changeset_file_comment.html:192 -#: kallithea/templates/data_table/_dt_elements.html:122 -#: kallithea/templates/data_table/_dt_elements.html:123 -#: kallithea/templates/data_table/_dt_elements.html:150 -#: kallithea/templates/data_table/_dt_elements.html:151 -#: kallithea/templates/data_table/_dt_elements.html:165 -#: kallithea/templates/data_table/_dt_elements.html:167 -#: kallithea/templates/data_table/_dt_elements.html:181 -#: kallithea/templates/data_table/_dt_elements.html:183 -#: kallithea/templates/files/diff_2way.html:56 -#: kallithea/templates/files/files_source.html:41 -#: kallithea/templates/files/files_source.html:44 -#: kallithea/templates/pullrequests/pullrequest_show.html:41 -msgid "Edit" -msgstr "" - -#: kallithea/templates/admin/gists/show.html:65 -#: kallithea/templates/files/files_edit.html:49 -#: kallithea/templates/files/files_source.html:34 +#: kallithea/templates/files/files_edit.html:52 +#: kallithea/templates/files/files_source.html:30 msgid "Show as Raw" msgstr "" -#: kallithea/templates/admin/gists/show.html:73 +#: kallithea/templates/admin/gists/show.html:69 msgid "created" msgstr "" -#: kallithea/templates/admin/gists/show.html:86 -#: kallithea/templates/files/files_source.html:73 +#: kallithea/templates/admin/gists/show.html:82 msgid "Show as raw" msgstr "" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:397 msgid "My Account" msgstr "我的帳號" -#: kallithea/templates/admin/my_account/my_account.html:35 +#: kallithea/templates/admin/my_account/my_account.html:25 #: kallithea/templates/admin/users/user_edit.html:29 msgid "Profile" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:36 +#: kallithea/templates/admin/my_account/my_account.html:26 msgid "Email Addresses" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:38 +#: kallithea/templates/admin/my_account/my_account.html:28 #: kallithea/templates/admin/users/user_edit.html:31 msgid "API Keys" msgstr "" -#: kallithea/templates/admin/my_account/my_account.html:39 +#: kallithea/templates/admin/my_account/my_account.html:29 #, fuzzy msgid "Owned Repositories" msgstr "個版本庫" -#: kallithea/templates/admin/my_account/my_account.html:40 -#: kallithea/templates/journal/journal.html:53 +#: kallithea/templates/admin/my_account/my_account.html:30 +#: kallithea/templates/journal/journal.html:33 #, fuzzy msgid "Watched Repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/my_account/my_account.html:41 +#: kallithea/templates/admin/my_account/my_account.html:31 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 @@ -2945,73 +2423,90 @@ msgstr "建立版本庫" msgid "Show Permissions" msgstr "權限" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 -#: kallithea/templates/admin/users/user_edit_api_keys.html:6 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 +#: kallithea/templates/admin/users/user_edit_api_keys.html:5 msgid "Built-in" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 +#: kallithea/templates/admin/users/user_edit_api_keys.html:13 #, python-format msgid "Confirm to reset this API key: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 -#: kallithea/templates/admin/users/user_edit_api_keys.html:30 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 +#: kallithea/templates/admin/users/user_edit_api_keys.html:29 msgid "Expired" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 -#: kallithea/templates/admin/users/user_edit_api_keys.html:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 +#: kallithea/templates/admin/users/user_edit_api_keys.html:39 #, fuzzy, python-format msgid "Confirm to remove this API key: %s" msgstr "確認移除目前的統計" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 -#: kallithea/templates/admin/users/user_edit_api_keys.html:42 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 +#: kallithea/templates/admin/users/user_edit_api_keys.html:41 #, fuzzy msgid "Remove" msgstr "移除檔案" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 -#: kallithea/templates/admin/users/user_edit_api_keys.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 +#: kallithea/templates/admin/users/user_edit_api_keys.html:48 msgid "No additional API keys specified" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 +#: kallithea/templates/admin/users/user_edit_api_keys.html:56 msgid "New API key" msgstr "" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 -#: kallithea/templates/admin/my_account/my_account_emails.html:45 -#: kallithea/templates/admin/permissions/permissions_ips.html:38 -#: kallithea/templates/admin/repos/repo_add_base.html:81 -#: kallithea/templates/admin/repos/repo_edit_fields.html:58 -#: kallithea/templates/admin/users/user_edit_api_keys.html:69 -#: kallithea/templates/admin/users/user_edit_emails.html:45 -#: kallithea/templates/admin/users/user_edit_ips.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/permissions/permissions_ips.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/users/user_edit_api_keys.html:72 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:44 msgid "Add" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:7 -#: kallithea/templates/admin/users/user_edit_emails.html:7 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 +#, python-format +msgid "" +"\n" +"API keys are used to let scripts or services access %s using your\n" +"account, as if you had provided the script or service with your actual\n" +"password.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 +msgid "" +"\n" +"Like passwords, API keys should therefore never be shared with others,\n" +"nor passed to untrusted scripts or services. If such sharing should\n" +"happen anyway, reset the API key on this page to prevent further use.\n" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_emails.html:9 +#: kallithea/templates/admin/users/user_edit_emails.html:9 msgid "Primary" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:20 -#: kallithea/templates/admin/users/user_edit_emails.html:20 +#: kallithea/templates/admin/my_account/my_account_emails.html:24 +#: kallithea/templates/admin/users/user_edit_emails.html:24 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:26 -#: kallithea/templates/admin/users/user_edit_emails.html:26 +#: kallithea/templates/admin/my_account/my_account_emails.html:30 +#: kallithea/templates/admin/users/user_edit_emails.html:30 msgid "No additional emails specified." msgstr "" -#: kallithea/templates/admin/my_account/my_account_emails.html:38 -#: kallithea/templates/admin/users/user_edit_emails.html:38 +#: kallithea/templates/admin/my_account/my_account_emails.html:39 +#: kallithea/templates/admin/users/user_edit_emails.html:39 msgid "New email address" msgstr "" @@ -3020,107 +2515,71 @@ msgstr "" msgid "Change Your Account Password" msgstr "忘記您的密碼?" -#: kallithea/templates/admin/my_account/my_account_password.html:10 +#: kallithea/templates/admin/my_account/my_account_password.html:8 msgid "Current password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:19 -#: kallithea/templates/admin/users/user_edit_profile.html:60 +#: kallithea/templates/admin/my_account/my_account_password.html:15 +#: kallithea/templates/admin/users/user_edit_profile.html:46 msgid "New password" msgstr "新密碼" -#: kallithea/templates/admin/my_account/my_account_password.html:28 +#: kallithea/templates/admin/my_account/my_account_password.html:22 msgid "Confirm new password" msgstr "" -#: kallithea/templates/admin/my_account/my_account_password.html:45 -#, python-format -msgid "This account is managed with %s and the password cannot be changed here" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:11 -msgid "Change your avatar at" +#: kallithea/templates/admin/my_account/my_account_password.html:39 +#, python-format +msgid "" +"This account is managed with %s and the password cannot be changed here" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_perms.html:3 +msgid "Current IP" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:4 +#: kallithea/templates/admin/users/user_edit_profile.html:4 +msgid "Gravatar" +msgstr "" + +#: kallithea/templates/admin/my_account/my_account_profile.html:10 +#: kallithea/templates/admin/users/user_edit_profile.html:10 +#, fuzzy, python-format +#| msgid "Change your avatar at" +msgid "Change %s avatar at" msgstr "修改您的頭像於" #: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:9 -msgid "Using" -msgstr "使用中" - -#: kallithea/templates/admin/my_account/my_account_profile.html:14 -#: kallithea/templates/admin/users/user_edit_profile.html:11 +#: kallithea/templates/admin/users/user_edit_profile.html:12 msgid "Avatars are disabled" msgstr "" -#: kallithea/templates/admin/my_account/my_account_profile.html:15 -msgid "Missing email, please update your user email address." -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:16 -#: kallithea/templates/admin/users/user_edit_profile.html:15 -msgid "Current IP" -msgstr "" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 #, fuzzy msgid "Repositories You Own" msgstr "個版本庫" -#: kallithea/templates/admin/my_account/my_account_repos.html:59 -#: kallithea/templates/admin/my_account/my_account_watched.html:59 -#: kallithea/templates/base/root.html:45 -#: kallithea/templates/bookmarks/bookmarks.html:81 -#: kallithea/templates/branches/branches.html:81 -#: kallithea/templates/journal/journal.html:200 -#: kallithea/templates/journal/journal.html:291 -#: kallithea/templates/tags/tags.html:81 -msgid "No records found." -msgstr "" +#: kallithea/templates/admin/my_account/my_account_repos.html:13 +#: kallithea/templates/admin/my_account/my_account_watched.html:13 +#: kallithea/templates/admin/repo_groups/repo_groups.html:39 +#: kallithea/templates/admin/repos/repo_add_base.html:6 +#: kallithea/templates/admin/repos/repo_edit_settings.html:4 +#: 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 +msgid "Name" +msgstr "名稱" #: kallithea/templates/admin/my_account/my_account_watched.html:1 #, fuzzy msgid "Repositories You are Watching" msgstr "版本庫路徑" -#: kallithea/templates/admin/notifications/notifications.html:5 -#: kallithea/templates/admin/notifications/notifications.html:9 -msgid "My Notifications" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:24 -msgid "All" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:25 -msgid "Comments" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:183 -msgid "Pull Requests" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications.html:30 -msgid "Mark All Read" -msgstr "" - -#: kallithea/templates/admin/notifications/notifications_data.html:40 -msgid "No notifications here yet" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:5 -#: kallithea/templates/admin/notifications/show_notification.html:11 -msgid "Show Notification" -msgstr "" - -#: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:342 -msgid "Notifications" -msgstr "" - #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:64 +#: kallithea/templates/base/base.html:60 #, fuzzy msgid "Default Permissions" msgstr "預設權限" @@ -3135,201 +2594,208 @@ msgstr "" msgid "IP Whitelist" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:4 msgid "Anonymous access" msgstr "訪客權限" -#: kallithea/templates/admin/permissions/permissions_globals.html:13 +#: kallithea/templates/admin/permissions/permissions_globals.html:8 +#, fuzzy +#| msgid "Anonymous access" +msgid "Allow anonymous access" +msgstr "訪客權限" + +#: kallithea/templates/admin/permissions/permissions_globals.html:10 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " "%s user permissions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:25 +#: kallithea/templates/admin/permissions/permissions_globals.html:19 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:26 +#: kallithea/templates/admin/permissions/permissions_globals.html:20 #, fuzzy msgid "Apply to all existing repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/permissions/permissions_globals.html:23 msgid "Permissions for the Default user on new repositories." msgstr "" +#: kallithea/templates/admin/permissions/permissions_globals.html:27 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:28 +#: kallithea/templates/data_table/_dt_elements.html:134 +#: kallithea/templates/forks/fork.html:42 +msgid "Repository group" +msgstr "版本庫群組" + #: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/templates/admin/repos/repo_add_base.html:37 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/data_table/_dt_elements.html:202 -#: kallithea/templates/forks/fork.html:48 -msgid "Repository group" -msgstr "版本庫群組" - -#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/admin/permissions/permissions_globals.html:33 msgid "Apply to all existing repository groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:41 +#: kallithea/templates/admin/permissions/permissions_globals.html:36 msgid "Permissions for the Default user on new repository groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:46 -#: kallithea/templates/data_table/_dt_elements.html:209 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "User group" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:45 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " "be lost" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:54 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 msgid "Apply to all existing user groups" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:49 msgid "Permissions for the Default user on new user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 #, fuzzy msgid "Top level repository creation" msgstr "版本庫建立" -#: kallithea/templates/admin/permissions/permissions_globals.html:64 -msgid "Enable this to allow non-admins to create repositories at the top level." -msgstr "" - -#: kallithea/templates/admin/permissions/permissions_globals.html:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:56 +msgid "" +"Enable this to allow non-admins to create repositories at the top level." +msgstr "" + +#: kallithea/templates/admin/permissions/permissions_globals.html:57 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 +#: kallithea/templates/admin/permissions/permissions_globals.html:61 msgid "Repository creation with group write access" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:74 +#: kallithea/templates/admin/permissions/permissions_globals.html:64 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " "mean nothing." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:68 msgid "User group creation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:83 +#: kallithea/templates/admin/permissions/permissions_globals.html:71 msgid "Enable this to allow non-admins to create user groups." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:88 +#: kallithea/templates/admin/permissions/permissions_globals.html:75 msgid "Repository forking" msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:92 +#: kallithea/templates/admin/permissions/permissions_globals.html:78 msgid "Enable this to allow non-admins to fork repositories." msgstr "" -#: kallithea/templates/admin/permissions/permissions_globals.html:97 +#: kallithea/templates/admin/permissions/permissions_globals.html:82 msgid "Registration" msgstr "註冊" -#: kallithea/templates/admin/permissions/permissions_globals.html:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:88 msgid "External auth account activation" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:13 -#: kallithea/templates/admin/users/user_edit_ips.html:23 -#, fuzzy, python-format +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#, python-format msgid "Confirm to delete this IP address: %s" msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:19 -#: kallithea/templates/admin/users/user_edit_ips.html:30 +#: kallithea/templates/admin/permissions/permissions_ips.html:18 +#: kallithea/templates/admin/users/user_edit_ips.html:29 msgid "All IP addresses are allowed." msgstr "" -#: kallithea/templates/admin/permissions/permissions_ips.html:30 -#: kallithea/templates/admin/users/user_edit_ips.html:42 +#: kallithea/templates/admin/permissions/permissions_ips.html:25 +#: kallithea/templates/admin/users/user_edit_ips.html:37 msgid "New IP address" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 -#: kallithea/templates/admin/repo_groups/repo_groups.html:10 -#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/base/base.html:57 +#: kallithea/templates/base/base.html:76 msgid "Repository Groups" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 -#: kallithea/templates/admin/user_groups/user_group_add.html:32 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 +#: kallithea/templates/admin/user_groups/user_group_add.html:27 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 msgid "Group name" msgstr "群組名稱" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 msgid "Group parent" msgstr "父群組" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 -#: kallithea/templates/admin/repos/repo_add_base.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 +#: kallithea/templates/admin/repos/repo_add_base.html:35 msgid "Copy parent group permissions" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 -#: kallithea/templates/admin/repos/repo_add_base.html:50 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:38 msgid "Copy permission set from parent repository group." msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Repository Group Settings" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 msgid "Add Child Group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:40 +#: kallithea/templates/admin/repos/repo_edit.html:25 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:151 -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/templates/data_table/_dt_elements.html:49 +#: kallithea/templates/base/base.html:63 +#: kallithea/templates/base/base.html:152 msgid "Settings" msgstr "設定" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 -#: kallithea/templates/admin/repos/repo_edit.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 +#: kallithea/templates/admin/repos/repo_edit.html:31 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 msgid "Advanced" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 +#: kallithea/templates/admin/repos/repo_edit.html:28 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 msgid "Permissions" msgstr "權限" @@ -3354,12 +2820,12 @@ msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:148 +#: kallithea/templates/pullrequests/pullrequest_show.html:118 msgid "Created on" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:190 +#: kallithea/templates/data_table/_dt_elements.html:121 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3369,16 +2835,36 @@ msgstr[0] "" msgid "Delete this repository group" msgstr "" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 +msgid "Not visible" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#, fuzzy +#| msgid "Disabled" +msgid "Visible" +msgstr "停用" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#, fuzzy +#| msgid "No response" +msgid "Add repos" +msgstr "未回應" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 +msgid "Add/Edit groups" +msgstr "" + #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 #, fuzzy @@ -3387,112 +2873,105 @@ msgstr "刪除" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 msgid "Add new" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 msgid "Apply to children" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 msgid "Both" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Remove this group" msgstr "" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 -#, fuzzy +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 msgid "Confirm to delete this group" msgstr "" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, python-format -msgid "%s Repository group dashboard" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -msgid "Home" -msgstr "首頁" - -#: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -msgid "with" -msgstr "" +#, fuzzy, python-format +#| msgid "Repository group" +msgid "Repository group %s" +msgstr "版本庫群組" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 #, fuzzy msgid "Repository Groups Administration" msgstr "版本庫管理員" -#: kallithea/templates/admin/repo_groups/repo_groups.html:48 +#: kallithea/templates/admin/repo_groups/repo_groups.html:41 #, fuzzy msgid "Number of Top-level Repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/repos/repo_add_base.html:17 +#: kallithea/templates/admin/repos/repo_add_base.html:12 #, fuzzy msgid "Clone remote repository" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_add_base.html:22 +#: kallithea/templates/admin/repos/repo_add_base.html:16 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:32 -#: kallithea/templates/admin/repos/repo_edit_settings.html:69 -#: kallithea/templates/forks/fork.html:42 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" - -#: kallithea/templates/admin/repos/repo_add_base.html:41 -#: kallithea/templates/admin/repos/repo_edit_settings.html:39 -#: kallithea/templates/forks/fork.html:52 +#: kallithea/templates/admin/repos/repo_add_base.html:24 +#: kallithea/templates/admin/repos/repo_edit_settings.html:52 +#: kallithea/templates/forks/fork.html:37 +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "" + +#: kallithea/templates/admin/repos/repo_add_base.html:31 +#: kallithea/templates/admin/repos/repo_edit_settings.html:31 +#: kallithea/templates/forks/fork.html:45 msgid "Optionally select a group to put this repository into." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:59 +#: kallithea/templates/admin/repos/repo_add_base.html:45 msgid "Type of repository to create." msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_settings.html:44 -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/admin/repos/repo_add_base.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/forks/fork.html:50 msgid "Landing revision" msgstr "" -#: kallithea/templates/admin/repos/repo_add_base.html:68 +#: kallithea/templates/admin/repos/repo_add_base.html:52 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" msgstr "" #: kallithea/templates/admin/repos/repo_creating.html:9 -#, fuzzy, python-format +#, python-format msgid "%s Creating Repository" msgstr "" @@ -3514,26 +2993,26 @@ msgid "" msgstr "" #: kallithea/templates/admin/repos/repo_edit.html:8 -#, fuzzy, python-format +#, python-format msgid "%s Repository Settings" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:49 +#: kallithea/templates/admin/repos/repo_edit.html:34 msgid "Extra Fields" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:52 +#: kallithea/templates/admin/repos/repo_edit.html:37 msgid "Caches" msgstr "" -#: kallithea/templates/admin/repos/repo_edit.html:55 +#: kallithea/templates/admin/repos/repo_edit.html:40 msgid "Remote" msgstr "遠端" -#: kallithea/templates/admin/repos/repo_edit.html:58 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:171 -#: kallithea/templates/summary/summary.html:172 +#: kallithea/templates/summary/summary.html:161 +#: kallithea/templates/summary/summary.html:162 msgid "Statistics" msgstr "統計" @@ -3543,70 +3022,68 @@ msgid "Parent" msgstr "父群組" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 -#: kallithea/templates/admin/repos/repo_edit_fork.html:9 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 msgid "Manually set this repository as a fork of another from the list." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 #, fuzzy msgid "Public Journal Visibility" msgstr "公開日誌" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 msgid "Remove from public journal" msgstr "從公開日誌移除" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 #, fuzzy msgid "Add to Public Journal" msgstr "公開日誌" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 #, fuzzy msgid "Change Locking" msgstr "修改紀錄" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 #, fuzzy msgid "Confirm to unlock repository." msgstr "確認廢止版本庫快取" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 #, fuzzy msgid "Unlock Repository" msgstr "公開的版本庫" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 #, python-format msgid "Locked by %s on %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 #, fuzzy msgid "Confirm to lock repository." msgstr "確認廢止版本庫快取" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 #, fuzzy msgid "Lock Repository" msgstr "公開的版本庫" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Repository is not locked" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3614,32 +3091,32 @@ msgid "" "unlock it by doing a push." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 -#: kallithea/templates/data_table/_dt_elements.html:130 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 +#: kallithea/templates/data_table/_dt_elements.html:68 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 #, fuzzy msgid "Delete this Repository" msgstr "公開的版本庫" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 -#, fuzzy, python-format +#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 +#, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 msgid "Detach forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 msgid "Delete forks" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3651,111 +3128,112 @@ msgstr "" msgid "Invalidate Repository Cache" msgstr "確認廢止版本庫快取" -#: kallithea/templates/admin/repos/repo_edit_caches.html:4 -#, fuzzy -msgid "Confirm to invalidate repository cache." -msgstr "確認廢止版本庫快取" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:6 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +msgid "List of Cached Values" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_caches.html:12 -msgid "List of Cached Values" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:16 -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:13 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_caches.html:17 -#: kallithea/templates/admin/user_groups/user_group_add.html:49 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 -#: kallithea/templates/admin/user_groups/user_groups.html:49 -#: kallithea/templates/admin/users/user_add.html:86 -#: kallithea/templates/admin/users/user_edit_profile.html:96 -#: kallithea/templates/admin/users/users.html:54 +#: kallithea/templates/admin/repos/repo_edit_caches.html:14 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 +#: kallithea/templates/admin/user_groups/user_groups.html:41 +#: kallithea/templates/admin/users/user_add.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:74 +#: kallithea/templates/admin/users/users.html:42 msgid "Active" msgstr "啟用" -#: kallithea/templates/admin/repos/repo_edit_fields.html:5 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 +#: kallithea/templates/admin/repos/repo_edit_fields.html:20 #, python-format msgid "Confirm to delete this field: %s" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:33 +#: kallithea/templates/admin/repos/repo_edit_fields.html:31 msgid "New field key" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:41 +#: kallithea/templates/admin/repos/repo_edit_fields.html:38 msgid "New field label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:44 +#: kallithea/templates/admin/repos/repo_edit_fields.html:40 msgid "Enter short label" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:45 msgid "New field description" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 +#: kallithea/templates/admin/repos/repo_edit_fields.html:47 msgid "Enter description of a field" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_fields.html:66 +#: kallithea/templates/admin/repos/repo_edit_fields.html:61 msgid "Extra fields are disabled." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 #, fuzzy msgid "Private Repository" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_remote.html:3 +#: kallithea/templates/admin/repos/repo_edit_remote.html:4 +#, fuzzy +#| msgid "Go to tip of repository" +msgid "Fork of repository" +msgstr "Git 版本庫" + +#: kallithea/templates/admin/repos/repo_edit_remote.html:7 #, fuzzy msgid "Remote repository URL" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_remote.html:9 +#: kallithea/templates/admin/repos/repo_edit_remote.html:15 #, fuzzy msgid "Pull Changes from Remote Repository" msgstr "修改於版本庫 %s" -#: kallithea/templates/admin/repos/repo_edit_remote.html:11 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 #, fuzzy msgid "Confirm to pull changes from remote repository." msgstr "確認廢止版本庫快取" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:23 msgid "This repository does not have a remote repository URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 #, fuzzy msgid "Permanent Repository ID" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_settings.html:11 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 msgid "What is that?" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:13 +#: kallithea/templates/admin/repos/repo_edit_settings.html:9 msgid "URL by id" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:14 +#: kallithea/templates/admin/repos/repo_edit_settings.html:10 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3765,35 +3243,40 @@ msgid "" "other cases that you need to hardcode the URL into a 3rd party service." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:21 +#: kallithea/templates/admin/repos/repo_edit_settings.html:16 #, fuzzy msgid "Remote repository" msgstr "私有版本庫" -#: kallithea/templates/admin/repos/repo_edit_settings.html:25 +#: kallithea/templates/admin/repos/repo_edit_settings.html:19 #, fuzzy msgid "Repository URL" msgstr "版本庫" -#: kallithea/templates/admin/repos/repo_edit_settings.html:29 +#: kallithea/templates/admin/repos/repo_edit_settings.html:23 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:48 +#: kallithea/templates/admin/repos/repo_edit_settings.html:38 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" -#: kallithea/templates/admin/repos/repo_edit_settings.html:58 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/pullrequests/pullrequest_show.html:131 +msgid "Type name of user" +msgstr "" + +#: kallithea/templates/admin/repos/repo_edit_settings.html:45 msgid "Change owner of this repository." msgstr "" +#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +msgid "Processed commits" +msgstr "" + #: kallithea/templates/admin/repos/repo_edit_statistics.html:6 -msgid "Processed commits" -msgstr "" - -#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "" @@ -3812,7 +3295,7 @@ msgstr "確認移除目前的統計" msgid "Repositories Administration" msgstr "版本庫管理員" -#: kallithea/templates/admin/repos/repos.html:51 +#: kallithea/templates/admin/repos/repos.html:43 msgid "State" msgstr "" @@ -3834,7 +3317,7 @@ msgid "Visual" msgstr "" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:19 +#: kallithea/templates/admin/settings/settings_vcs.html:4 msgid "Hooks" msgstr "" @@ -3846,280 +3329,272 @@ msgstr "" msgid "System Info" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:7 +#: kallithea/templates/admin/settings/settings_email.html:4 msgid "Send test email to" msgstr "" -#: kallithea/templates/admin/settings/settings_email.html:15 +#: kallithea/templates/admin/settings/settings_email.html:12 msgid "Send" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:8 +#: kallithea/templates/admin/settings/settings_global.html:4 msgid "Site branding" msgstr "" +#: kallithea/templates/admin/settings/settings_global.html:7 +msgid "Set a custom title for your Kallithea Service." +msgstr "" + #: kallithea/templates/admin/settings/settings_global.html:12 -msgid "Set a custom title for your Kallithea Service." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:27 -msgid "Analytics HTML block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:31 +#: kallithea/templates/admin/settings/settings_global.html:19 +msgid "HTML/JavaScript/CSS customization block" +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:22 msgid "" -"HTML with JavaScript for web analytics systems like Google Analytics or " -"Piwik. This will be added at the bottom of every page." -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:37 +"HTML (possibly with JavaScript and/or CSS) that " +"will be added to the bottom of every page. This " +"can be used for web analytics systems, but also " +"to perform instance-specific customizations like " +"adding a project banner at the top of every page." +msgstr "" + +#: kallithea/templates/admin/settings/settings_global.html:32 msgid "ReCaptcha public key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:41 +#: kallithea/templates/admin/settings/settings_global.html:35 msgid "Public key for reCaptcha system." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:47 +#: kallithea/templates/admin/settings/settings_global.html:40 msgid "ReCaptcha private key" msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:51 +#: kallithea/templates/admin/settings/settings_global.html:43 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." msgstr "" -#: kallithea/templates/admin/settings/settings_global.html:56 -#: kallithea/templates/admin/settings/settings_vcs.html:80 -#: kallithea/templates/admin/settings/settings_visual.html:116 +#: kallithea/templates/admin/settings/settings_global.html:49 +#: kallithea/templates/admin/settings/settings_vcs.html:77 +#: kallithea/templates/admin/settings/settings_visual.html:115 #, fuzzy msgid "Save Settings" msgstr "儲存設定" -#: kallithea/templates/admin/settings/settings_hooks.html:1 +#: kallithea/templates/admin/settings/settings_hooks.html:3 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:15 +#: kallithea/templates/admin/settings/settings_hooks.html:17 +#, fuzzy +msgid "Custom Hooks" +msgstr "自訂hook" + +#: kallithea/templates/admin/settings/settings_hooks.html:18 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." msgstr "" -#: kallithea/templates/admin/settings/settings_hooks.html:19 -#, fuzzy -msgid "Custom Hooks" -msgstr "自訂hook" - -#: kallithea/templates/admin/settings/settings_hooks.html:67 +#: kallithea/templates/admin/settings/settings_hooks.html:60 msgid "Failed to remove hook" msgstr "移除hook失敗" -#: kallithea/templates/admin/settings/settings_mapping.html:6 -msgid "Rescan option" -msgstr "" - -#: kallithea/templates/admin/settings/settings_mapping.html:11 +#: kallithea/templates/admin/settings/settings_mapping.html:4 +#, fuzzy +#| msgid "Description" +msgid "Rescan options" +msgstr "描述" + +#: kallithea/templates/admin/settings/settings_mapping.html:9 msgid "Delete records of missing repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:13 +#: kallithea/templates/admin/settings/settings_mapping.html:12 msgid "" -"Check this option to remove all comments, pull requests and other records" -" related to repositories that no longer exist in the filesystem." +"Check this option to remove all comments, pull requests and other records " +"related to repositories that no longer exist in the filesystem." msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:17 msgid "Invalidate cache for all repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:19 +#: kallithea/templates/admin/settings/settings_mapping.html:20 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:23 -msgid "Install Git hooks" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:25 -msgid "" -"Verify if Kallithea's Git hooks are installed for each repository. " -"Current hooks will be updated to the latest version." +msgid "Install Git hooks" msgstr "" #: kallithea/templates/admin/settings/settings_mapping.html:28 +msgid "" +"Verify if Kallithea's Git hooks are installed for each repository. " +"Current hooks will be updated to the latest version." +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:32 msgid "Overwrite existing Git hooks" msgstr "" -#: kallithea/templates/admin/settings/settings_mapping.html:30 -msgid "" -"If installing Git hooks, overwrite any existing hooks, even if they do " -"not seem to come from Kallithea. WARNING: This operation will destroy any" -" custom git hooks you may have deployed by hand!" -msgstr "" - #: kallithea/templates/admin/settings/settings_mapping.html:35 +msgid "" +"If installing Git hooks, overwrite any existing hooks, even if they do " +"not seem to come from Kallithea. WARNING: This operation will destroy any " +"custom git hooks you may have deployed by hand!" +msgstr "" + +#: kallithea/templates/admin/settings/settings_mapping.html:41 msgid "Rescan Repositories" msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:7 +#: kallithea/templates/admin/settings/settings_search.html:4 msgid "Index build option" msgstr "" +#: kallithea/templates/admin/settings/settings_search.html:9 +msgid "Build from scratch" +msgstr "" + #: kallithea/templates/admin/settings/settings_search.html:12 -msgid "Build from scratch" -msgstr "" - -#: kallithea/templates/admin/settings/settings_search.html:15 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." msgstr "" -#: kallithea/templates/admin/settings/settings_search.html:21 +#: kallithea/templates/admin/settings/settings_search.html:18 msgid "Reindex" msgstr "重新索引" -#: kallithea/templates/admin/settings/settings_system.html:4 +#: kallithea/templates/admin/settings/settings_system.html:2 +msgid "Checking for updates..." +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Kallithea version" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:4 -msgid "Check for updates" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:5 -msgid "Kallithea configuration file" -msgstr "" - -#: kallithea/templates/admin/settings/settings_system.html:6 -msgid "Python version" -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:7 -msgid "Platform" +msgid "Check for updates" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:8 -msgid "Git version" +msgid "Kallithea configuration file" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:9 -msgid "Git path" +msgid "Python version" msgstr "" #: kallithea/templates/admin/settings/settings_system.html:10 +msgid "Platform" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:11 +msgid "Git version" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:12 +msgid "Git path" +msgstr "" + +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Upgrade info endpoint" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:10 +#: kallithea/templates/admin/settings/settings_system.html:13 msgid "Note: please make sure this server can access this URL" msgstr "" -#: kallithea/templates/admin/settings/settings_system.html:15 -msgid "Checking for updates..." -msgstr "" - #: kallithea/templates/admin/settings/settings_system.html:23 msgid "Python Packages" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:6 -msgid "Web" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:11 -msgid "Require SSL for vcs operations" -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:13 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:24 +#: kallithea/templates/admin/settings/settings_vcs.html:9 msgid "Show repository size after push" msgstr "push 後顯示版本庫大小" -#: kallithea/templates/admin/settings/settings_vcs.html:28 +#: kallithea/templates/admin/settings/settings_vcs.html:15 msgid "Log user push commands" msgstr "紀錄使用者推送命令" -#: kallithea/templates/admin/settings/settings_vcs.html:32 +#: kallithea/templates/admin/settings/settings_vcs.html:21 msgid "Log user pull commands" msgstr "紀錄使用者抓取命令" -#: kallithea/templates/admin/settings/settings_vcs.html:36 +#: kallithea/templates/admin/settings/settings_vcs.html:27 msgid "Update repository after push (hg update)" msgstr "push後更新版本庫 (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:42 +#: kallithea/templates/admin/settings/settings_vcs.html:33 #, fuzzy msgid "Mercurial extensions" msgstr "Mercurial 版本庫" -#: kallithea/templates/admin/settings/settings_vcs.html:47 +#: kallithea/templates/admin/settings/settings_vcs.html:38 msgid "Enable largefiles extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:51 +#: kallithea/templates/admin/settings/settings_vcs.html:44 msgid "Enable hgsubversion extension" msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:53 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." msgstr "" -#: kallithea/templates/admin/settings/settings_vcs.html:64 +#: kallithea/templates/admin/settings/settings_vcs.html:59 #, fuzzy msgid "Location of repositories" msgstr "建立版本庫" -#: kallithea/templates/admin/settings/settings_vcs.html:69 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "" -"Click to unlock. You must restart Kallithea in order to make this setting" -" take effect." -msgstr "" - -#: kallithea/templates/admin/settings/settings_vcs.html:72 +"Click to unlock. You must restart Kallithea in order to make this setting " +"take effect." +msgstr "" + +#: kallithea/templates/admin/settings/settings_vcs.html:68 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:8 +#: kallithea/templates/admin/settings/settings_visual.html:4 msgid "General" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:13 +#: kallithea/templates/admin/settings/settings_visual.html:9 msgid "Use repository extra fields" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:15 +#: kallithea/templates/admin/settings/settings_visual.html:12 msgid "Allows storing additional customized fields per repository." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:18 +#: kallithea/templates/admin/settings/settings_visual.html:17 msgid "Show Kallithea version" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:20 -msgid "Shows or hides a version number of Kallithea displayed in the footer." -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:24 -msgid "Use Gravatars in Kallithea" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:30 +msgid "" +"Shows or hides a version number of Kallithea displayed in the footer." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:25 +msgid "Show user Gravatars" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:29 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4136,93 +3611,102 @@ msgid "" "network location/server host of running Kallithea server" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:42 +#: kallithea/templates/admin/settings/settings_visual.html:40 +#: kallithea/templates/summary/summary.html:63 +#, fuzzy +msgid "Clone URL" +msgstr "複製連結" + +#: kallithea/templates/admin/settings/settings_visual.html:43 msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " +"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/" +"{repo}'.\n" +" The following " "variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " +" {scheme} 'http' or " +"'https' sent from running Kallithea server,\n" +" {user} current user " +"username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to contruct clone-by-id" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:55 -msgid "Dashboard items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:59 +" {repoid} ID of " +"repository, can be used to construct clone-by-id" +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:54 +#, fuzzy +#| msgid "repositories" +msgid "Repository page size" +msgstr "個版本庫" + +#: kallithea/templates/admin/settings/settings_visual.html:57 msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." +"Number of items displayed in the repository pages before pagination is " +"shown." +msgstr "" + +#: kallithea/templates/admin/settings/settings_visual.html:62 +msgid "Admin page size" msgstr "" #: kallithea/templates/admin/settings/settings_visual.html:65 -msgid "Admin pages items" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:75 +#: kallithea/templates/admin/settings/settings_visual.html:70 msgid "Icons" msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Show public repository icon on repositories" msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:81 +msgid "Show private repository icon on repositories" +msgstr "" + #: kallithea/templates/admin/settings/settings_visual.html:84 -msgid "Show private repository icon on repositories" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "" -#: kallithea/templates/admin/settings/settings_visual.html:92 +#: kallithea/templates/admin/settings/settings_visual.html:89 #, fuzzy msgid "Meta Tagging" msgstr "設定" -#: kallithea/templates/admin/settings/settings_visual.html:97 -msgid "Stylify recognised meta tags:" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:111 +#: kallithea/templates/admin/settings/settings_visual.html:94 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." msgstr "" +#: kallithea/templates/admin/settings/settings_visual.html:98 +msgid "Stylify recognised meta tags:" +msgstr "" + #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:10 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/base/base.html:59 +#: kallithea/templates/base/base.html:79 msgid "User Groups" msgstr "" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:25 +#: kallithea/templates/admin/user_groups/user_groups.html:24 msgid "Add User Group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_add.html:44 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 +#: kallithea/templates/admin/user_groups/user_group_add.html:36 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 msgid "Short, optional description for this user group." msgstr "" @@ -4242,13 +3726,13 @@ msgid "User Group: %s" msgstr "" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 -#: kallithea/templates/admin/user_groups/user_groups.html:48 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 +#: kallithea/templates/admin/user_groups/user_groups.html:40 msgid "Members" msgstr "成員" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:174 +#: kallithea/templates/data_table/_dt_elements.html:102 #, python-format msgid "Confirm to delete this user group: %s" msgstr "" @@ -4257,15 +3741,15 @@ msgstr "" msgid "Delete this user group" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 msgid "No members yet" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 msgid "Chosen group members" msgstr "" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 msgid "Available members" msgstr "啟用的成員" @@ -4280,17 +3764,17 @@ msgstr "新增使用者" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:10 -#: kallithea/templates/base/base.html:62 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/base/base.html:58 msgid "Users" msgstr "使用者" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:24 +#: kallithea/templates/admin/users/users.html:23 msgid "Add User" msgstr "" -#: kallithea/templates/admin/users/user_add.html:50 +#: kallithea/templates/admin/users/user_add.html:41 msgid "Password confirmation" msgstr "" @@ -4309,12 +3793,12 @@ msgid "User: %s" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:42 +#: kallithea/templates/admin/users/user_edit_profile.html:32 msgid "Source of Record" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:53 +#: kallithea/templates/admin/users/users.html:41 msgid "Last Login" msgstr "" @@ -4323,7 +3807,7 @@ msgid "Member of User Groups" msgstr "" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:158 +#: kallithea/templates/data_table/_dt_elements.html:90 #, python-format msgid "Confirm to delete this user: %s" msgstr "" @@ -4332,24 +3816,16 @@ msgstr "" msgid "Delete this user" msgstr "" -#: kallithea/templates/admin/users/user_edit_ips.html:8 +#: kallithea/templates/admin/users/user_edit_ips.html:7 #, python-format msgid "Inherited from %s" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:8 -msgid "Change avatar at" -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:12 -msgid "Missing email, please update this user email address." -msgstr "" - -#: kallithea/templates/admin/users/user_edit_profile.html:51 +#: kallithea/templates/admin/users/user_edit_profile.html:39 msgid "Name in Source of Record" msgstr "" -#: kallithea/templates/admin/users/user_edit_profile.html:69 +#: kallithea/templates/admin/users/user_edit_profile.html:53 msgid "New password confirmation" msgstr "" @@ -4358,223 +3834,224 @@ msgstr "" msgid "Users Administration" msgstr "使用者管理員" -#: kallithea/templates/admin/users/users.html:56 +#: kallithea/templates/admin/users/users.html:44 msgid "Auth Type" msgstr "" -#: kallithea/templates/base/base.html:18 +#: kallithea/templates/base/base.html:16 #, python-format msgid "Server instance: %s" msgstr "" -#: kallithea/templates/base/base.html:30 +#: kallithea/templates/base/base.html:28 msgid "Support" msgstr "" -#: kallithea/templates/base/base.html:90 +#: kallithea/templates/base/base.html:86 +#: kallithea/templates/base/base.html:424 msgid "Mercurial repository" msgstr "Mercurial 版本庫" -#: kallithea/templates/base/base.html:93 +#: kallithea/templates/base/base.html:89 +#: kallithea/templates/base/base.html:427 msgid "Git repository" msgstr "Git 版本庫" -#: kallithea/templates/base/base.html:119 +#: kallithea/templates/base/base.html:115 msgid "Create Fork" msgstr "" -#: kallithea/templates/base/base.html:130 -#: kallithea/templates/data_table/_dt_elements.html:13 -#: kallithea/templates/data_table/_dt_elements.html:17 -#: kallithea/templates/summary/summary.html:8 +#: kallithea/templates/base/base.html:127 +#: kallithea/templates/summary/summary.html:9 msgid "Summary" msgstr "概況" -#: kallithea/templates/base/base.html:132 -#: kallithea/templates/base/base.html:134 -#: kallithea/templates/changelog/changelog.html:14 -#: kallithea/templates/data_table/_dt_elements.html:21 -#: kallithea/templates/data_table/_dt_elements.html:25 +#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:131 +#: kallithea/templates/changelog/changelog.html:16 msgid "Changelog" msgstr "修改紀錄" -#: kallithea/templates/base/base.html:136 -#: kallithea/templates/data_table/_dt_elements.html:29 -#: kallithea/templates/data_table/_dt_elements.html:33 +#: kallithea/templates/base/base.html:133 #: kallithea/templates/files/files.html:11 msgid "Files" msgstr "檔案" -#: kallithea/templates/base/base.html:138 -msgid "Switch To" -msgstr "" - -#: kallithea/templates/base/base.html:145 -#: kallithea/templates/base/base.html:147 +#: kallithea/templates/base/base.html:135 +#, python-format +msgid "Show Pull Requests for %s" +msgstr "" + +#: kallithea/templates/base/base.html:135 +msgid "Pull Requests" +msgstr "" + +#: kallithea/templates/base/base.html:146 +#: kallithea/templates/base/base.html:148 msgid "Options" msgstr "選項" -#: kallithea/templates/base/base.html:155 -#: kallithea/templates/forks/forks_data.html:21 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/forks/forks_data.html:18 msgid "Compare Fork" msgstr "" -#: kallithea/templates/base/base.html:157 -#: kallithea/templates/bookmarks/bookmarks.html:56 -#: kallithea/templates/bookmarks/bookmarks_data.html:13 -#: kallithea/templates/branches/branches.html:56 -#: kallithea/templates/branches/branches_data.html:13 -#: kallithea/templates/tags/tags.html:56 -#: kallithea/templates/tags/tags_data.html:13 +#: kallithea/templates/base/base.html:158 msgid "Compare" msgstr "" -#: kallithea/templates/base/base.html:159 -#: kallithea/templates/base/base.html:247 +#: kallithea/templates/base/base.html:160 +#: kallithea/templates/base/base.html:322 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:54 +#: kallithea/templates/search/search.html:67 msgid "Search" msgstr "搜尋" -#: kallithea/templates/base/base.html:163 +#: kallithea/templates/base/base.html:164 msgid "Unlock" msgstr "" -#: kallithea/templates/base/base.html:165 +#: kallithea/templates/base/base.html:166 msgid "Lock" msgstr "" -#: kallithea/templates/base/base.html:173 -msgid "Follow" -msgstr "" - #: kallithea/templates/base/base.html:174 +msgid "Follow" +msgstr "" + +#: kallithea/templates/base/base.html:175 msgid "Unfollow" msgstr "" -#: kallithea/templates/base/base.html:177 -#: kallithea/templates/data_table/_dt_elements.html:37 -#: kallithea/templates/data_table/_dt_elements.html:41 +#: kallithea/templates/base/base.html:178 #: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "分支" -#: kallithea/templates/base/base.html:178 -#: kallithea/templates/pullrequests/pullrequest.html:88 +#: kallithea/templates/base/base.html:179 +#: kallithea/templates/pullrequests/pullrequest.html:77 msgid "Create Pull Request" msgstr "" -#: kallithea/templates/base/base.html:183 -#, python-format -msgid "Show Pull Requests for %s" -msgstr "" - -#: kallithea/templates/base/base.html:221 +#: kallithea/templates/base/base.html:191 +msgid "Switch To" +msgstr "" + +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:452 +msgid "No matches found" +msgstr "" + +#: kallithea/templates/base/base.html:296 msgid "Show recent activity" msgstr "" -#: kallithea/templates/base/base.html:227 -#: kallithea/templates/base/base.html:228 +#: kallithea/templates/base/base.html:302 +#: kallithea/templates/base/base.html:303 msgid "Public journal" msgstr "公開日誌" -#: kallithea/templates/base/base.html:233 +#: kallithea/templates/base/base.html:308 msgid "Show public gists" msgstr "" -#: kallithea/templates/base/base.html:234 +#: kallithea/templates/base/base.html:309 msgid "Gists" msgstr "" -#: kallithea/templates/base/base.html:238 +#: kallithea/templates/base/base.html:313 msgid "All Public Gists" msgstr "" -#: kallithea/templates/base/base.html:240 +#: kallithea/templates/base/base.html:315 msgid "My Public Gists" msgstr "" -#: kallithea/templates/base/base.html:241 +#: kallithea/templates/base/base.html:316 msgid "My Private Gists" msgstr "" -#: kallithea/templates/base/base.html:246 +#: kallithea/templates/base/base.html:321 msgid "Search in repositories" msgstr "" -#: kallithea/templates/base/base.html:269 -#: kallithea/templates/base/base.html:270 +#: kallithea/templates/base/base.html:344 +#: kallithea/templates/base/base.html:345 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 msgid "My Pull Requests" msgstr "" -#: kallithea/templates/base/base.html:289 +#: kallithea/templates/base/base.html:360 msgid "Not Logged In" msgstr "" -#: kallithea/templates/base/base.html:296 +#: kallithea/templates/base/base.html:369 msgid "Login to Your Account" msgstr "" -#: kallithea/templates/base/base.html:319 -msgid "Forgot password ?" +#: kallithea/templates/base/base.html:379 +#, fuzzy +#| msgid "Forgot password ?" +msgid "Forgot password?" msgstr "忘記密碼?" -#: kallithea/templates/base/base.html:346 +#: kallithea/templates/base/base.html:383 +#, fuzzy +#| msgid "Don't have an account ?" +msgid "Don't have an account?" +msgstr "沒有帳號?" + +#: kallithea/templates/base/base.html:400 msgid "Log Out" msgstr "登出" -#: kallithea/templates/base/base.html:395 -msgid "No matches found" -msgstr "" - #: kallithea/templates/base/base.html:524 -msgid "Keyboard shortcuts" +msgid "Parent rev." msgstr "" #: kallithea/templates/base/base.html:533 -msgid "Site-wide shortcuts" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:14 +msgid "Child rev." +msgstr "" + +#: kallithea/templates/base/default_perms_box.html:11 #, fuzzy msgid "Inherit defaults" msgstr "個版本庫" -#: kallithea/templates/base/default_perms_box.html:19 +#: kallithea/templates/base/default_perms_box.html:15 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " "%s." msgstr "" -#: kallithea/templates/base/default_perms_box.html:28 +#: kallithea/templates/base/default_perms_box.html:23 msgid "Create repositories" msgstr "建立版本庫" +#: kallithea/templates/base/default_perms_box.html:27 +msgid "Select this option to allow repository creation for this user" +msgstr "" + #: kallithea/templates/base/default_perms_box.html:33 -msgid "Select this option to allow repository creation for this user" -msgstr "" - -#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "" -#: kallithea/templates/base/default_perms_box.html:45 +#: kallithea/templates/base/default_perms_box.html:37 msgid "Select this option to allow user group creation for this user" msgstr "" -#: kallithea/templates/base/default_perms_box.html:52 +#: kallithea/templates/base/default_perms_box.html:43 msgid "Fork repositories" msgstr "" -#: kallithea/templates/base/default_perms_box.html:57 +#: kallithea/templates/base/default_perms_box.html:47 msgid "Select this option to allow repository forking for this user" msgstr "" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:42 +#: kallithea/templates/changelog/changelog.html:41 msgid "Show" msgstr "顯示" @@ -4583,230 +4060,176 @@ msgid "No permissions defined yet" msgstr "" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:54 +#: kallithea/templates/base/perms_summary.html:55 msgid "Permission" msgstr "" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:56 +#: kallithea/templates/base/perms_summary.html:57 msgid "Edit Permission" msgstr "" -#: kallithea/templates/base/perms_summary.html:90 +#: kallithea/templates/base/perms_summary.html:92 msgid "No permission defined" msgstr "" -#: kallithea/templates/base/root.html:22 -#, fuzzy -msgid "Add Another Comment" -msgstr "" - -#: kallithea/templates/base/root.html:23 -#: kallithea/templates/data_table/_dt_elements.html:214 -msgid "Stop following this repository" -msgstr "停止追蹤這個版本庫" - -#: kallithea/templates/base/root.html:24 -msgid "Start following this repository" -msgstr "開始追蹤這個版本庫" - -#: kallithea/templates/base/root.html:25 -msgid "Group" -msgstr "群組" - -#: kallithea/templates/base/root.html:26 -msgid "members" -msgstr "成員" - -#: kallithea/templates/base/root.html:27 -msgid "Loading ..." -msgstr "" - #: kallithea/templates/base/root.html:28 -msgid "loading ..." +msgid "Retry" msgstr "" #: kallithea/templates/base/root.html:29 -msgid "Search truncated" +#: kallithea/templates/changeset/changeset_file_comment.html:65 +msgid "Submitting ..." msgstr "" #: kallithea/templates/base/root.html:30 -msgid "No matching files" -msgstr "" +#, fuzzy +#| msgid "Enable downloads" +msgid "Unable to post" +msgstr "啟用下載" #: kallithea/templates/base/root.html:31 -msgid "Open New Pull Request from {0}" +msgid "Add Another Comment" msgstr "" #: kallithea/templates/base/root.html:32 -msgid "Open New Pull Request for {0} → {1}" -msgstr "" +msgid "Stop following this repository" +msgstr "停止追蹤這個版本庫" #: kallithea/templates/base/root.html:33 -msgid "Show Selected Changesets {0} → {1}" -msgstr "" +msgid "Start following this repository" +msgstr "開始追蹤這個版本庫" #: kallithea/templates/base/root.html:34 -msgid "Selection Link" -msgstr "" +msgid "Group" +msgstr "群組" #: kallithea/templates/base/root.html:35 -#: kallithea/templates/changeset/diff_block.html:8 +msgid "Loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:36 +msgid "loading ..." +msgstr "" + +#: kallithea/templates/base/root.html:37 +msgid "Search truncated" +msgstr "" + +#: kallithea/templates/base/root.html:38 +msgid "No matching files" +msgstr "" + +#: kallithea/templates/base/root.html:39 +msgid "Open New Pull Request from {0}" +msgstr "" + +#: kallithea/templates/base/root.html:40 +msgid "Open New Pull Request for {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:41 +msgid "Show Selected Changesets {0} → {1}" +msgstr "" + +#: kallithea/templates/base/root.html:42 +msgid "Selection Link" +msgstr "" + +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/changeset/diff_block.html:7 #, fuzzy msgid "Collapse Diff" msgstr "檔案差異" -#: kallithea/templates/base/root.html:36 +#: kallithea/templates/base/root.html:44 #, fuzzy msgid "Expand Diff" msgstr "檔案差異" -#: kallithea/templates/base/root.html:37 +#: kallithea/templates/base/root.html:45 +#, fuzzy +msgid "No revisions" +msgstr "修訂" + +#: kallithea/templates/base/root.html:46 +msgid "Type name of user or member to grant permission" +msgstr "" + +#: kallithea/templates/base/root.html:47 msgid "Failed to revoke permission" msgstr "" -#: kallithea/templates/base/root.html:38 +#: kallithea/templates/base/root.html:48 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "" -#: kallithea/templates/base/root.html:39 -msgid "enabled" -msgstr "" - -#: kallithea/templates/base/root.html:40 -msgid "disabled" -msgstr "" - -#: kallithea/templates/base/root.html:42 +#: kallithea/templates/base/root.html:51 +#: kallithea/templates/compare/compare_diff.html:108 +msgid "Select changeset" +msgstr "" + +#: kallithea/templates/base/root.html:52 msgid "Specify changeset" msgstr "" -#: kallithea/templates/bookmarks/bookmarks.html:5 -#, python-format -msgid "%s Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:26 -msgid "Compare Bookmarks" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:53 -#: kallithea/templates/bookmarks/bookmarks_data.html:10 -#: kallithea/templates/branches/branches.html:53 -#: kallithea/templates/branches/branches_data.html:10 -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/templates/tags/tags.html:53 -#: kallithea/templates/tags/tags_data.html:10 -msgid "Author" -msgstr "" - -#: kallithea/templates/bookmarks/bookmarks.html:54 -#: kallithea/templates/bookmarks/bookmarks_data.html:12 -#: kallithea/templates/branches/branches.html:54 -#: kallithea/templates/branches/branches_data.html:12 -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/templates/tags/tags.html:54 -#: kallithea/templates/tags/tags_data.html:12 -msgid "Revision" -msgstr "修訂" - -#: kallithea/templates/branches/branches.html:5 -#, python-format -msgid "%s Branches" -msgstr "" - -#: kallithea/templates/branches/branches.html:26 -msgid "Compare Branches" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:6 +#: kallithea/templates/base/root.html:53 +msgid "Click to sort ascending" +msgstr "" + +#: kallithea/templates/base/root.html:54 +msgid "Click to sort descending" +msgstr "" + +#: kallithea/templates/base/root.html:55 +msgid "No records found." +msgstr "" + +#: kallithea/templates/base/root.html:56 +msgid "Data error." +msgstr "" + +#: kallithea/templates/base/root.html:57 +msgid "Loading..." +msgstr "" + +#: kallithea/templates/changelog/changelog.html:8 #, python-format msgid "%s Changelog" msgstr "" -#: kallithea/templates/changelog/changelog.html:21 +#: kallithea/templates/changelog/changelog.html:23 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" -#: kallithea/templates/changelog/changelog.html:49 +#: kallithea/templates/changelog/changelog.html:47 msgid "Clear selection" msgstr "" -#: kallithea/templates/changelog/changelog.html:55 +#: kallithea/templates/changelog/changelog.html:54 #, fuzzy msgid "Go to tip of repository" msgstr "Git 版本庫" -#: kallithea/templates/changelog/changelog.html:60 -#: kallithea/templates/forks/forks_data.html:19 +#: kallithea/templates/changelog/changelog.html:59 +#: kallithea/templates/forks/forks_data.html:16 #, python-format msgid "Compare fork with %s" msgstr "" -#: kallithea/templates/changelog/changelog.html:62 +#: kallithea/templates/changelog/changelog.html:61 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "" -#: kallithea/templates/changelog/changelog.html:66 +#: kallithea/templates/changelog/changelog.html:65 #: kallithea/templates/files/files.html:29 msgid "Branch filter:" msgstr "" -#: kallithea/templates/changelog/changelog.html:92 -#: kallithea/templates/changelog/changelog_summary_data.html:20 -#, python-format -msgid "" -"Changeset status: %s\n" -"Click to open associated pull request %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:96 -#: kallithea/templates/compare/compare_cs.html:24 -#, python-format -msgid "Changeset status: %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:115 -#: kallithea/templates/compare/compare_cs.html:63 -msgid "Expand commit message" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:124 -#: kallithea/templates/compare/compare_cs.html:30 -msgid "Changeset has comments" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:134 -#: kallithea/templates/changelog/changelog_summary_data.html:54 -#: kallithea/templates/changeset/changeset.html:94 -#: kallithea/templates/changeset/changeset_range.html:92 -#, python-format -msgid "Bookmark %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:140 -#: kallithea/templates/changelog/changelog_summary_data.html:60 -#: kallithea/templates/changeset/changeset.html:101 -#: kallithea/templates/changeset/changeset_range.html:98 -#, python-format -msgid "Tag %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:145 -#: kallithea/templates/changelog/changelog_summary_data.html:65 -#: kallithea/templates/changeset/changeset.html:106 -#: kallithea/templates/changeset/changeset_range.html:102 -#, python-format -msgid "Branch %s" -msgstr "" - -#: kallithea/templates/changelog/changelog.html:309 +#: kallithea/templates/changelog/changelog.html:221 msgid "There are no changes yet" msgstr "尚未有任何變更" @@ -4822,7 +4245,7 @@ msgstr "" #: kallithea/templates/changelog/changelog_details.html:6 #: kallithea/templates/changeset/changeset.html:79 -#: kallithea/templates/changeset/diff_block.html:79 +#: kallithea/templates/changeset/diff_block.html:38 msgid "Added" msgstr "" @@ -4836,39 +4259,60 @@ msgstr "" msgid "Affected %s files" msgstr "" -#: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:60 -#: kallithea/templates/files/files_delete.html:39 -#: kallithea/templates/files/files_edit.html:63 -msgid "Commit Message" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:9 -#: kallithea/templates/pullrequests/pullrequest_data.html:17 -msgid "Age" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:11 -msgid "Refs" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:81 -msgid "Add or upload files directly via Kallithea" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:84 -#: kallithea/templates/files/files_add.html:21 -#: kallithea/templates/files/files_ypjax.html:9 -msgid "Add New File" -msgstr "" - -#: kallithea/templates/changelog/changelog_summary_data.html:90 -#, fuzzy -msgid "Push new repository" -msgstr "私有版本庫" - -#: kallithea/templates/changelog/changelog_summary_data.html:98 -msgid "Existing repository?" +#: kallithea/templates/changelog/changelog_table.html:20 +msgid "First (oldest) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:22 +msgid "Last (most recent) changeset in this list" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:24 +msgid "Position in this list of changesets" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:35 +#, python-format +msgid "" +"Changeset status: %s by %s\n" +"Click to open associated pull request %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:41 +#, fuzzy, python-format +msgid "Changeset status: %s by %s" +msgstr "尚未有任何變更" + +#: kallithea/templates/changelog/changelog_table.html:60 +msgid "Expand commit message" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:76 +#, fuzzy, python-format +#| msgid "%s committed on %s" +msgid "%s comments" +msgstr "%s 評論於 %s" + +#: kallithea/templates/changelog/changelog_table.html:80 +#: kallithea/templates/changeset/changeset.html:63 +#: kallithea/templates/changeset/changeset_range.html:84 +#, python-format +msgid "Bookmark %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:83 +#: kallithea/templates/changeset/changeset.html:67 +#: kallithea/templates/changeset/changeset_range.html:90 +#: kallithea/templates/pullrequests/pullrequest_show.html:165 +#, python-format +msgid "Tag %s" +msgstr "" + +#: kallithea/templates/changelog/changelog_table.html:102 +#: kallithea/templates/changeset/changeset.html:71 +#: kallithea/templates/changeset/changeset_range.html:94 +#, python-format +msgid "Branch %s" msgstr "" #: kallithea/templates/changeset/changeset.html:8 @@ -4876,86 +4320,77 @@ msgstr "" msgid "%s Changeset" msgstr "" -#: kallithea/templates/changeset/changeset.html:36 -msgid "Parent rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:42 -msgid "Child rev." -msgstr "" - -#: kallithea/templates/changeset/changeset.html:50 -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/templates/changeset/changeset_range.html:48 +#: kallithea/templates/changeset/changeset.html:34 msgid "Changeset status" msgstr "" -#: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:27 -#: kallithea/templates/files/diff_2way.html:49 +#: kallithea/templates/changeset/changeset.html:43 +#: kallithea/templates/changeset/diff_block.html:64 +#: kallithea/templates/files/diff_2way.html:51 msgid "Raw diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:57 +#: kallithea/templates/changeset/changeset.html:46 msgid "Patch diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:30 -#: kallithea/templates/files/diff_2way.html:52 +#: kallithea/templates/changeset/changeset.html:49 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:54 msgid "Download diff" msgstr "" -#: kallithea/templates/changeset/changeset.html:89 -#: kallithea/templates/changeset/changeset_range.html:88 +#: kallithea/templates/changeset/changeset.html:59 +#: kallithea/templates/changeset/changeset_range.html:80 #, fuzzy msgid "Merge" msgstr "合併" -#: kallithea/templates/changeset/changeset.html:123 +#: kallithea/templates/changeset/changeset.html:96 msgid "Grafted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:129 +#: kallithea/templates/changeset/changeset.html:102 msgid "Transplanted from:" msgstr "" -#: kallithea/templates/changeset/changeset.html:135 +#: kallithea/templates/changeset/changeset.html:108 msgid "Replaced by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:149 +#: kallithea/templates/changeset/changeset.html:122 msgid "Preceded by:" msgstr "" -#: kallithea/templates/changeset/changeset.html:166 -#: kallithea/templates/compare/compare_diff.html:54 -#: kallithea/templates/pullrequests/pullrequest_show.html:318 +#: kallithea/templates/changeset/changeset.html:139 +#: kallithea/templates/compare/compare_diff.html:59 +#: kallithea/templates/pullrequests/pullrequest_show.html:290 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "" -#: kallithea/templates/changeset/changeset.html:168 -#: kallithea/templates/compare/compare_diff.html:56 -#: kallithea/templates/pullrequests/pullrequest_show.html:320 +#: kallithea/templates/changeset/changeset.html:141 +#: kallithea/templates/compare/compare_diff.html:61 +#: kallithea/templates/pullrequests/pullrequest_show.html:292 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" -#: kallithea/templates/changeset/changeset.html:182 -#: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/pullrequests/pullrequest_show.html:339 -#: kallithea/templates/pullrequests/pullrequest_show.html:363 +#: kallithea/templates/changeset/changeset.html:154 +#: kallithea/templates/changeset/changeset.html:173 +#: kallithea/templates/compare/compare_diff.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:309 +#: kallithea/templates/pullrequests/pullrequest_show.html:333 msgid "Show full diff anyway" msgstr "" -#: kallithea/templates/changeset/changeset.html:247 -#: kallithea/templates/changeset/changeset.html:284 +#: kallithea/templates/changeset/changeset_file_comment.html:20 #, fuzzy -msgid "No revisions" -msgstr "修訂" +#| msgid "%s committed on %s" +msgid "comment" +msgstr "%s 評論於 %s" #: kallithea/templates/changeset/changeset_file_comment.html:21 msgid "on pull request" @@ -4972,177 +4407,181 @@ msgid "on this changeset" msgstr "沒有修改" #: kallithea/templates/changeset/changeset_file_comment.html:30 -#, fuzzy msgid "Delete comment?" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:37 +#: kallithea/templates/changeset/changeset_file_comment.html:38 +#: kallithea/templates/changeset/changeset_file_comment.html:71 #, fuzzy msgid "Status change" msgstr "多個檔案修改" -#: kallithea/templates/changeset/changeset_file_comment.html:59 -msgid "Commenting on line {1}." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:60 -#: kallithea/templates/changeset/changeset_file_comment.html:148 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:62 -msgid "Use @username inside this text to notify another user" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:72 -#: kallithea/templates/changeset/changeset_file_comment.html:184 -msgid "Comment preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:77 -msgid "Submitting ..." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:80 -#: kallithea/templates/changeset/changeset_file_comment.html:190 +#: kallithea/templates/changeset/changeset_file_comment.html:87 +msgid "Comments are in plain text. Use @username to notify another user." +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:93 +#, fuzzy +msgid "Set changeset status" +msgstr "尚未有任何變更" + +#: kallithea/templates/changeset/changeset_file_comment.html:95 +msgid "Vote for pull request status" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:101 +#: kallithea/templates/changeset/diff_block.html:46 +#, fuzzy +msgid "No change" +msgstr "沒有修改" + +#: kallithea/templates/changeset/changeset_file_comment.html:114 +#, fuzzy +msgid "Finish pull request" +msgstr "文件內容" + +#: kallithea/templates/changeset/changeset_file_comment.html:117 +msgid "Close" +msgstr "" + +#: kallithea/templates/changeset/changeset_file_comment.html:129 msgid "Comment" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:82 -#: kallithea/templates/changeset/changeset_file_comment.html:191 -msgid "Preview" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "You need to be logged in to comment." msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:90 +#: kallithea/templates/changeset/changeset_file_comment.html:137 msgid "Login now" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:94 +#: kallithea/templates/changeset/changeset_file_comment.html:141 msgid "Hide" msgstr "" -#: kallithea/templates/changeset/changeset_file_comment.html:106 +#: kallithea/templates/changeset/changeset_file_comment.html:153 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" -#: kallithea/templates/changeset/changeset_file_comment.html:107 -#, fuzzy, python-format +#: kallithea/templates/changeset/changeset_file_comment.html:154 +#, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "" -#: kallithea/templates/changeset/changeset_file_comment.html:108 +#: kallithea/templates/changeset/changeset_file_comment.html:155 #, python-format msgid "%d general" msgid_plural "%d general" msgstr[0] "" -#: kallithea/templates/changeset/changeset_file_comment.html:150 -msgid "Use @username inside this text to notify another user." -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:157 -msgid "Vote for pull request status" -msgstr "" - -#: kallithea/templates/changeset/changeset_file_comment.html:159 -#, fuzzy -msgid "Set changeset status" -msgstr "尚未有任何變更" - -#: kallithea/templates/changeset/changeset_file_comment.html:163 -#, fuzzy -msgid "No change" -msgstr "沒有修改" - -#: kallithea/templates/changeset/changeset_file_comment.html:176 -msgid "Close" -msgstr "" - #: kallithea/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" msgstr "" -#: kallithea/templates/changeset/changeset_range.html:56 +#: kallithea/templates/changeset/changeset_range.html:43 +#, python-format +msgid "Changeset status: %s" +msgstr "" + +#: kallithea/templates/changeset/changeset_range.html:50 msgid "Files affected" msgstr "" -#: kallithea/templates/changeset/diff_block.html:21 -#: kallithea/templates/files/diff_2way.html:43 -msgid "Show full diff for this file" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:24 -#: kallithea/templates/changeset/diff_block.html:98 -#: kallithea/templates/files/diff_2way.html:46 -msgid "Show full side-by-side diff for this file" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:38 -msgid "Show inline comments" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:86 +#: kallithea/templates/changeset/diff_block.html:30 +msgid "No file before" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:33 +#, fuzzy +#| msgid "file removed" +msgid "File before" +msgstr "移除檔案" + +#: kallithea/templates/changeset/diff_block.html:40 +#, fuzzy +#| msgid "Unmodified" +msgid "Modified" +msgstr "未修改" + +#: kallithea/templates/changeset/diff_block.html:42 #, fuzzy msgid "Deleted" msgstr "刪除" -#: kallithea/templates/changeset/diff_block.html:89 +#: kallithea/templates/changeset/diff_block.html:44 #, fuzzy msgid "Renamed" msgstr "讀" -#: kallithea/templates/compare/compare_cs.html:4 +#: kallithea/templates/changeset/diff_block.html:48 +#, fuzzy, python-format +#| msgid "Unknown revision %s" +msgid "Unknown operation: %r" +msgstr "未知修訂 %s" + +#: kallithea/templates/changeset/diff_block.html:52 +#, fuzzy +#| msgid "New file type" +msgid "No file after" +msgstr "未知的存檔類型" + +#: kallithea/templates/changeset/diff_block.html:55 +#, fuzzy +#| msgid "file added" +msgid "File after" +msgstr "檔案新增" + +#: kallithea/templates/changeset/diff_block.html:60 +#: kallithea/templates/files/diff_2way.html:43 +msgid "Show full diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:62 +#: kallithea/templates/files/diff_2way.html:47 +msgid "Show full side-by-side diff for this file" +msgstr "" + +#: kallithea/templates/changeset/diff_block.html:72 +msgid "Show inline comments" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:5 msgid "No changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:8 -msgid "Ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:44 -msgid "First (oldest) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:46 -msgid "Last (most recent) changeset in this list" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:48 -msgid "Position in this list of changesets" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:76 +#: kallithea/templates/compare/compare_cs.html:12 +msgid "Criss cross merge situation with multiple merge ancestors detected!" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:15 +msgid "" +"Please merge the target branch to your branch before creating a pull " +"request." +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:19 +msgid "Merge Ancestor" +msgstr "" + +#: kallithea/templates/compare/compare_cs.html:40 msgid "Show merge diff" msgstr "" -#: kallithea/templates/compare/compare_cs.html:86 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -msgid "Common ancestor" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:90 -msgid "No common ancestor found - repositories are unrelated" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:98 +#: kallithea/templates/compare/compare_cs.html:54 msgid "is" msgstr "" -#: kallithea/templates/compare/compare_cs.html:99 -#, fuzzy, python-format +#: kallithea/templates/compare/compare_cs.html:55 +#, python-format msgid "%s changesets" msgstr "" -#: kallithea/templates/compare/compare_cs.html:100 +#: kallithea/templates/compare/compare_cs.html:56 #, fuzzy msgid "behind" msgstr "重新索引" @@ -5154,127 +4593,182 @@ msgid "%s Compare" msgstr "" #: kallithea/templates/compare/compare_diff.html:13 -#: kallithea/templates/compare/compare_diff.html:35 +#: kallithea/templates/compare/compare_diff.html:41 msgid "Compare Revisions" msgstr "" -#: kallithea/templates/compare/compare_diff.html:33 +#: kallithea/templates/compare/compare_diff.html:39 msgid "Swap" msgstr "" -#: kallithea/templates/compare/compare_diff.html:42 +#: kallithea/templates/compare/compare_diff.html:48 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "" -#: kallithea/templates/compare/compare_diff.html:47 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 +#: kallithea/templates/compare/compare_diff.html:53 +#: kallithea/templates/pullrequests/pullrequest_show.html:278 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "" -#: kallithea/templates/compare/compare_diff.html:78 -#: kallithea/templates/compare/compare_diff.html:89 +#: kallithea/templates/compare/compare_diff.html:95 msgid "Show full diff" msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:74 +#: kallithea/templates/data_table/_dt_elements.html:23 msgid "Public repository" msgstr "公開的版本庫" -#: kallithea/templates/data_table/_dt_elements.html:84 +#: kallithea/templates/data_table/_dt_elements.html:29 msgid "Repository creation in progress..." msgstr "" -#: kallithea/templates/data_table/_dt_elements.html:98 +#: kallithea/templates/data_table/_dt_elements.html:42 msgid "No changesets yet" msgstr "尚未有任何變更" -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/templates/data_table/_dt_elements.html:107 +#: kallithea/templates/data_table/_dt_elements.html:48 +#: kallithea/templates/data_table/_dt_elements.html:50 #, python-format msgid "Subscribe to %s rss feed" msgstr "訂閱 %s rss" -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:115 +#: kallithea/templates/data_table/_dt_elements.html:56 +#: kallithea/templates/data_table/_dt_elements.html:58 #, python-format msgid "Subscribe to %s atom feed" msgstr "訂閱 %s atom" -#: kallithea/templates/data_table/_dt_elements.html:139 +#: kallithea/templates/data_table/_dt_elements.html:76 msgid "Creating" msgstr "" -#: kallithea/templates/email_templates/changeset_comment.html:5 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:7 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "" - -#: kallithea/templates/email_templates/changeset_comment.html:12 -msgid "The changeset status was changed to" -msgstr "" - -#: kallithea/templates/email_templates/main.html:6 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "" - -#: kallithea/templates/email_templates/password_reset.html:4 +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, python-format +msgid "Mention in Comment on Changeset \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/changeset_comment.html:4 +#, fuzzy, python-format +#| msgid "Set changeset status" +msgid "Comment on Changeset \"%s\"" +msgstr "尚未有任何變更" + +#: kallithea/templates/email_templates/changeset_comment.html:20 +#, fuzzy +#| msgid "Changesets" +msgid "Changeset on" +msgstr "變更" + +#: kallithea/templates/email_templates/changeset_comment.html:23 +#: kallithea/templates/email_templates/pull_request.html:22 +#: kallithea/templates/email_templates/pull_request.html:28 +#: kallithea/templates/email_templates/pull_request_comment.html:30 +#: kallithea/templates/email_templates/pull_request_comment.html:36 +#, fuzzy +#| msgid "Branches" +msgid "branch" +msgstr "分支" + +#: kallithea/templates/email_templates/changeset_comment.html:29 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/email_templates/pull_request_comment.html:23 +msgid "by" +msgstr "" + +#: kallithea/templates/email_templates/comment.html:27 +#, fuzzy +#| msgid "Status change" +msgid "Status change:" +msgstr "多個檔案修改" + +#: kallithea/templates/email_templates/comment.html:33 +#, fuzzy +#| msgid "Repository has been locked" +msgid "The pull request has been closed." +msgstr "儲存所已被鎖定" + +#: kallithea/templates/email_templates/password_reset.html:9 #, python-format msgid "Hello %s" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:6 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "We have received a request to reset the password for your account." msgstr "" -#: kallithea/templates/email_templates/password_reset.html:7 +#: kallithea/templates/email_templates/password_reset.html:25 +msgid "" +"This account is however managed outside this system and the password " +"cannot be changed here." +msgstr "" + +#: kallithea/templates/email_templates/password_reset.html:28 msgid "To set a new password, click the following link" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:10 +#: kallithea/templates/email_templates/password_reset.html:33 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" msgstr "" -#: kallithea/templates/email_templates/password_reset.html:12 +#: kallithea/templates/email_templates/password_reset.html:44 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." msgstr "" -#: kallithea/templates/email_templates/pull_request.html:5 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request.html:7 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Mention on Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:4 +#, python-format +msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/email_templates/pull_request_comment.html:20 +#, fuzzy +#| msgid "Pull request %s" +msgid "Pull request" +msgstr "提取要求 %s" + +#: kallithea/templates/email_templates/pull_request.html:19 +#: kallithea/templates/email_templates/pull_request_comment.html:27 +msgid "from" +msgstr "" + +#: kallithea/templates/email_templates/pull_request.html:25 +#: kallithea/templates/email_templates/pull_request_comment.html:33 +msgid "to" msgstr "" #: kallithea/templates/email_templates/pull_request_comment.html:4 #, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:9 -msgid "The comment closed the pull request with status" -msgstr "" - -#: kallithea/templates/email_templates/pull_request_comment.html:11 -msgid "The comment was made with status" -msgstr "" - -#: kallithea/templates/email_templates/registration.html:6 -msgid "View this user here" -msgstr "" +msgid "Mention in Comment on Pull Request %s \"%s\"" +msgstr "" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s" +msgid "Pull Request %s \"%s\" Closed" +msgstr "提取要求 %s" + +#: kallithea/templates/email_templates/pull_request_comment.html:4 +#, fuzzy, python-format +#| msgid "Pull request %s" +msgid "Comment on Pull Request %s \"%s\"" +msgstr "提取要求 %s" + +#: kallithea/templates/email_templates/registration.html:22 +#, fuzzy +#| msgid "Group name" +msgid "Full Name" +msgstr "群組名稱" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5292,7 +4786,7 @@ msgid "%s File Diff" msgstr "" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:80 +#: kallithea/templates/files/files.html:77 #, python-format msgid "%s Files" msgstr "" @@ -5302,74 +4796,76 @@ msgstr "" msgid "%s Files Add" msgstr "" -#: kallithea/templates/files/files_add.html:40 -#: kallithea/templates/files/files_edit.html:38 +#: kallithea/templates/files/files_add.html:21 +#: kallithea/templates/files/files_ypjax.html:9 +#: kallithea/templates/summary/summary.html:191 +msgid "Add New File" +msgstr "" + +#: kallithea/templates/files/files_add.html:39 +#: kallithea/templates/files/files_edit.html:39 #: kallithea/templates/files/files_ypjax.html:3 msgid "Location" msgstr "位置" -#: kallithea/templates/files/files_add.html:42 +#: kallithea/templates/files/files_add.html:41 msgid "Enter filename..." msgstr "" -#: kallithea/templates/files/files_add.html:44 -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:43 +#: kallithea/templates/files/files_add.html:47 msgid "or" msgstr "" -#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:43 msgid "Upload File" msgstr "" -#: kallithea/templates/files/files_add.html:48 +#: kallithea/templates/files/files_add.html:47 msgid "Create New File" msgstr "" #: kallithea/templates/files/files_add.html:53 -msgid "New file mode" -msgstr "" +#, fuzzy +msgid "New file type" +msgstr "未知的存檔類型" #: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_delete.html:34 #: kallithea/templates/files/files_edit.html:67 +msgid "Commit Message" +msgstr "" + +#: kallithea/templates/files/files_add.html:68 +#: kallithea/templates/files/files_delete.html:40 +#: kallithea/templates/files/files_edit.html:71 #, fuzzy msgid "Commit Changes" msgstr "遞交修改" -#: kallithea/templates/files/files_browser.html:33 -msgid "Previous revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:35 -msgid "Next revision" -msgstr "" - -#: kallithea/templates/files/files_browser.html:41 -msgid "Follow current branch" -msgstr "" - -#: kallithea/templates/files/files_browser.html:44 +#: kallithea/templates/files/files_browser.html:37 msgid "Search File List" msgstr "" -#: kallithea/templates/files/files_browser.html:48 +#: kallithea/templates/files/files_browser.html:42 msgid "Loading file list..." msgstr "載入檔案列表..." -#: kallithea/templates/files/files_browser.html:61 +#: kallithea/templates/files/files_browser.html:52 +#: kallithea/templates/summary/summary.html:145 msgid "Size" msgstr "大小" -#: kallithea/templates/files/files_browser.html:62 +#: kallithea/templates/files/files_browser.html:53 msgid "Last Revision" msgstr "" -#: kallithea/templates/files/files_browser.html:63 +#: kallithea/templates/files/files_browser.html:54 #, fuzzy msgid "Last Modified" msgstr "最後修改" -#: kallithea/templates/files/files_browser.html:64 +#: kallithea/templates/files/files_browser.html:55 #, fuzzy msgid "Last Committer" msgstr "最後的遞交者" @@ -5380,7 +4876,7 @@ msgid "%s Files Delete" msgstr "" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:31 +#: kallithea/templates/files/files_delete.html:30 msgid "Delete file" msgstr "" @@ -5393,75 +4889,80 @@ msgstr "" msgid "Edit file" msgstr "" -#: kallithea/templates/files/files_edit.html:48 -#: kallithea/templates/files/files_source.html:32 +#: kallithea/templates/files/files_edit.html:51 +#: kallithea/templates/files/files_source.html:28 msgid "Show Annotation" msgstr "" -#: kallithea/templates/files/files_edit.html:50 -#: kallithea/templates/files/files_source.html:35 -msgid "Download as Raw" -msgstr "" - #: kallithea/templates/files/files_edit.html:53 +#: kallithea/templates/files/files_source.html:31 +msgid "Download as Raw" +msgstr "" + +#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "" -#: kallithea/templates/files/files_edit.html:58 -msgid "Editing file" -msgstr "" - #: kallithea/templates/files/files_history_box.html:2 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "" -#: kallithea/templates/files/files_source.html:7 +#: kallithea/templates/files/files_source.html:6 msgid "Diff to Revision" msgstr "" -#: kallithea/templates/files/files_source.html:8 +#: kallithea/templates/files/files_source.html:7 msgid "Show at Revision" msgstr "" +#: kallithea/templates/files/files_source.html:9 +msgid "Show Full History" +msgstr "" + #: kallithea/templates/files/files_source.html:10 -msgid "Show Full History" -msgstr "" - -#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "" -#: kallithea/templates/files/files_source.html:30 +#: kallithea/templates/files/files_source.html:26 msgid "Show Source" msgstr "" -#: kallithea/templates/files/files_source.html:38 -#, python-format -msgid "Edit on Branch:%s" +#: kallithea/templates/files/files_source.html:34 +#, python-format +msgid "Edit on Branch: %s" +msgstr "" + +#: kallithea/templates/files/files_source.html:37 +msgid "Editing binary files not allowed" +msgstr "" + +#: kallithea/templates/files/files_source.html:40 +msgid "Editing files allowed only when on branch head revision" msgstr "" #: kallithea/templates/files/files_source.html:41 -msgid "Editing binary files not allowed" -msgstr "" - -#: kallithea/templates/files/files_source.html:44 -msgid "Editing files allowed only when on branch head revision" -msgstr "" - -#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" -#: kallithea/templates/files/files_source.html:63 +#: kallithea/templates/files/files_source.html:58 #, python-format msgid "Binary file (%s)" msgstr "二進位檔 (%s)" +#: kallithea/templates/files/files_source.html:69 +#, fuzzy +msgid "File is too big to display." +msgstr "顯示的檔案太大" + +#: kallithea/templates/files/files_source.html:71 +msgid "Show full annotation anyway." +msgstr "" + #: kallithea/templates/files/files_source.html:73 -msgid "File is too big to display" -msgstr "顯示的檔案太大" +msgid "Show as raw." +msgstr "" #: kallithea/templates/files/files_ypjax.html:5 msgid "annotation" @@ -5481,12 +4982,12 @@ msgid "%s Followers" msgstr "" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:142 -#: kallithea/templates/summary/summary.html:143 +#: kallithea/templates/summary/summary.html:130 +#: kallithea/templates/summary/summary.html:131 msgid "Followers" msgstr "追蹤者" -#: kallithea/templates/followers/followers_data.html:12 +#: kallithea/templates/followers/followers_data.html:9 msgid "Started following -" msgstr "" @@ -5495,35 +4996,35 @@ msgstr "" msgid "Fork repository %s" msgstr "" -#: kallithea/templates/forks/fork.html:27 +#: kallithea/templates/forks/fork.html:25 msgid "Fork name" msgstr "分支名稱" -#: kallithea/templates/forks/fork.html:62 +#: kallithea/templates/forks/fork.html:53 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" -#: kallithea/templates/forks/fork.html:68 +#: kallithea/templates/forks/fork.html:58 msgid "Private" msgstr "私有" -#: kallithea/templates/forks/fork.html:77 +#: kallithea/templates/forks/fork.html:66 msgid "Copy permissions" msgstr "" -#: kallithea/templates/forks/fork.html:81 +#: kallithea/templates/forks/fork.html:69 msgid "Copy permissions from forked repository" msgstr "" -#: kallithea/templates/forks/fork.html:87 +#: kallithea/templates/forks/fork.html:75 msgid "Update after clone" msgstr "" -#: kallithea/templates/forks/fork.html:91 +#: kallithea/templates/forks/fork.html:78 msgid "Checkout source after making a clone" msgstr "" -#: kallithea/templates/forks/fork.html:96 +#: kallithea/templates/forks/fork.html:85 msgid "Fork this Repository" msgstr "" @@ -5533,40 +5034,40 @@ msgid "%s Forks" msgstr "" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:148 -#: kallithea/templates/summary/summary.html:149 +#: kallithea/templates/summary/summary.html:136 +#: kallithea/templates/summary/summary.html:137 msgid "Forks" msgstr "" -#: kallithea/templates/forks/forks_data.html:17 +#: kallithea/templates/forks/forks_data.html:14 msgid "Forked" msgstr "" -#: kallithea/templates/forks/forks_data.html:30 +#: kallithea/templates/forks/forks_data.html:24 msgid "There are no forks yet" msgstr "尚未有任何 fork" -#: kallithea/templates/journal/journal.html:21 +#: kallithea/templates/journal/journal.html:22 msgid "ATOM journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:22 +#: kallithea/templates/journal/journal.html:23 msgid "RSS journal feed" msgstr "" -#: kallithea/templates/journal/journal.html:56 +#: kallithea/templates/journal/journal.html:34 msgid "My Repositories" msgstr "" -#: kallithea/templates/journal/journal_data.html:43 +#: kallithea/templates/journal/journal_data.html:42 msgid "No entries yet" msgstr "" -#: kallithea/templates/journal/public_journal.html:13 +#: kallithea/templates/journal/public_journal.html:10 msgid "ATOM public journal feed" msgstr "" -#: kallithea/templates/journal/public_journal.html:14 +#: kallithea/templates/journal/public_journal.html:11 msgid "RSS public journal feed" msgstr "" @@ -5575,31 +5076,36 @@ msgstr "" msgid "New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:31 +#: kallithea/templates/pullrequests/pullrequest.html:26 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:54 +#: kallithea/templates/pullrequests/pullrequest_show.html:52 msgid "Title" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:34 +#: kallithea/templates/pullrequests/pullrequest.html:28 msgid "Summarize the changes - or leave empty" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:43 -#: kallithea/templates/pullrequests/pullrequest_show.html:66 +#: kallithea/templates/pullrequests/pullrequest.html:35 +#: kallithea/templates/pullrequests/pullrequest_show.html:61 msgid "Write a short description on this pull request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:49 +#: kallithea/templates/pullrequests/pullrequest.html:40 msgid "Changeset flow" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:56 +#: kallithea/templates/pullrequests/pullrequest.html:46 msgid "Origin repository" msgstr "" -#: kallithea/templates/pullrequests/pullrequest.html:72 +#: kallithea/templates/pullrequests/pullrequest.html:52 +#: kallithea/templates/pullrequests/pullrequest.html:68 +msgid "Revision" +msgstr "修訂" + +#: kallithea/templates/pullrequests/pullrequest.html:62 msgid "Destination repository" msgstr "" @@ -5612,6 +5118,10 @@ msgstr "" msgid "Vote" msgstr "遠端" +#: kallithea/templates/pullrequests/pullrequest_data.html:17 +msgid "Age" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_data.html:18 msgid "From" msgstr "" @@ -5635,7 +5145,7 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:83 +#: kallithea/templates/pullrequests/pullrequest_show.html:73 msgid "Closed" msgstr "" @@ -5648,7 +5158,7 @@ msgid "Confirm to delete this pull reque msgstr "" #: kallithea/templates/pullrequests/pullrequest_data.html:70 -#, fuzzy, python-format +#, python-format msgid "Confirm again to delete this pull request with %s comments" msgstr "" @@ -5662,111 +5172,101 @@ msgstr "" msgid "Pull request %s from %s#%s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:57 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 #, fuzzy msgid "Summarize the changes" msgstr "遞交修改" -#: kallithea/templates/pullrequests/pullrequest_show.html:74 -msgid "Reviewer voting result" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/templates/pullrequests/pullrequest_show.html:81 +#: kallithea/templates/pullrequests/pullrequest_show.html:67 +msgid "Voting Result" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:70 +#: kallithea/templates/pullrequests/pullrequest_show.html:71 msgid "Pull request status calculated from votes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:93 -msgid "Still not reviewed by" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#, python-format -msgid "%d reviewer" -msgid_plural "%d reviewers" -msgstr[0] "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:99 -msgid "Pull request was reviewed by all reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:101 -#, fuzzy -msgid "There are no reviewers" -msgstr "沒有任何分支" - -#: kallithea/templates/pullrequests/pullrequest_show.html:107 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Origin" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:113 +#: kallithea/templates/pullrequests/pullrequest_show.html:86 #, fuzzy msgid "on" msgstr "無" -#: kallithea/templates/pullrequests/pullrequest_show.html:120 +#: kallithea/templates/pullrequests/pullrequest_show.html:92 msgid "Target" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:124 +#: kallithea/templates/pullrequests/pullrequest_show.html:95 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:133 +#: kallithea/templates/pullrequests/pullrequest_show.html:103 msgid "Pull changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:173 -#, fuzzy -msgid "Update" -msgstr "時間" - -#: kallithea/templates/pullrequests/pullrequest_show.html:191 -msgid "Current revision - no change" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:213 -msgid "Pull Request Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:238 +#: kallithea/templates/pullrequests/pullrequest_show.html:136 #, fuzzy -msgid "Remove reviewer" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:250 -msgid "Type name of reviewer to add" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:258 -#, fuzzy -msgid "Potential Reviewers" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:261 -msgid "Click to add the repository owner as reviewer:" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:284 +#| msgid "Registration" +msgid "Next iteration" +msgstr "註冊" + +#: kallithea/templates/pullrequests/pullrequest_show.html:153 +msgid "Current revision - no change" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:177 +msgid "" +"Pull request iterations do not change content once created. Select a " +"revision to create a new iteration." +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:187 msgid "Save Changes" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show.html:285 -msgid "Save as New Pull Request" -msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:286 +#: kallithea/templates/pullrequests/pullrequest_show.html:188 +msgid "Create New Iteration with Changes" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:189 #, fuzzy msgid "Cancel Changes" msgstr "沒有修改" -#: kallithea/templates/pullrequests/pullrequest_show.html:296 +#: kallithea/templates/pullrequests/pullrequest_show.html:197 +msgid "Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:223 +msgid "Remove reviewer" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:234 +msgid "Type name of reviewer to add" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:240 +msgid "Potential Reviewers" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:243 +msgid "Click to add the repository owner as reviewer:" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show.html:268 #, fuzzy msgid "Pull Request Content" msgstr "文件內容" +#: kallithea/templates/pullrequests/pullrequest_show.html:283 +msgid "Common ancestor" +msgstr "" + #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -5774,44 +5274,47 @@ msgstr "" #: kallithea/templates/pullrequests/pullrequest_show_all.html:11 #, fuzzy, python-format -#| msgid "Pull request %s" msgid "Pull Requests from '%s'" -msgstr "提取要求 %s" +msgstr "文件內容" #: kallithea/templates/pullrequests/pullrequest_show_all.html:13 #, python-format msgid "Pull Requests to '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 msgid "Open New Pull Request" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 #, python-format msgid "Show Pull Requests to %s" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 #, python-format msgid "Show Pull Requests from '%s'" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 msgid "Pull Requests Created by Me" msgstr "" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 +msgid "Pull Requests Needing My Review" +msgstr "" + +#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 msgid "Pull Requests I Participate In" msgstr "" @@ -5826,29 +5329,29 @@ msgstr "" msgid "Search in All Repositories" msgstr "Mercurial 版本庫" -#: kallithea/templates/search/search.html:50 +#: kallithea/templates/search/search.html:47 msgid "Search term" msgstr "搜尋關鍵字" -#: kallithea/templates/search/search.html:62 +#: kallithea/templates/search/search.html:54 msgid "Search in" msgstr "搜尋範圍" -#: kallithea/templates/search/search.html:65 +#: kallithea/templates/search/search.html:56 msgid "File contents" msgstr "文件內容" -#: kallithea/templates/search/search.html:66 +#: kallithea/templates/search/search.html:57 msgid "Commit messages" msgstr "" -#: kallithea/templates/search/search.html:67 +#: kallithea/templates/search/search.html:58 msgid "File names" msgstr "檔案名稱" -#: kallithea/templates/search/search_commit.html:35 -#: kallithea/templates/search/search_content.html:21 -#: kallithea/templates/search/search_path.html:15 +#: kallithea/templates/search/search_commit.html:29 +#: kallithea/templates/search/search_content.html:17 +#: kallithea/templates/search/search_path.html:14 msgid "Permission denied" msgstr "權限不足" @@ -5858,80 +5361,80 @@ msgid "%s Statistics" msgstr "" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:39 +#: kallithea/templates/summary/summary.html:36 #, python-format msgid "%s ATOM feed" msgstr "" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:40 +#: kallithea/templates/summary/summary.html:37 #, python-format msgid "%s RSS feed" msgstr "" -#: kallithea/templates/summary/statistics.html:36 -#: kallithea/templates/summary/summary.html:100 -#: kallithea/templates/summary/summary.html:116 +#: kallithea/templates/summary/statistics.html:35 +#: kallithea/templates/summary/summary.html:91 +#: kallithea/templates/summary/summary.html:105 msgid "Enable" msgstr "" -#: kallithea/templates/summary/statistics.html:39 +#: kallithea/templates/summary/statistics.html:38 msgid "Stats gathered: " msgstr "" -#: kallithea/templates/summary/statistics.html:89 -#: kallithea/templates/summary/summary.html:349 +#: kallithea/templates/summary/statistics.html:87 +#: kallithea/templates/summary/summary.html:354 msgid "files" msgstr "檔案" -#: kallithea/templates/summary/statistics.html:113 -#: kallithea/templates/summary/summary.html:373 +#: kallithea/templates/summary/statistics.html:111 +#: kallithea/templates/summary/summary.html:384 msgid "Show more" msgstr "" -#: kallithea/templates/summary/statistics.html:390 +#: kallithea/templates/summary/statistics.html:405 msgid "commits" msgstr "遞交" -#: kallithea/templates/summary/statistics.html:391 +#: kallithea/templates/summary/statistics.html:406 msgid "files added" msgstr "多個檔案新增" -#: kallithea/templates/summary/statistics.html:392 +#: kallithea/templates/summary/statistics.html:407 msgid "files changed" msgstr "多個檔案修改" -#: kallithea/templates/summary/statistics.html:393 +#: kallithea/templates/summary/statistics.html:408 msgid "files removed" msgstr "移除多個檔案" -#: kallithea/templates/summary/statistics.html:395 +#: kallithea/templates/summary/statistics.html:410 msgid "commit" msgstr "遞交" -#: kallithea/templates/summary/statistics.html:396 +#: kallithea/templates/summary/statistics.html:411 msgid "file added" msgstr "檔案新增" -#: kallithea/templates/summary/statistics.html:397 +#: kallithea/templates/summary/statistics.html:412 msgid "file changed" msgstr "檔案修改" -#: kallithea/templates/summary/statistics.html:398 +#: kallithea/templates/summary/statistics.html:413 msgid "file removed" msgstr "移除檔案" -#: kallithea/templates/summary/summary.html:4 +#: kallithea/templates/summary/summary.html:5 #, python-format msgid "%s Summary" msgstr "" -#: kallithea/templates/summary/summary.html:13 +#: kallithea/templates/summary/summary.html:14 #, python-format msgid "Repository locked by %s" msgstr "" -#: kallithea/templates/summary/summary.html:15 +#: kallithea/templates/summary/summary.html:16 msgid "Repository unlocked" msgstr "" @@ -5939,227 +5442,151 @@ msgstr "" msgid "Fork of" msgstr "" -#: kallithea/templates/summary/summary.html:29 +#: kallithea/templates/summary/summary.html:27 msgid "Clone from" msgstr "複製由" -#: kallithea/templates/summary/summary.html:72 -#, fuzzy -msgid "Clone URL" -msgstr "複製連結" - -#: kallithea/templates/summary/summary.html:78 +#: kallithea/templates/summary/summary.html:68 +msgid "Show by ID" +msgstr "" + +#: kallithea/templates/summary/summary.html:73 msgid "Show by Name" msgstr "" -#: kallithea/templates/summary/summary.html:79 -msgid "Show by ID" -msgstr "" - -#: kallithea/templates/summary/summary.html:92 +#: kallithea/templates/summary/summary.html:84 msgid "Trending files" msgstr "" -#: kallithea/templates/summary/summary.html:108 +#: kallithea/templates/summary/summary.html:98 msgid "Download" msgstr "下載" -#: kallithea/templates/summary/summary.html:112 +#: kallithea/templates/summary/summary.html:101 msgid "There are no downloads yet" msgstr "沒有任何下載" -#: kallithea/templates/summary/summary.html:114 +#: kallithea/templates/summary/summary.html:103 msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: kallithea/templates/summary/summary.html:120 +#: kallithea/templates/summary/summary.html:109 msgid "Download as zip" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:113 msgid "Check this to download archive with subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:125 +#: kallithea/templates/summary/summary.html:115 msgid "With subrepos" msgstr "" -#: kallithea/templates/summary/summary.html:156 -msgid "Repository Size" -msgstr "" - -#: kallithea/templates/summary/summary.html:163 -#: kallithea/templates/summary/summary.html:165 +#: kallithea/templates/summary/summary.html:153 +#: kallithea/templates/summary/summary.html:155 msgid "Feed" msgstr "" -#: kallithea/templates/summary/summary.html:186 +#: kallithea/templates/summary/summary.html:175 #, fuzzy msgid "Latest Changes" msgstr "多個檔案修改" -#: kallithea/templates/summary/summary.html:188 +#: kallithea/templates/summary/summary.html:177 #, fuzzy msgid "Quick Start" msgstr "快速過濾..." -#: kallithea/templates/summary/summary.html:202 +#: kallithea/templates/summary/summary.html:188 +msgid "Add or upload files directly via Kallithea" +msgstr "" + +#: kallithea/templates/summary/summary.html:196 +#, fuzzy +msgid "Push new repository" +msgstr "私有版本庫" + +#: kallithea/templates/summary/summary.html:204 +msgid "Existing repository?" +msgstr "" + +#: kallithea/templates/summary/summary.html:222 #, python-format msgid "Readme file from revision %s:%s" msgstr "" -#: kallithea/templates/summary/summary.html:293 +#: kallithea/templates/summary/summary.html:298 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: kallithea/templates/tags/tags.html:5 -#, python-format -msgid "%s Tags" -msgstr "" - -#: kallithea/templates/tags/tags.html:26 -msgid "Compare Tags" -msgstr "" - -#~ msgid "No comments." -#~ msgstr "" - -#~ msgid "public journal" -#~ msgstr "" +#~ msgid "There is no index to search in. Please run whoosh indexer" +#~ msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" + +#, fuzzy +#~| msgid "Repository group" +#~ msgid "Repository Group" +#~ msgstr "版本庫群組" + +#~ msgid "Home" +#~ msgstr "首頁" + +#~ msgid "members" +#~ msgstr "成員" + +#, fuzzy +#~| msgid "Pull request %s" +#~ msgid "Pull request from" +#~ msgstr "提取要求 %s" + +#, fuzzy +#~| msgid "Date" +#~ msgid "at" +#~ msgstr "時間" + +#, fuzzy +#~ msgid "There are no reviewers" +#~ msgstr "沒有任何分支" + +#~ msgid "Dashboard" +#~ msgstr "儀表板" + +#~ msgid "Change your avatar at" +#~ msgstr "修改您的頭像於" + +#~ msgid "Using" +#~ msgstr "使用中" + +#~ msgid "quick filter..." +#~ msgstr "快速過濾..." + +#~ msgid "Forgot password ?" +#~ msgstr "忘記密碼?" #~ msgid "journal" #~ msgstr "日誌" -#~ msgid "bad captcha" -#~ msgstr "" - -#~ msgid "forever" -#~ msgstr "" - -#~ msgid "unmodified" -#~ msgstr "" - -#~ msgid "Cannot delete %s it still contains attached forks" -#~ msgstr "" - -#~ msgid "Locked repository" -#~ msgstr "" - -#~ msgid "Unlocked repository" -#~ msgstr "" - -#~ msgid "Unlocked" -#~ msgstr "" - -#~ msgid "Locked" -#~ msgstr "" - -#~ msgid "Repository has been %s" -#~ msgstr "" - #~ msgid "You can't edit this user" #~ msgstr "您無法編輯這位使用者" -#~ msgid "compare view" -#~ msgstr "" - -#~ msgid "fork name %s" -#~ msgstr "" - -#~ msgid "Pull request #%s" -#~ msgstr "" - #~ msgid "No Files" #~ msgstr "沒有檔案" -#~ msgid "" -#~ msgstr "" - -#~ msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -#~ msgstr "" - -#~ msgid "Username \"%(username)s\" is forbidden" -#~ msgstr "" - #~ msgid "invalid user name" #~ msgstr "無效的使用者名稱" #~ msgid "Your account is disabled" #~ msgstr "您的帳號已被停用" -#~ msgid "Repository name %(repo)s is disallowed" -#~ msgstr "" - #~ msgid "invalid clone URL" #~ msgstr "無效的複製URL" -#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" -#~ msgstr "" - -#~ msgid "email \"%(email)s\" does not exist." -#~ msgstr "" - -#~ msgid "Revisions %(revs)s are already part of pull request or have set status" -#~ msgstr "" - -#~ msgid "Defaults" -#~ msgstr "" - -#~ msgid "never" -#~ msgstr "" - -#~ msgid "My Emails" -#~ msgstr "" - -#~ msgid "Watched" -#~ msgstr "" - #~ msgid "My Permissions" #~ msgstr "權限" -#~ msgid "expires" -#~ msgstr "" - -#~ msgid "Confirm to reset this api key: %s" -#~ msgstr "" - -#~ msgid "reset" -#~ msgstr "" - -#~ msgid "expired" -#~ msgstr "" - -#~ msgid "Confirm to remove this api key: %s" -#~ msgstr "" - -#~ msgid "remove" -#~ msgstr "" - -#~ msgid "No additional api keys specified" -#~ msgstr "" - -#~ msgid "New api key" -#~ msgstr "" - -#~ msgid "current IP" -#~ msgstr "" - #~ msgid "Permissions Administration" #~ msgstr "權限管理員" -#~ msgid "Overview" -#~ msgstr "" - -#~ msgid "Overwrite existing settings" -#~ msgstr "" - -#~ msgid "Default IP Whitelist for All Users" -#~ msgstr "" - -#~ msgid "Confirm to delete this ip: %s" -#~ msgstr "" - #~ msgid "Default User Permissions Overview" #~ msgstr "預設權限" @@ -6175,195 +5602,29 @@ msgstr "" #~ msgid "admin" #~ msgstr "管理員" -#~ msgid "user/user group" -#~ msgstr "" - -#~ msgid "default" -#~ msgstr "" - -#~ msgid "revoke" -#~ msgstr "" - -#~ msgid "delegated admin" -#~ msgstr "" - -#~ msgid "apply to children" -#~ msgstr "" - -#~ msgid "Import existing repository ?" -#~ msgstr "" - -#~ msgid "Optional URL from which repository should be cloned." -#~ msgstr "" - #~ msgid "Remote URL" #~ msgstr "複製連結" -#~ msgid "Pull Changes from Remote Location" -#~ msgstr "" - -#~ msgid "Confirm to pull changes from remote side." -#~ msgstr "" - -#~ msgid "This repository does not have a remote URL set." -#~ msgstr "" - -#~ msgid "Non-changeable id" -#~ msgstr "" - #~ msgid "edit" #~ msgstr "編輯" -#~ msgid "new value" -#~ msgstr "" - -#~ msgid "URL used for doing remote pulls." -#~ msgstr "" - -#~ msgid "Email prefix" -#~ msgstr "" - -#~ msgid "Kallithea email from" -#~ msgstr "" - -#~ msgid "Error email from" -#~ msgstr "" - -#~ msgid "Error email recipients" -#~ msgstr "" - -#~ msgid "SMTP server" -#~ msgstr "" - -#~ msgid "SMTP username" -#~ msgstr "" - -#~ msgid "SMTP password" -#~ msgstr "" - -#~ msgid "SMTP port" -#~ msgstr "" - -#~ msgid "SMTP use TLS" -#~ msgstr "" - -#~ msgid "SMTP use SSL" -#~ msgstr "" - -#~ msgid "SMTP auth" -#~ msgstr "" - -#~ msgid "Destroy old data" -#~ msgstr "" - -#~ msgid "check for updates" -#~ msgstr "" - -#~ msgid "Meta-Tagging" -#~ msgstr "" - #~ msgid "Default permissions" #~ msgstr "預設權限" -#~ msgid "user groups" -#~ msgstr "" - -#~ msgid "Inherit from defaults" -#~ msgstr "" - -#~ msgid "show" -#~ msgstr "" - -#~ msgid "Push new repo" -#~ msgstr "" - -#~ msgid "parent rev." -#~ msgstr "" - -#~ msgid "child rev." -#~ msgstr "" - -#~ msgid "no revisions" -#~ msgstr "" - -#~ msgid "Status change from pull request" -#~ msgstr "" - -#~ msgid "Comment from pull request" -#~ msgstr "" - -#~ msgid "Status change on changeset" -#~ msgstr "" - -#~ msgid "Comment on changeset" -#~ msgstr "" - -#~ msgid "revision" -#~ msgstr "" - -#~ msgid "Mimetype" -#~ msgstr "" - #~ msgid "My Repos" #~ msgstr "空的版本庫" -#~ msgid "Latest vote: %s" -#~ msgstr "" - -#~ msgid "Nobody voted" -#~ msgstr "" - -#~ msgid "%s Pull Request #%s" -#~ msgstr "" - -#~ msgid "Pull request #%s from %s#%s" -#~ msgstr "" - -#~ msgid "owner" -#~ msgstr "" - -#~ msgid "reviewer" -#~ msgstr "" - -#~ msgid "with subrepos" -#~ msgstr "" - -#~ msgid "Your new password" -#~ msgstr "" - -#~ msgid "Your new Kallithea password:%s" -#~ msgstr "" - -#~ msgid "Open New Pull Request for Selected Changesets" -#~ msgstr "" - -#~ msgid "Show Selected Changesets __S → __E" -#~ msgstr "" - -#~ msgid "Show Selected Changeset __S" -#~ msgstr "" - -#~ msgid "We received a request to create a new password for your account." -#~ msgstr "" - -#~ msgid "You can generate it by clicking following URL" -#~ msgstr "" - -#~ msgid "Please ignore this email if you did not request a new password ." -#~ msgstr "" - -#~ msgid "Created by" -#~ msgstr "" - -#~ msgid "You can only delete files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "You can only edit files with revision being a valid branch " -#~ msgstr "" - -#~ msgid "Changeset not found" -#~ msgstr "" - -#~ msgid "Pull Requests from %s'" -#~ msgstr "" - +#~ msgid "Confirm to invalidate repository cache." +#~ msgstr "確認廢止版本庫快取" + +#~ msgid "Closing." +#~ msgstr "關閉中。" + +#~ msgid "There are no branches yet" +#~ msgstr "沒有任何分支" + +#~ msgid "There are no tags yet" +#~ msgstr "沒有任何標籤" + +#~ msgid "Update" +#~ msgstr "時間" diff --git a/kallithea/lib/__init__.py b/kallithea/lib/__init__.py --- a/kallithea/lib/__init__.py +++ b/kallithea/lib/__init__.py @@ -24,30 +24,3 @@ Original author and date, and relevant c :copyright: (c) 2013 RhodeCode GmbH, and others. :license: GPLv3, see LICENSE.md for more details. """ - -import os - -def get_current_revision(quiet=False): - """ - Returns tuple of (number, id) from repository containing this package - or None if repository could not be found. - - :param quiet: prints error for fetching revision if True - """ - - try: - from kallithea.lib.vcs import get_repo - from kallithea.lib.vcs.utils.helpers import get_scm - repopath = os.path.abspath(os.path.join(os.path.dirname(__file__), - '..', '..')) - scm = get_scm(repopath)[0] - repo = get_repo(path=repopath, alias=scm) - wk_dir = repo.workdir - cur_rev = wk_dir.get_changeset() - return (cur_rev.revision, cur_rev.short_id) - except Exception as err: - if not quiet: - print ("WARNING: Cannot retrieve kallithea's revision. " - "disregard this if you don't know what that means. " - "Original error was: %s" % err) - return None diff --git a/kallithea/lib/annotate.py b/kallithea/lib/annotate.py --- a/kallithea/lib/annotate.py +++ b/kallithea/lib/annotate.py @@ -48,7 +48,7 @@ def annotate_highlight(filenode, annotat :param headers: dictionary with headers (keys are whats in ``order`` parameter) """ - from kallithea.lib.utils import get_custom_lexer + from kallithea.lib.pygmentsutils import get_custom_lexer options['linenos'] = True formatter = AnnotateHtmlFormatter(filenode=filenode, order=order, headers=headers, @@ -68,7 +68,7 @@ class AnnotateHtmlFormatter(HtmlFormatte following function as ``annotate_from_changeset_func``:: def changeset_to_anchor(changeset): - return '%s\n' %\ + return '%s\n' % \ (changeset.id, changeset.id) :param annotate_from_changeset_func: see above @@ -149,7 +149,7 @@ class AnnotateHtmlFormatter(HtmlFormatte for i in range(fl, fl + lncount): if i % st == 0: if aln: - lines.append('%*d' \ + lines.append('%*d' % (la, i, mw, i)) else: lines.append('%*d' % (mw, i)) @@ -158,7 +158,7 @@ class AnnotateHtmlFormatter(HtmlFormatte ls = '\n'.join(lines) # annotate_changesets = [tup[1] for tup in self.filenode.annotate] -## TODO: not sure what that fixes +# # TODO: not sure what that fixes # # If pygments cropped last lines break we need do that too # ln_cs = len(annotate_changesets) # ln_ = len(ls.splitlines()) diff --git a/kallithea/lib/app_globals.py b/kallithea/lib/app_globals.py --- a/kallithea/lib/app_globals.py +++ b/kallithea/lib/app_globals.py @@ -25,9 +25,8 @@ Original author and date, and relevant c :copyright: (c) 2013 RhodeCode GmbH, and others. :license: GPLv3, see LICENSE.md for more details. """ - -from beaker.cache import CacheManager -from beaker.util import parse_cache_config_options +import tg +from tg import config class Globals(object): @@ -36,11 +35,18 @@ class Globals(object): life of the application """ - def __init__(self, config): + def __init__(self): """One instance of Globals is created during application initialization and is available during requests via the 'app_globals' variable """ - self.cache = CacheManager(**parse_cache_config_options(config)) self.available_permissions = None # propagated after init_model + + @property + def cache(self): + return tg.cache + + @property + def mako_lookup(self): + return config['render_functions']['mako'].normal_loader diff --git a/kallithea/lib/auth.py b/kallithea/lib/auth.py --- a/kallithea/lib/auth.py +++ b/kallithea/lib/auth.py @@ -24,7 +24,6 @@ Original author and date, and relevant c :copyright: (c) 2013 RhodeCode GmbH, and others. :license: GPLv3, see LICENSE.md for more details. """ -import time import os import logging import traceback @@ -34,17 +33,16 @@ import collections from decorator import decorator -from pylons import url, request, session -from pylons.controllers.util import abort, redirect -from pylons.i18n.translation import _ +from tg import request, session +from tg.i18n import ugettext as _ from webhelpers.pylonslib import secure_form -from sqlalchemy import or_ from sqlalchemy.orm.exc import ObjectDeletedError from sqlalchemy.orm import joinedload +from webob.exc import HTTPFound, HTTPBadRequest, HTTPForbidden, HTTPMethodNotAllowed from kallithea import __platform__, is_windows, is_unix +from kallithea.config.routing import url from kallithea.lib.vcs.utils.lazy import LazyProperty -from kallithea.model import meta from kallithea.model.meta import Session from kallithea.model.user import UserModel from kallithea.model.db import User, Repository, Permission, \ @@ -52,7 +50,7 @@ from kallithea.model.db import User, Rep RepoGroup, UserGroupRepoGroupToPerm, UserIpMap, UserGroupUserGroupToPerm, \ UserGroup, UserApiKeys -from kallithea.lib.utils2 import safe_unicode, aslist +from kallithea.lib.utils2 import safe_str, safe_unicode, aslist from kallithea.lib.utils import get_repo_slug, get_repo_group_slug, \ get_user_group_slug, conditional_cache from kallithea.lib.caching_query import FromCache @@ -93,61 +91,49 @@ class PasswordGenerator(object): return ''.join(l) -class KallitheaCrypto(object): - - @classmethod - def hash_string(cls, str_): - """ - Cryptographic function used for password hashing based on pybcrypt - or Python's own OpenSSL wrapper on windows - - :param password: password to hash - """ - if is_windows: - return hashlib.sha256(str_).hexdigest() - elif is_unix: - import bcrypt - return bcrypt.hashpw(str_, bcrypt.gensalt(10)) - else: - raise Exception('Unknown or unsupported platform %s' \ - % __platform__) +def get_crypt_password(password): + """ + Cryptographic function used for password hashing based on pybcrypt + or Python's own OpenSSL wrapper on windows - @classmethod - def hash_check(cls, password, hashed): - """ - Checks matching password with it's hashed value, runs different - implementation based on platform it runs on - - :param password: password - :param hashed: password in hashed form - """ - - try: - password = str(password) - except UnicodeEncodeError: - log.warning('rejecting non-ascii password') - return False - if is_windows: - return hashlib.sha256(password).hexdigest() == hashed - elif is_unix: - import bcrypt - return bcrypt.hashpw(password, hashed) == hashed - else: - raise Exception('Unknown or unsupported platform %s' \ - % __platform__) - - -def get_crypt_password(password): - return KallitheaCrypto.hash_string(password) + :param password: password to hash + """ + if is_windows: + return hashlib.sha256(password).hexdigest() + elif is_unix: + import bcrypt + return bcrypt.hashpw(safe_str(password), bcrypt.gensalt(10)) + else: + raise Exception('Unknown or unsupported platform %s' + % __platform__) def check_password(password, hashed): - return KallitheaCrypto.hash_check(password, hashed) + """ + Checks matching password with it's hashed value, runs different + implementation based on platform it runs on + + :param password: password + :param hashed: password in hashed form + """ + if is_windows: + return hashlib.sha256(password).hexdigest() == hashed + elif is_unix: + import bcrypt + try: + return bcrypt.checkpw(safe_str(password), safe_str(hashed)) + except ValueError as e: + # bcrypt will throw ValueError 'Invalid hashed_password salt' on all password errors + log.error('error from bcrypt checking password: %s', e) + return False + else: + raise Exception('Unknown or unsupported platform %s' + % __platform__) def _cached_perms_data(user_id, user_is_admin, user_inherit_default_permissions, - explicit, algo): + explicit): RK = 'repositories' GK = 'repositories_groups' UK = 'user_groups' @@ -158,14 +144,9 @@ def _cached_perms_data(user_id, user_is_ def _choose_perm(new_perm, cur_perm): new_perm_val = PERM_WEIGHTS[new_perm] cur_perm_val = PERM_WEIGHTS[cur_perm] - if algo == 'higherwin': - if new_perm_val > cur_perm_val: - return new_perm - return cur_perm - elif algo == 'lowerwin': - if new_perm_val < cur_perm_val: - return new_perm - return cur_perm + if new_perm_val > cur_perm_val: + return new_perm + return cur_perm #====================================================================== # fetch default permissions @@ -209,8 +190,8 @@ def _cached_perms_data(user_id, user_is_ #================================================================== # default global permissions taken from the default user - default_global_perms = UserToPerm.query()\ - .filter(UserToPerm.user_id == default_user_id)\ + default_global_perms = UserToPerm.query() \ + .filter(UserToPerm.user_id == default_user_id) \ .options(joinedload(UserToPerm.permission)) for perm in default_global_perms: @@ -219,10 +200,10 @@ def _cached_perms_data(user_id, user_is_ # defaults for repositories, taken from default user for perm in default_repo_perms: r_k = perm.UserRepoToPerm.repository.repo_name - if perm.Repository.private and not (perm.Repository.user_id == user_id): + if perm.Repository.private and not (perm.Repository.owner_id == user_id): # disable defaults for private repos, p = 'repository.none' - elif perm.Repository.user_id == user_id: + elif perm.Repository.owner_id == user_id: # set admin if owner p = 'repository.admin' else: @@ -256,15 +237,15 @@ def _cached_perms_data(user_id, user_is_ # USER GROUPS comes first # user group global permissions - user_perms_from_users_groups = Session().query(UserGroupToPerm)\ - .options(joinedload(UserGroupToPerm.permission))\ + user_perms_from_users_groups = Session().query(UserGroupToPerm) \ + .options(joinedload(UserGroupToPerm.permission)) \ .join((UserGroupMember, UserGroupToPerm.users_group_id == - UserGroupMember.users_group_id))\ - .filter(UserGroupMember.user_id == user_id)\ + UserGroupMember.users_group_id)) \ + .filter(UserGroupMember.user_id == user_id) \ .join((UserGroup, UserGroupMember.users_group_id == - UserGroup.users_group_id))\ - .filter(UserGroup.users_group_active == True)\ - .order_by(UserGroupToPerm.users_group_id)\ + UserGroup.users_group_id)) \ + .filter(UserGroup.users_group_active == True) \ + .order_by(UserGroupToPerm.users_group_id) \ .all() # need to group here by groups since user can be in more than # one group @@ -274,24 +255,24 @@ def _cached_perms_data(user_id, user_is_ for gr, perms in _grouped: # since user can be in multiple groups iterate over them and # select the lowest permissions first (more explicit) - ##TODO: do this^^ + # TODO: do this^^ if not gr.inherit_default_permissions: # NEED TO IGNORE all configurable permissions and # replace them with explicitly set - permissions[GLOBAL] = permissions[GLOBAL]\ + permissions[GLOBAL] = permissions[GLOBAL] \ .difference(_configurable) for perm in perms: permissions[GLOBAL].add(perm.permission.permission_name) # user specific global permissions - user_perms = Session().query(UserToPerm)\ - .options(joinedload(UserToPerm.permission))\ + user_perms = Session().query(UserToPerm) \ + .options(joinedload(UserToPerm.permission)) \ .filter(UserToPerm.user_id == user_id).all() if not user_inherit_default_permissions: # NEED TO IGNORE all configurable permissions and # replace them with explicitly set - permissions[GLOBAL] = permissions[GLOBAL]\ + permissions[GLOBAL] = permissions[GLOBAL] \ .difference(_configurable) for perm in user_perms: @@ -303,23 +284,22 @@ def _cached_perms_data(user_id, user_is_ #====================================================================== #====================================================================== # check if user is part of user groups for this repository and - # fill in his permission from it. _choose_perm decides of which - # permission should be selected based on selected method + # fill in his permission from it. #====================================================================== # user group for repositories permissions user_repo_perms_from_users_groups = \ - Session().query(UserGroupRepoToPerm, Permission, Repository,)\ + Session().query(UserGroupRepoToPerm, Permission, Repository,) \ .join((Repository, UserGroupRepoToPerm.repository_id == - Repository.repo_id))\ + Repository.repo_id)) \ .join((Permission, UserGroupRepoToPerm.permission_id == - Permission.permission_id))\ + Permission.permission_id)) \ .join((UserGroup, UserGroupRepoToPerm.users_group_id == - UserGroup.users_group_id))\ - .filter(UserGroup.users_group_active == True)\ + UserGroup.users_group_id)) \ + .filter(UserGroup.users_group_active == True) \ .join((UserGroupMember, UserGroupRepoToPerm.users_group_id == - UserGroupMember.users_group_id))\ - .filter(UserGroupMember.user_id == user_id)\ + UserGroupMember.users_group_id)) \ + .filter(UserGroupMember.user_id == user_id) \ .all() multiple_counter = collections.defaultdict(int) @@ -329,7 +309,7 @@ def _cached_perms_data(user_id, user_is_ p = perm.Permission.permission_name cur_perm = permissions[RK][r_k] - if perm.Repository.user_id == user_id: + if perm.Repository.owner_id == user_id: # set admin if owner p = 'repository.admin' else: @@ -344,7 +324,7 @@ def _cached_perms_data(user_id, user_is_ r_k = perm.UserRepoToPerm.repository.repo_name cur_perm = permissions[RK][r_k] # set admin if owner - if perm.Repository.user_id == user_id: + if perm.Repository.owner_id == user_id: p = 'repository.admin' else: p = perm.Permission.permission_name @@ -357,21 +337,20 @@ def _cached_perms_data(user_id, user_is_ #====================================================================== #====================================================================== # check if user is part of user groups for this repository groups and - # fill in his permission from it. _choose_perm decides of which - # permission should be selected based on selected method + # fill in his permission from it. #====================================================================== # user group for repo groups permissions user_repo_group_perms_from_users_groups = \ - Session().query(UserGroupRepoGroupToPerm, Permission, RepoGroup)\ - .join((RepoGroup, UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id))\ + Session().query(UserGroupRepoGroupToPerm, Permission, RepoGroup) \ + .join((RepoGroup, UserGroupRepoGroupToPerm.group_id == RepoGroup.group_id)) \ .join((Permission, UserGroupRepoGroupToPerm.permission_id - == Permission.permission_id))\ + == Permission.permission_id)) \ .join((UserGroup, UserGroupRepoGroupToPerm.users_group_id == - UserGroup.users_group_id))\ - .filter(UserGroup.users_group_active == True)\ + UserGroup.users_group_id)) \ + .filter(UserGroup.users_group_active == True) \ .join((UserGroupMember, UserGroupRepoGroupToPerm.users_group_id - == UserGroupMember.users_group_id))\ - .filter(UserGroupMember.user_id == user_id)\ + == UserGroupMember.users_group_id)) \ + .filter(UserGroupMember.user_id == user_id) \ .all() multiple_counter = collections.defaultdict(int) @@ -399,17 +378,17 @@ def _cached_perms_data(user_id, user_is_ #====================================================================== # user group for user group permissions user_group_user_groups_perms = \ - Session().query(UserGroupUserGroupToPerm, Permission, UserGroup)\ + Session().query(UserGroupUserGroupToPerm, Permission, UserGroup) \ .join((UserGroup, UserGroupUserGroupToPerm.target_user_group_id - == UserGroup.users_group_id))\ + == UserGroup.users_group_id)) \ .join((Permission, UserGroupUserGroupToPerm.permission_id - == Permission.permission_id))\ + == Permission.permission_id)) \ .join((UserGroupMember, UserGroupUserGroupToPerm.user_group_id - == UserGroupMember.users_group_id))\ - .filter(UserGroupMember.user_id == user_id)\ + == UserGroupMember.users_group_id)) \ + .filter(UserGroupMember.user_id == user_id) \ .join((UserGroup, UserGroupMember.users_group_id == - UserGroup.users_group_id), aliased=True, from_joinpoint=True)\ - .filter(UserGroup.users_group_active == True)\ + UserGroup.users_group_id), aliased=True, from_joinpoint=True) \ + .filter(UserGroup.users_group_active == True) \ .all() multiple_counter = collections.defaultdict(int) @@ -422,7 +401,7 @@ def _cached_perms_data(user_id, user_is_ p = _choose_perm(p, cur_perm) permissions[UK][g_k] = p - #user explicit permission for user groups + # user explicit permission for user groups user_user_groups_perms = Permission.get_default_user_group_perms(user_id) for perm in user_user_groups_perms: u_k = perm.UserUserGroupToPerm.user_group.users_group_name @@ -450,7 +429,7 @@ def allowed_api_access(controller_name, else: msg = 'controller: %s is *NOT* in API whitelist' % (controller_name) if api_key: - #if we use API key and don't have access it's a warning + # if we use API key and don't have access it's a warning log.warning(msg) else: log.debug(msg) @@ -470,24 +449,33 @@ class AuthUser(object): access to Kallithea is enabled, the default user is loaded instead. `AuthUser` does not by itself authenticate users and the constructor - sets the `is_authenticated` field to False, except when falling back - to the default anonymous user (if enabled). It's up to other parts + sets the `is_authenticated` field to False. It's up to other parts of the code to check e.g. if a supplied password is correct, and if so, set `is_authenticated` to True. However, `AuthUser` does refuse to load a user that is not `active`. + + Note that Kallithea distinguishes between the default user (an actual + user in the database with username "default") and "no user" (no actual + User object, AuthUser filled with blank values and username "None"). + + If the default user is active, that will always be used instead of + "no user". On the other hand, if the default user is disabled (and + there is no login information), we instead get "no user"; this should + only happen on the login page (as all other requests are redirected). + + `is_default_user` specifically checks if the AuthUser is the user named + "default". Use `is_anonymous` to check for both "default" and "no user". """ - def __init__(self, user_id=None, dbuser=None, + def __init__(self, user_id=None, dbuser=None, authenticating_api_key=None, is_external_auth=False): self.is_authenticated = False self.is_external_auth = is_external_auth + self.authenticating_api_key = authenticating_api_key - user_model = UserModel() - self.anonymous_user = User.get_default_user(cache=True) - - # These attributes will be overriden by fill_data, below, unless the + # These attributes will be overridden by fill_data, below, unless the # requested user cannot be found and the default anonymous user is # not enabled. self.user_id = None @@ -502,7 +490,7 @@ class AuthUser(object): # Look up database user, if necessary. if user_id is not None: log.debug('Auth User lookup by USER ID %s', user_id) - dbuser = user_model.get(user_id) + dbuser = UserModel().get(user_id) else: # Note: dbuser is allowed to be None. log.debug('Auth User lookup by database user %s', dbuser) @@ -510,12 +498,15 @@ class AuthUser(object): is_user_loaded = self._fill_data(dbuser) # If user cannot be found, try falling back to anonymous. - if not is_user_loaded: - is_user_loaded = self._fill_data(self.anonymous_user) + if is_user_loaded: + assert dbuser is not None + self.is_default_user = dbuser.is_default_user + else: + default_user = User.get_default_user(cache=True) + is_user_loaded = self._fill_data(default_user) + self.is_default_user = is_user_loaded - # The anonymous user is always "logged in". - if self.user_id == self.anonymous_user.user_id: - self.is_authenticated = True + self.is_anonymous = not is_user_loaded or self.is_default_user if not self.username: self.username = 'None' @@ -542,11 +533,47 @@ class AuthUser(object): def permissions(self): return self.__get_perms(user=self, cache=False) + def has_repository_permission_level(self, repo_name, level, purpose=None): + required_perms = { + 'read': ['repository.read', 'repository.write', 'repository.admin'], + 'write': ['repository.write', 'repository.admin'], + 'admin': ['repository.admin'], + }[level] + actual_perm = self.permissions['repositories'].get(repo_name) + ok = actual_perm in required_perms + log.debug('Checking if user %r can %r repo %r (%s): %s (has %r)', + self.username, level, repo_name, purpose, ok, actual_perm) + return ok + + def has_repository_group_permission_level(self, repo_group_name, level, purpose=None): + required_perms = { + 'read': ['group.read', 'group.write', 'group.admin'], + 'write': ['group.write', 'group.admin'], + 'admin': ['group.admin'], + }[level] + actual_perm = self.permissions['repositories_groups'].get(repo_group_name) + ok = actual_perm in required_perms + log.debug('Checking if user %r can %r repo group %r (%s): %s (has %r)', + self.username, level, repo_group_name, purpose, ok, actual_perm) + return ok + + def has_user_group_permission_level(self, user_group_name, level, purpose=None): + required_perms = { + 'read': ['usergroup.read', 'usergroup.write', 'usergroup.admin'], + 'write': ['usergroup.write', 'usergroup.admin'], + 'admin': ['usergroup.admin'], + }[level] + actual_perm = self.permissions['user_groups'].get(user_group_name) + ok = actual_perm in required_perms + log.debug('Checking if user %r can %r user group %r (%s): %s (has %r)', + self.username, level, user_group_name, purpose, ok, actual_perm) + return ok + @property def api_keys(self): return self._get_api_keys() - def __get_perms(self, user, explicit=True, algo='higherwin', cache=False): + def __get_perms(self, user, explicit=True, cache=False): """ Fills user permission attribute with permissions taken from database works for permissions given for repositories, and for permissions that @@ -556,11 +583,7 @@ class AuthUser(object): :param explicit: In case there are permissions both for user and a group that user is part of, explicit flag will define if user will explicitly override permissions from group, if it's False it will - make decision based on the algo - :param algo: algorithm to decide what permission should be choose if - it's multiple defined, eg user in two different groups. It also - decides if explicit flag is turned off how to specify the permission - for case when user is in a group + have defined separate permission + compute the decision """ user_id = user.user_id user_is_admin = user.is_admin @@ -570,14 +593,12 @@ class AuthUser(object): compute = conditional_cache('short_term', 'cache_desc', condition=cache, func=_cached_perms_data) return compute(user_id, user_is_admin, - user_inherit_default_permissions, explicit, algo) + user_inherit_default_permissions, explicit) def _get_api_keys(self): api_keys = [self.api_key] - for api_key in UserApiKeys.query()\ - .filter(UserApiKeys.user_id == self.user_id)\ - .filter(or_(UserApiKeys.expires == -1, - UserApiKeys.expires >= time.time())).all(): + for api_key in UserApiKeys.query() \ + .filter_by(user_id=self.user_id, is_expired=False): api_keys.append(api_key.api_key) return api_keys @@ -627,18 +648,13 @@ class AuthUser(object): return False def __repr__(self): - return ""\ - % (self.user_id, self.username, self.is_authenticated) - - def set_authenticated(self, authenticated=True): - if self.user_id != self.anonymous_user.user_id: - self.is_authenticated = authenticated + return "" \ + % (self.user_id, self.username, (self.is_authenticated or self.is_default_user)) def to_cookie(self): """ Serializes this login session to a cookie `dict`. """ return { 'user_id': self.user_id, - 'is_authenticated': self.is_authenticated, 'is_external_auth': self.is_external_auth, } @@ -652,9 +668,7 @@ class AuthUser(object): user_id=cookie.get('user_id'), is_external_auth=cookie.get('is_external_auth', False), ) - if not au.is_authenticated and au.user_id is not None: - # user is not authenticated and not empty - au.set_authenticated(cookie.get('is_authenticated')) + au.is_authenticated = True return au @classmethod @@ -662,8 +676,8 @@ class AuthUser(object): _set = set() if inherit_from_default: - default_ips = UserIpMap.query().filter(UserIpMap.user == - User.get_default_user(cache=True)) + default_ips = UserIpMap.query().filter(UserIpMap.user_id == + User.get_default_user(cache=True).user_id) if cache: default_ips = default_ips.options(FromCache("sql_cache_short", "get_user_ips_default")) @@ -694,101 +708,76 @@ class AuthUser(object): def set_available_permissions(config): """ - This function will propagate pylons globals with all available defined + This function will propagate globals with all available defined permission given in db. We don't want to check each time from db for new permissions since adding a new permission also requires application restart ie. to decorate new views with the newly created permission - :param config: current pylons config instance + :param config: current config instance """ log.info('getting information about all available permissions') try: - sa = meta.Session - all_perms = sa.query(Permission).all() + all_perms = Session().query(Permission).all() config['available_permissions'] = [x.permission_name for x in all_perms] finally: - meta.Session.remove() + Session.remove() #============================================================================== # CHECK DECORATORS #============================================================================== -def redirect_to_login(message=None): +def _redirect_to_login(message=None): + """Return an exception that must be raised. It will redirect to the login + page which will redirect back to the current URL after authentication. + The optional message will be shown in a flash message.""" from kallithea.lib import helpers as h - p = request.path_qs if message: h.flash(message, category='warning') + p = request.path_qs log.debug('Redirecting to login page, origin: %s', p) - return redirect(url('login_home', came_from=p)) + return HTTPFound(location=url('login_home', came_from=p)) +# Use as decorator class LoginRequired(object): - """ - Must be logged in to execute this function else - redirect to login page + """Client must be logged in as a valid User, or we'll redirect to the login + page. - :param api_access: if enabled this checks only for valid auth token - and grants access based on valid token + If the "default" user is enabled and allow_default_user is true, that is + considered valid too. + + Also checks that IP address is allowed, and if using API key instead + of regular cookie authentication, checks that API key access is allowed + (based on `api_access` parameter and the API view whitelist). """ - def __init__(self, api_access=False): + def __init__(self, api_access=False, allow_default_user=False): self.api_access = api_access + self.allow_default_user = allow_default_user def __call__(self, func): return decorator(self.__wrapper, func) def __wrapper(self, func, *fargs, **fkwargs): controller = fargs[0] - user = controller.authuser + user = request.authuser loc = "%s:%s" % (controller.__class__.__name__, func.__name__) log.debug('Checking access for user %s @ %s', user, loc) - if not AuthUser.check_ip_allowed(user, controller.ip_addr): - return redirect_to_login(_('IP %s not allowed') % controller.ip_addr) - - # check if we used an API key and it's a valid one - api_key = request.GET.get('api_key') + # Check if we used an API key to authenticate. + api_key = user.authenticating_api_key if api_key is not None: - # explicit controller is enabled or API is in our whitelist - if self.api_access or allowed_api_access(loc, api_key=api_key): - if api_key in user.api_keys: - log.info('user %s authenticated with API key ****%s @ %s', - user, api_key[-4:], loc) - return func(*fargs, **fkwargs) - else: - log.warning('API key ****%s is NOT valid', api_key[-4:]) - return redirect_to_login(_('Invalid API key')) - else: + # Check that controller is enabled for API key usage. + if not self.api_access and not allowed_api_access(loc, api_key=api_key): # controller does not allow API access log.warning('API access to %s is not allowed', loc) - return abort(403) - - # Only allow the following HTTP request methods. (We sometimes use POST - # requests with a '_method' set to 'PUT' or 'DELETE'; but that is only - # used for the route lookup, and does not affect request.method.) - if request.method not in ['GET', 'HEAD', 'POST', 'PUT']: - return abort(405) + raise HTTPForbidden() - # Also verify the _method override. This is only permitted in POST - # requests, and can specify PUT or DELETE. - _method = request.params.get('_method') - if _method is None: - pass # no override, no problem - elif request.method == 'POST' and _method.upper() in ['PUT', 'DELETE']: - pass # permitted override - else: - raise HTTPMethodNotAllowed() - - # Make sure CSRF token never appears in the URL. If so, invalidate it. - if secure_form.token_key in request.GET: - log.error('CSRF key leak detected') - session.pop(secure_form.token_key, None) - session.save() - from kallithea.lib import helpers as h - h.flash(_("CSRF token leak has been detected - all form tokens have been expired"), - category='error') + log.info('user %s authenticated with API key ****%s @ %s', + user, api_key[-4:], loc) + return func(*fargs, **fkwargs) # CSRF protection: Whenever a request has ambient authority (whether # through a session cookie or its origin IP address), it must include @@ -800,527 +789,203 @@ class LoginRequired(object): token = request.POST.get(secure_form.token_key) if not token or token != secure_form.authentication_token(): log.error('CSRF check failed') - return abort(403) - - # WebOb already ignores request payload parameters for anything other - # than POST/PUT, but double-check since other Kallithea code relies on - # this assumption. - if request.method not in ['POST', 'PUT'] and request.POST: - log.error('%r request with payload parameters; WebOb should have stopped this', request.method) - return abort(400) + raise HTTPForbidden() # regular user authentication if user.is_authenticated: log.info('user %s authenticated with regular auth @ %s', user, loc) return func(*fargs, **fkwargs) + elif user.is_default_user: + if self.allow_default_user: + log.info('default user @ %s', loc) + return func(*fargs, **fkwargs) + log.info('default user is not accepted here @ %s', loc) else: log.warning('user %s NOT authenticated with regular auth @ %s', user, loc) - return redirect_to_login() + raise _redirect_to_login() + +# Use as decorator class NotAnonymous(object): - """ - Must be logged in to execute this function else - redirect to login page""" + """Ensures that client is not logged in as the "default" user, and + redirects to the login page otherwise. Must be used together with + LoginRequired.""" def __call__(self, func): return decorator(self.__wrapper, func) def __wrapper(self, func, *fargs, **fkwargs): cls = fargs[0] - self.user = cls.authuser + user = request.authuser - log.debug('Checking if user is not anonymous @%s', cls) + log.debug('Checking that user %s is not anonymous @%s', user.username, cls) - anonymous = self.user.username == User.DEFAULT_USER - - if anonymous: - return redirect_to_login(_('You need to be a registered user to ' - 'perform this action')) + if user.is_default_user: + raise _redirect_to_login(_('You need to be a registered user to ' + 'perform this action')) else: return func(*fargs, **fkwargs) -class PermsDecorator(object): - """Base class for controller decorators""" +class _PermsDecorator(object): + """Base class for controller decorators with multiple permissions""" def __init__(self, *required_perms): - self.required_perms = set(required_perms) - self.user_perms = None + self.required_perms = required_perms # usually very short - a list is thus fine def __call__(self, func): return decorator(self.__wrapper, func) def __wrapper(self, func, *fargs, **fkwargs): cls = fargs[0] - self.user = cls.authuser - self.user_perms = self.user.permissions + user = request.authuser log.debug('checking %s permissions %s for %s %s', - self.__class__.__name__, self.required_perms, cls, self.user) + self.__class__.__name__, self.required_perms, cls, user) - if self.check_permissions(): - log.debug('Permission granted for %s %s', cls, self.user) + if self.check_permissions(user): + log.debug('Permission granted for %s %s', cls, user) return func(*fargs, **fkwargs) else: - log.debug('Permission denied for %s %s', cls, self.user) - anonymous = self.user.username == User.DEFAULT_USER - - if anonymous: - return redirect_to_login(_('You need to be signed in to view this page')) + log.info('Permission denied for %s %s', cls, user) + if user.is_default_user: + raise _redirect_to_login(_('You need to be signed in to view this page')) else: - # redirect with forbidden ret code - return abort(403) + raise HTTPForbidden() - def check_permissions(self): - """Dummy function for overriding""" - raise Exception('You have to write this function in child class') - - -class HasPermissionAllDecorator(PermsDecorator): - """ - Checks for access permission for all given predicates. All of them - have to be meet in order to fulfill the request - """ - - def check_permissions(self): - if self.required_perms.issubset(self.user_perms.get('global')): - return True - return False + def check_permissions(self, user): + raise NotImplementedError() -class HasPermissionAnyDecorator(PermsDecorator): - """ - Checks for access permission for any of given predicates. In order to - fulfill the request any of predicates must be meet - """ - - def check_permissions(self): - if self.required_perms.intersection(self.user_perms.get('global')): - return True - return False - - -class HasRepoPermissionAllDecorator(PermsDecorator): - """ - Checks for access permission for all given predicates for specific - repository. All of them have to be meet in order to fulfill the request +class HasPermissionAnyDecorator(_PermsDecorator): """ - - def check_permissions(self): - repo_name = get_repo_slug(request) - try: - user_perms = set([self.user_perms['repositories'][repo_name]]) - except KeyError: - return False - if self.required_perms.issubset(user_perms): - return True - return False - - -class HasRepoPermissionAnyDecorator(PermsDecorator): - """ - Checks for access permission for any of given predicates for specific - repository. In order to fulfill the request any of predicates must be meet + Checks the user has any of the given global permissions. """ - def check_permissions(self): - repo_name = get_repo_slug(request) - try: - user_perms = set([self.user_perms['repositories'][repo_name]]) - except KeyError: - return False - - if self.required_perms.intersection(user_perms): - return True - return False + def check_permissions(self, user): + global_permissions = user.permissions['global'] # usually very short + return any(p in global_permissions for p in self.required_perms) -class HasRepoGroupPermissionAllDecorator(PermsDecorator): - """ - Checks for access permission for all given predicates for specific - repository group. All of them have to be meet in order to fulfill the request - """ +class _PermDecorator(_PermsDecorator): + """Base class for controller decorators with a single permission""" - def check_permissions(self): - group_name = get_repo_group_slug(request) - try: - user_perms = set([self.user_perms['repositories_groups'][group_name]]) - except KeyError: - return False - - if self.required_perms.issubset(user_perms): - return True - return False + def __init__(self, required_perm): + _PermsDecorator.__init__(self, [required_perm]) + self.required_perm = required_perm -class HasRepoGroupPermissionAnyDecorator(PermsDecorator): +class HasRepoPermissionLevelDecorator(_PermDecorator): """ - Checks for access permission for any of given predicates for specific - repository group. In order to fulfill the request any of predicates must be meet + Checks the user has at least the specified permission level for the requested repository. """ - def check_permissions(self): - group_name = get_repo_group_slug(request) - try: - user_perms = set([self.user_perms['repositories_groups'][group_name]]) - except KeyError: - return False - - if self.required_perms.intersection(user_perms): - return True - return False + def check_permissions(self, user): + repo_name = get_repo_slug(request) + return user.has_repository_permission_level(repo_name, self.required_perm) -class HasUserGroupPermissionAllDecorator(PermsDecorator): +class HasRepoGroupPermissionLevelDecorator(_PermDecorator): """ - Checks for access permission for all given predicates for specific - user group. All of them have to be meet in order to fulfill the request + Checks the user has any of given permissions for the requested repository group. """ - def check_permissions(self): - group_name = get_user_group_slug(request) - try: - user_perms = set([self.user_perms['user_groups'][group_name]]) - except KeyError: - return False - - if self.required_perms.issubset(user_perms): - return True - return False + def check_permissions(self, user): + repo_group_name = get_repo_group_slug(request) + return user.has_repository_group_permission_level(repo_group_name, self.required_perm) -class HasUserGroupPermissionAnyDecorator(PermsDecorator): +class HasUserGroupPermissionLevelDecorator(_PermDecorator): """ Checks for access permission for any of given predicates for specific user group. In order to fulfill the request any of predicates must be meet """ - def check_permissions(self): - group_name = get_user_group_slug(request) - try: - user_perms = set([self.user_perms['user_groups'][group_name]]) - except KeyError: - return False - - if self.required_perms.intersection(user_perms): - return True - return False + def check_permissions(self, user): + user_group_name = get_user_group_slug(request) + return user.has_user_group_permission_level(user_group_name, self.required_perm) #============================================================================== # CHECK FUNCTIONS #============================================================================== -class PermsFunction(object): - """Base function for other check functions""" - - def __init__(self, *perms): - self.required_perms = set(perms) - self.user_perms = None - self.repo_name = None - self.group_name = None - - def __call__(self, check_location='', user=None): - if not user: - #TODO: remove this someday,put as user as attribute here - user = request.user - - # init auth user if not already given - if not isinstance(user, AuthUser): - user = AuthUser(user.user_id) - cls_name = self.__class__.__name__ - check_scope = { - 'HasPermissionAll': '', - 'HasPermissionAny': '', - 'HasRepoPermissionAll': 'repo:%s' % self.repo_name, - 'HasRepoPermissionAny': 'repo:%s' % self.repo_name, - 'HasRepoGroupPermissionAll': 'group:%s' % self.group_name, - 'HasRepoGroupPermissionAny': 'group:%s' % self.group_name, - }.get(cls_name, '?') - log.debug('checking cls:%s %s usr:%s %s @ %s', cls_name, - self.required_perms, user, check_scope, - check_location or 'unspecified location') - if not user: - log.debug('Empty request user') - return False - self.user_perms = user.permissions - if self.check_permissions(): - log.debug('Permission to %s granted for user: %s @ %s', - check_scope, user, - check_location or 'unspecified location') - return True +class _PermsFunction(object): + """Base function for other check functions with multiple permissions""" + + def __init__(self, *required_perms): + self.required_perms = required_perms # usually very short - a list is thus fine - else: - log.debug('Permission to %s denied for user: %s @ %s', - check_scope, user, - check_location or 'unspecified location') - return False - - def check_permissions(self): - """Dummy function for overriding""" - raise Exception('You have to write this function in child class') - - -class HasPermissionAll(PermsFunction): - def check_permissions(self): - if self.required_perms.issubset(self.user_perms.get('global')): - return True - return False - + def __nonzero__(self): + """ Defend against accidentally forgetting to call the object + and instead evaluating it directly in a boolean context, + which could have security implications. + """ + raise AssertionError(self.__class__.__name__ + ' is not a bool and must be called!') -class HasPermissionAny(PermsFunction): - def check_permissions(self): - if self.required_perms.intersection(self.user_perms.get('global')): - return True - return False - - -class HasRepoPermissionAll(PermsFunction): - def __call__(self, repo_name=None, check_location='', user=None): - self.repo_name = repo_name - return super(HasRepoPermissionAll, self).__call__(check_location, user) - - def check_permissions(self): - if not self.repo_name: - self.repo_name = get_repo_slug(request) - - try: - self._user_perms = set( - [self.user_perms['repositories'][self.repo_name]] - ) - except KeyError: - return False - if self.required_perms.issubset(self._user_perms): - return True - return False + def __call__(self, *a, **b): + raise NotImplementedError() -class HasRepoPermissionAny(PermsFunction): - def __call__(self, repo_name=None, check_location='', user=None): - self.repo_name = repo_name - return super(HasRepoPermissionAny, self).__call__(check_location, user) - - def check_permissions(self): - if not self.repo_name: - self.repo_name = get_repo_slug(request) +class HasPermissionAny(_PermsFunction): - try: - self._user_perms = set( - [self.user_perms['repositories'][self.repo_name]] - ) - except KeyError: - return False - if self.required_perms.intersection(self._user_perms): - return True - return False - + def __call__(self, purpose=None): + global_permissions = request.authuser.permissions['global'] # usually very short + ok = any(p in global_permissions for p in self.required_perms) -class HasRepoGroupPermissionAny(PermsFunction): - def __call__(self, group_name=None, check_location='', user=None): - self.group_name = group_name - return super(HasRepoGroupPermissionAny, self).__call__(check_location, user) - - def check_permissions(self): - try: - self._user_perms = set( - [self.user_perms['repositories_groups'][self.group_name]] - ) - except KeyError: - return False - if self.required_perms.intersection(self._user_perms): - return True - return False + log.debug('Check %s for global %s (%s): %s' % + (request.authuser.username, self.required_perms, purpose, ok)) + return ok -class HasRepoGroupPermissionAll(PermsFunction): - def __call__(self, group_name=None, check_location='', user=None): - self.group_name = group_name - return super(HasRepoGroupPermissionAll, self).__call__(check_location, user) +class _PermFunction(_PermsFunction): + """Base function for other check functions with a single permission""" - def check_permissions(self): - try: - self._user_perms = set( - [self.user_perms['repositories_groups'][self.group_name]] - ) - except KeyError: - return False - if self.required_perms.issubset(self._user_perms): - return True - return False + def __init__(self, required_perm): + _PermsFunction.__init__(self, [required_perm]) + self.required_perm = required_perm -class HasUserGroupPermissionAny(PermsFunction): - def __call__(self, user_group_name=None, check_location='', user=None): - self.user_group_name = user_group_name - return super(HasUserGroupPermissionAny, self).__call__(check_location, user) +class HasRepoPermissionLevel(_PermFunction): - def check_permissions(self): - try: - self._user_perms = set( - [self.user_perms['user_groups'][self.user_group_name]] - ) - except KeyError: - return False - if self.required_perms.intersection(self._user_perms): - return True - return False + def __call__(self, repo_name, purpose=None): + return request.authuser.has_repository_permission_level(repo_name, self.required_perm, purpose) -class HasUserGroupPermissionAll(PermsFunction): - def __call__(self, user_group_name=None, check_location='', user=None): - self.user_group_name = user_group_name - return super(HasUserGroupPermissionAll, self).__call__(check_location, user) +class HasRepoGroupPermissionLevel(_PermFunction): + + def __call__(self, group_name, purpose=None): + return request.authuser.has_repository_group_permission_level(group_name, self.required_perm, purpose) - def check_permissions(self): - try: - self._user_perms = set( - [self.user_perms['user_groups'][self.user_group_name]] - ) - except KeyError: - return False - if self.required_perms.issubset(self._user_perms): - return True - return False + +class HasUserGroupPermissionLevel(_PermFunction): + + def __call__(self, user_group_name, purpose=None): + return request.authuser.has_user_group_permission_level(user_group_name, self.required_perm, purpose) #============================================================================== # SPECIAL VERSION TO HANDLE MIDDLEWARE AUTH #============================================================================== + class HasPermissionAnyMiddleware(object): def __init__(self, *perms): self.required_perms = set(perms) - def __call__(self, user, repo_name): - # repo_name MUST be unicode, since we handle keys in permission + def __call__(self, user, repo_name, purpose=None): + # repo_name MUST be unicode, since we handle keys in ok # dict by unicode repo_name = safe_unicode(repo_name) - usr = AuthUser(user.user_id) - self.user_perms = set([usr.permissions['repositories'][repo_name]]) - self.username = user.username - self.repo_name = repo_name - return self.check_permissions() - - def check_permissions(self): - log.debug('checking VCS protocol ' - 'permissions %s for user:%s repository:%s', self.user_perms, - self.username, self.repo_name) - if self.required_perms.intersection(self.user_perms): - log.debug('Permission to repo: %s granted for user: %s @ %s', - self.repo_name, self.username, 'PermissionMiddleware') - return True - log.debug('Permission to repo: %s denied for user: %s @ %s', - self.repo_name, self.username, 'PermissionMiddleware') - return False - - -#============================================================================== -# SPECIAL VERSION TO HANDLE API AUTH -#============================================================================== -class _BaseApiPerm(object): - def __init__(self, *perms): - self.required_perms = set(perms) - - def __call__(self, check_location=None, user=None, repo_name=None, - group_name=None): - cls_name = self.__class__.__name__ - check_scope = 'user:%s' % (user) - if repo_name: - check_scope += ', repo:%s' % (repo_name) - - if group_name: - check_scope += ', repo group:%s' % (group_name) - - log.debug('checking cls:%s %s %s @ %s', - cls_name, self.required_perms, check_scope, check_location) - if not user: - log.debug('Empty User passed into arguments') - return False - - ## process user - if not isinstance(user, AuthUser): - user = AuthUser(user.user_id) - if not check_location: - check_location = 'unspecified' - if self.check_permissions(user.permissions, repo_name, group_name): - log.debug('Permission to %s granted for user: %s @ %s', - check_scope, user, check_location) - return True - - else: - log.debug('Permission to %s denied for user: %s @ %s', - check_scope, user, check_location) - return False - - def check_permissions(self, perm_defs, repo_name=None, group_name=None): - """ - implement in child class should return True if permissions are ok, - False otherwise + user = AuthUser(user.user_id) - :param perm_defs: dict with permission definitions - :param repo_name: repo name - """ - raise NotImplementedError() - - -class HasPermissionAllApi(_BaseApiPerm): - def check_permissions(self, perm_defs, repo_name=None, group_name=None): - if self.required_perms.issubset(perm_defs.get('global')): - return True - return False - - -class HasPermissionAnyApi(_BaseApiPerm): - def check_permissions(self, perm_defs, repo_name=None, group_name=None): - if self.required_perms.intersection(perm_defs.get('global')): - return True - return False - - -class HasRepoPermissionAllApi(_BaseApiPerm): - def check_permissions(self, perm_defs, repo_name=None, group_name=None): try: - _user_perms = set([perm_defs['repositories'][repo_name]]) + ok = user.permissions['repositories'][repo_name] in self.required_perms except KeyError: - log.warning(traceback.format_exc()) - return False - if self.required_perms.issubset(_user_perms): - return True - return False - + ok = False -class HasRepoPermissionAnyApi(_BaseApiPerm): - def check_permissions(self, perm_defs, repo_name=None, group_name=None): - try: - _user_perms = set([perm_defs['repositories'][repo_name]]) - except KeyError: - log.warning(traceback.format_exc()) - return False - if self.required_perms.intersection(_user_perms): - return True - return False - + log.debug('Middleware check %s for %s for repo %s (%s): %s' % (user.username, self.required_perms, repo_name, purpose, ok)) + return ok -class HasRepoGroupPermissionAnyApi(_BaseApiPerm): - def check_permissions(self, perm_defs, repo_name=None, group_name=None): - try: - _user_perms = set([perm_defs['repositories_groups'][group_name]]) - except KeyError: - log.warning(traceback.format_exc()) - return False - if self.required_perms.intersection(_user_perms): - return True - return False - -class HasRepoGroupPermissionAllApi(_BaseApiPerm): - def check_permissions(self, perm_defs, repo_name=None, group_name=None): - try: - _user_perms = set([perm_defs['repositories_groups'][group_name]]) - except KeyError: - log.warning(traceback.format_exc()) - return False - if self.required_perms.issubset(_user_perms): - return True - return False def check_ip_access(source_ip, allowed_ips=None): """ @@ -1330,6 +995,7 @@ def check_ip_access(source_ip, allowed_i :param allowed_ips: list of allowed ips together with mask """ from kallithea.lib import ipaddr + source_ip = source_ip.split('%', 1)[0] log.debug('checking if ip:%s is subnet of %s', source_ip, allowed_ips) if isinstance(allowed_ips, (tuple, list, set)): for ip in allowed_ips: diff --git a/kallithea/lib/auth_modules/__init__.py b/kallithea/lib/auth_modules/__init__.py --- a/kallithea/lib/auth_modules/__init__.py +++ b/kallithea/lib/auth_modules/__init__.py @@ -17,12 +17,11 @@ Authentication modules import logging import traceback +import importlib -from kallithea import EXTERN_TYPE_INTERNAL -from kallithea.lib.compat import importlib from kallithea.lib.utils2 import str2bool from kallithea.lib.compat import formatted_json, hybrid_property -from kallithea.lib.auth import PasswordGenerator +from kallithea.lib.auth import PasswordGenerator, AuthUser from kallithea.model.user import UserModel from kallithea.model.db import Setting, User from kallithea.model.meta import Session @@ -41,7 +40,7 @@ class LazyFormencode(object): from inspect import isfunction formencode_obj = self.formencode_obj if isfunction(formencode_obj): - #case we wrap validators into functions + # case we wrap validators into functions formencode_obj = self.formencode_obj(*args, **kwargs) return formencode_obj(*self.args, **self.kwargs) @@ -55,9 +54,6 @@ class KallitheaAuthPluginBase(object): "groups": '["list", "of", "groups"]', "extern_name": "name in external source of record", "admin": 'True|False defines if user should be Kallithea admin', - "active": 'True|False defines active state of user in Kallithea', - "active_from_extern": "True|False|None, active state from the external auth, " - "None means use value from the auth plugin" } @property @@ -77,7 +73,6 @@ class KallitheaAuthPluginBase(object): #log.debug('Initializing lazy formencode object: %s', obj) return LazyFormencode(obj, *args, **kwargs) - class ProxyGet(object): def __getattribute__(self, name): return LazyCaller(name) @@ -139,8 +134,8 @@ class KallitheaAuthPluginBase(object): log.debug('Trying to fetch user `%s` from Kallithea database', username) if username: - user = User.get_by_username(username) - if not user: + user = User.get_by_username_or_email(username) + if user is None: log.debug('Fallback to fetch user in case insensitive mode') user = User.get_by_username(username, case_insensitive=True) else: @@ -200,14 +195,6 @@ class KallitheaAuthPluginBase(object): ) return rcsettings - def user_activation_state(self): - """ - Defines user activation state when creating new users - - :returns: boolean - """ - raise NotImplementedError("Not implemented in base class") - def auth(self, userobj, username, passwd, settings, **kwargs): """ Given a user object (which may be None), username, a plaintext password, @@ -224,11 +211,6 @@ class KallitheaAuthPluginBase(object): def _authenticate(self, userobj, username, passwd, settings, **kwargs): """ Wrapper to call self.auth() that validates call on it - - :param userobj: userobj - :param username: username - :param passwd: plaintext password - :param settings: plugin settings """ user_data = self.auth(userobj, username, passwd, settings, **kwargs) if user_data is not None: @@ -259,17 +241,11 @@ class KallitheaExternalAuthPlugin(Kallit user_data = super(KallitheaExternalAuthPlugin, self)._authenticate( userobj, username, passwd, settings, **kwargs) if user_data is not None: - # maybe plugin will clean the username ? - # we should use the return value - username = user_data['username'] - # if user is not active from our extern type we should fail to auth - # this can prevent from creating users in Kallithea when using - # external authentication, but if it's inactive user we shouldn't - # create that user anyway - if user_data['active_from_extern'] is False: - log.warning("User %s authenticated against %s, but is inactive", - username, self.__module__) - return None + if userobj is None: # external authentication of unknown user that will be created soon + def_user_perms = AuthUser(dbuser=User.get_default_user()).permissions['global'] + active = 'hg.extern_activate.auto' in def_user_perms + else: + active = userobj.active if self.use_fake_password(): # Randomize the PW because we don't need it, but don't want @@ -279,17 +255,16 @@ class KallitheaExternalAuthPlugin(Kallit log.debug('Updating or creating user info from %s plugin', self.name) user = UserModel().create_or_update( - username=username, + username=user_data['username'], password=passwd, email=user_data["email"], firstname=user_data["firstname"], lastname=user_data["lastname"], - active=user_data["active"], + active=active, admin=user_data["admin"], extern_name=user_data["extern_name"], - extern_type=self.name + extern_type=self.name, ) - Session().flush() # enforce user is just in given groups, all of them has to be ones # created from plugins. We store this info in _group_data JSON field groups = user_data['groups'] or [] @@ -298,10 +273,10 @@ class KallitheaExternalAuthPlugin(Kallit return user_data -def importplugin(plugin): +def loadplugin(plugin): """ - Imports and returns the authentication plugin in the module named by plugin - (e.g., plugin='kallithea.lib.auth_modules.auth_internal'). Returns the + Imports, instantiates, and returns the authentication plugin in the module named by plugin + (e.g., plugin='kallithea.lib.auth_modules.auth_internal'). Returns an instance of the KallitheaAuthPluginBase subclass on success, raises exceptions on failure. raises: @@ -314,8 +289,6 @@ def importplugin(plugin): parts = plugin.split(u'.lib.auth_modules.auth_', 1) if len(parts) == 2: _module, pn = parts - if pn == EXTERN_TYPE_INTERNAL: - pn = "internal" plugin = u'kallithea.lib.auth_modules.auth_' + pn PLUGIN_CLASS_NAME = "KallitheaAuthPlugin" try: @@ -333,16 +306,8 @@ def importplugin(plugin): if not issubclass(pluginclass, KallitheaAuthPluginBase): raise TypeError("Authentication class %s.KallitheaAuthPlugin is not " "a subclass of %s" % (plugin, KallitheaAuthPluginBase)) - return pluginclass - -def loadplugin(plugin): - """ - Loads and returns an instantiated authentication plugin. - - see: importplugin - """ - plugin = importplugin(plugin)() + plugin = pluginclass() if plugin.plugin_settings.im_func != KallitheaAuthPluginBase.plugin_settings.im_func: raise TypeError("Authentication class %s.KallitheaAuthPluginBase " "has overridden the plugin_settings method, which is " @@ -350,6 +315,19 @@ def loadplugin(plugin): return plugin +def get_auth_plugins(): + """Return a list of instances of plugins that are available and enabled""" + auth_plugins = [] + for plugin_name in Setting.get_by_name("auth_plugins").app_settings_value: + try: + plugin = loadplugin(plugin_name) + except Exception: + log.exception('Failed to load authentication module %s' % (plugin_name)) + else: + auth_plugins.append(plugin) + return auth_plugins + + def authenticate(username, password, environ=None): """ Authentication function used for access control, @@ -361,15 +339,10 @@ def authenticate(username, password, env :returns: None if auth failed, user_data dict if auth is correct """ - auth_plugins = Setting.get_auth_plugins() - log.debug('Authentication against %s plugins', auth_plugins) - for module in auth_plugins: - try: - plugin = loadplugin(module) - except (ImportError, AttributeError, TypeError) as e: - raise ImportError('Failed to load authentication module %s : %s' - % (module, str(e))) - log.debug('Trying authentication using ** %s **', module) + auth_plugins = get_auth_plugins() + for plugin in auth_plugins: + module = plugin.__class__.__module__ + log.debug('Trying authentication using %s', module) # load plugin settings from Kallithea database plugin_name = plugin.name plugin_settings = {} @@ -377,7 +350,7 @@ def authenticate(username, password, env conf_key = "auth_%s_%s" % (plugin_name, v["name"]) setting = Setting.get_by_name(conf_key) plugin_settings[v["name"]] = setting.app_settings_value if setting else None - log.debug('Plugin settings \n%s', formatted_json(plugin_settings)) + log.debug('Settings for auth plugin %s:\n%s', plugin_name, formatted_json(plugin_settings)) if not str2bool(plugin_settings["enabled"]): log.info("Authentication plugin %s is disabled, skipping for %s", @@ -387,7 +360,12 @@ def authenticate(username, password, env # use plugin's method of user extraction. user = plugin.get_user(username, environ=environ, settings=plugin_settings) - log.debug('Plugin %s extracted user is `%s`', module, user) + log.debug('Plugin %s extracted user `%s`', module, user) + + if user is not None and not user.active: + log.error("Rejecting authentication of in-active user %s", user) + continue + if not plugin.accepts(user): log.debug('Plugin %s does not accept user `%s` for authentication', module, user) @@ -395,8 +373,15 @@ def authenticate(username, password, env else: log.debug('Plugin %s accepted user `%s` for authentication', module, user) + # The user might have tried to authenticate using their email address, + # then the username variable wouldn't contain a valid username. + # But as the plugin has accepted the user, .username field should + # have a valid username, so use it for authentication purposes. + if user is not None: + username = user.username - log.info('Authenticating user using %s plugin', plugin.__module__) + log.info('Authenticating user using %s plugin', module) + # _authenticate is a wrapper for .auth() method of plugin. # it checks if .auth() sends proper data. For KallitheaExternalAuthPlugin # it also maps users to Database and maps the attributes returned @@ -405,7 +390,7 @@ def authenticate(username, password, env user_data = plugin._authenticate(user, username, password, plugin_settings, environ=environ or {}) - log.debug('PLUGIN USER DATA: %s', user_data) + log.debug('Plugin user data: %s', user_data) if user_data is not None: log.debug('Plugin returned proper authentication data') @@ -414,17 +399,18 @@ def authenticate(username, password, env # we failed to Auth because .auth() method didn't return the user if username: log.warning("User `%s` failed to authenticate against %s", - username, plugin.__module__) + username, module) return None + def get_managed_fields(user): """return list of fields that are managed by the user's auth source, usually some of - 'username', 'firstname', 'lastname', 'email', 'active', 'password' + 'username', 'firstname', 'lastname', 'email', 'password' """ - auth_plugins = Setting.get_auth_plugins() - for module in auth_plugins: + auth_plugins = get_auth_plugins() + for plugin in auth_plugins: + module = plugin.__class__.__module__ log.debug('testing %s (%s) with auth plugin %s', user, user.extern_type, module) - plugin = loadplugin(module) if plugin.name == user.extern_type: return plugin.get_managed_fields() log.error('no auth plugin %s found for %s', user.extern_type, user) diff --git a/kallithea/lib/auth_modules/auth_container.py b/kallithea/lib/auth_modules/auth_container.py --- a/kallithea/lib/auth_modules/auth_container.py +++ b/kallithea/lib/auth_modules/auth_container.py @@ -27,9 +27,9 @@ Original author and date, and relevant c import logging from kallithea.lib import auth_modules -from kallithea.lib.utils2 import str2bool, safe_unicode +from kallithea.lib.utils2 import str2bool, safe_unicode, safe_str from kallithea.lib.compat import hybrid_property -from kallithea.model.db import User +from kallithea.model.db import User, Setting log = logging.getLogger(__name__) @@ -53,15 +53,39 @@ class KallitheaAuthPlugin(auth_modules.K "name": "header", "validator": self.validators.UnicodeString(strip=True, not_empty=True), "type": "string", - "description": "Header to extract the user from", + "description": "Request header to extract the username from", "default": "REMOTE_USER", - "formname": "Header" + "formname": "Username header" + }, + { + "name": "email_header", + "validator": self.validators.UnicodeString(strip=True), + "type": "string", + "description": "Optional request header to extract the email from", + "default": "", + "formname": "Email header" + }, + { + "name": "firstname_header", + "validator": self.validators.UnicodeString(strip=True), + "type": "string", + "description": "Optional request header to extract the first name from", + "default": "", + "formname": "Firstname header" + }, + { + "name": "lastname_header", + "validator": self.validators.UnicodeString(strip=True), + "type": "string", + "description": "Optional request header to extract the last name from", + "default": "", + "formname": "Lastname header" }, { "name": "fallback_header", "validator": self.validators.UnicodeString(strip=True), "type": "string", - "description": "Header to extract the user from when main one fails", + "description": "Request header to extract the user from when main one fails", "default": "HTTP_X_FORWARDED_USER", "formname": "Fallback header" }, @@ -81,10 +105,6 @@ class KallitheaAuthPlugin(auth_modules.K def use_fake_password(self): return True - def user_activation_state(self): - def_user_perms = User.get_default_user().AuthUser.permissions['global'] - return 'hg.extern_activate.auto' in def_user_perms - def _clean_username(self, username): # Removing realm and domain from username username = username.partition('@')[0] @@ -158,7 +178,7 @@ class KallitheaAuthPlugin(auth_modules.K # only way to log in is using environ username = None if userobj: - username = getattr(userobj, 'username') + username = safe_str(getattr(userobj, 'username')) if not username: # we don't have any objects in DB, user doesn't exist, extract @@ -171,10 +191,9 @@ class KallitheaAuthPlugin(auth_modules.K # old attrs fetched from Kallithea database admin = getattr(userobj, 'admin', False) - active = getattr(userobj, 'active', True) - email = getattr(userobj, 'email', '') - firstname = getattr(userobj, 'firstname', '') - lastname = getattr(userobj, 'lastname', '') + email = environ.get(settings.get('email_header'), getattr(userobj, 'email', '')) + firstname = environ.get(settings.get('firstname_header'), getattr(userobj, 'firstname', '')) + lastname = environ.get(settings.get('lastname_header'), getattr(userobj, 'lastname', '')) user_data = { 'username': username, @@ -183,8 +202,6 @@ class KallitheaAuthPlugin(auth_modules.K 'groups': [], 'email': email or '', 'admin': admin or False, - 'active': active, - 'active_from_extern': True, 'extern_name': username, } @@ -192,4 +209,11 @@ class KallitheaAuthPlugin(auth_modules.K return user_data def get_managed_fields(self): - return ['username', 'password'] + fields = ['username', 'password'] + if(Setting.get_by_name('auth_container_email_header').app_settings_value): + fields.append('email') + if(Setting.get_by_name('auth_container_firstname_header').app_settings_value): + fields.append('firstname') + if(Setting.get_by_name('auth_container_lastname_header').app_settings_value): + fields.append('lastname') + return fields diff --git a/kallithea/lib/auth_modules/auth_crowd.py b/kallithea/lib/auth_modules/auth_crowd.py --- a/kallithea/lib/auth_modules/auth_crowd.py +++ b/kallithea/lib/auth_modules/auth_crowd.py @@ -52,7 +52,7 @@ class CrowdServer(object): passwd="some_passwd", version="1") """ - if not "port" in kwargs: + if "port" not in kwargs: kwargs["port"] = "8095" self._logger = kwargs.get("logger", logging.getLogger(__name__)) self._uri = "%s://%s:%s/crowd" % (kwargs.get("method", "http"), @@ -88,14 +88,14 @@ class CrowdServer(object): log.debug("Sent crowd: \n%s", formatted_json({"url": url, "body": body, "headers": _headers})) - request = urllib2.Request(url, body, _headers) + req = urllib2.Request(url, body, _headers) if method: - request.get_method = lambda: method + req.get_method = lambda: method global msg msg = "" try: - rdoc = self.opener.open(request) + rdoc = self.opener.open(req) msg = "".join(rdoc.readlines()) if not msg and empty_response_ok: rval = {} @@ -131,6 +131,8 @@ class CrowdServer(object): class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin): + def __init__(self): + self._protocol_values = ["http", "https"] @hybrid_property def name(self): @@ -139,6 +141,14 @@ class KallitheaAuthPlugin(auth_modules.K def settings(self): settings = [ { + "name": "method", + "validator": self.validators.OneOf(self._protocol_values), + "type": "select", + "values": self._protocol_values, + "description": "The protocol used to connect to the Atlassian CROWD server.", + "formname": "Protocol" + }, + { "name": "host", "validator": self.validators.UnicodeString(strip=True), "type": "string", @@ -183,10 +193,6 @@ class KallitheaAuthPlugin(auth_modules.K def use_fake_password(self): return True - def user_activation_state(self): - def_user_perms = User.get_default_user().AuthUser.permissions['global'] - return 'hg.extern_activate.auto' in def_user_perms - def auth(self, userobj, username, password, settings, **kwargs): """ Given a user object (which may be null), username, a plaintext password, @@ -208,6 +214,11 @@ class KallitheaAuthPlugin(auth_modules.K crowd_user = server.user_auth(username, password) log.debug("Crowd returned: \n%s", formatted_json(crowd_user)) if not crowd_user["status"]: + log.error('Crowd authentication as %s returned no status', username) + return None + + if not crowd_user.get('active'): + log.error('Crowd authentication as %s returned in-active user', username) return None res = server.user_groups(crowd_user["name"]) @@ -216,7 +227,6 @@ class KallitheaAuthPlugin(auth_modules.K # old attrs fetched from Kallithea database admin = getattr(userobj, 'admin', False) - active = getattr(userobj, 'active', True) email = getattr(userobj, 'email', '') firstname = getattr(userobj, 'firstname', '') lastname = getattr(userobj, 'lastname', '') @@ -228,8 +238,6 @@ class KallitheaAuthPlugin(auth_modules.K 'groups': crowd_user["groups"], 'email': crowd_user["email"] or email, 'admin': admin, - 'active': active, - 'active_from_extern': crowd_user.get('active'), # ??? 'extern_name': crowd_user["name"], } diff --git a/kallithea/lib/auth_modules/auth_internal.py b/kallithea/lib/auth_modules/auth_internal.py --- a/kallithea/lib/auth_modules/auth_internal.py +++ b/kallithea/lib/auth_modules/auth_internal.py @@ -28,7 +28,6 @@ Original author and date, and relevant c import logging -from kallithea import EXTERN_TYPE_INTERNAL from kallithea.lib import auth_modules from kallithea.lib.compat import formatted_json, hybrid_property from kallithea.model.db import User @@ -42,15 +41,12 @@ class KallitheaAuthPlugin(auth_modules.K @hybrid_property def name(self): - return EXTERN_TYPE_INTERNAL + # Also found as kallithea.lib.model.db.User.DEFAULT_AUTH_TYPE + return 'internal' def settings(self): return [] - def user_activation_state(self): - def_user_perms = User.get_default_user().AuthUser.permissions['global'] - return 'hg.register.auto_activate' in def_user_perms - def accepts(self, user, accepts_empty=True): """ Custom accepts for this auth that doesn't accept empty users. We @@ -78,28 +74,23 @@ class KallitheaAuthPlugin(auth_modules.K "groups": [], "email": userobj.email, "admin": userobj.admin, - "active": userobj.active, - "active_from_extern": userobj.active, "extern_name": userobj.user_id, } + log.debug(formatted_json(user_data)) - log.debug(formatted_json(user_data)) - if userobj.active: - from kallithea.lib import auth - password_match = auth.KallitheaCrypto.hash_check(password, userobj.password) - if userobj.username == User.DEFAULT_USER and userobj.active: - log.info('user %s authenticated correctly as anonymous user', - username) - return user_data + from kallithea.lib import auth + password_match = auth.check_password(password, userobj.password) + if userobj.is_default_user: + log.info('user %s authenticated correctly as anonymous user', + username) + return user_data - elif userobj.username == username and password_match: - log.info('user %s authenticated correctly', user_data['username']) - return user_data - log.error("user %s had a bad password", username) - return None - else: - log.warning('user %s tried auth but is disabled', username) - return None + elif userobj.username == username and password_match: + log.info('user %s authenticated correctly', user_data['username']) + return user_data + + log.error("user %s had a bad password", username) + return None def get_managed_fields(self): # Note: 'username' should only be editable (at least for user) if self registration is enabled diff --git a/kallithea/lib/auth_modules/auth_ldap.py b/kallithea/lib/auth_modules/auth_ldap.py --- a/kallithea/lib/auth_modules/auth_ldap.py +++ b/kallithea/lib/auth_modules/auth_ldap.py @@ -41,6 +41,7 @@ log = logging.getLogger(__name__) try: import ldap + import ldap.filter except ImportError: # means that python-ldap is not installed ldap = None @@ -48,38 +49,33 @@ except ImportError: class AuthLdap(object): - def __init__(self, server, base_dn, port=389, bind_dn='', bind_pass='', - tls_kind='PLAIN', tls_reqcert='DEMAND', ldap_version=3, + def __init__(self, server, base_dn, port=None, bind_dn='', bind_pass='', + tls_kind='LDAPS', tls_reqcert='DEMAND', cacertdir=None, ldap_version=3, ldap_filter='(&(objectClass=user)(!(objectClass=computer)))', search_scope='SUBTREE', attr_login='uid'): if ldap is None: raise LdapImportError self.ldap_version = ldap_version - ldap_server_type = 'ldap' self.TLS_KIND = tls_kind - - if self.TLS_KIND == 'LDAPS': - port = port or 689 - ldap_server_type = ldap_server_type + 's' - OPT_X_TLS_DEMAND = 2 self.TLS_REQCERT = getattr(ldap, 'OPT_X_TLS_%s' % tls_reqcert, OPT_X_TLS_DEMAND) - # split server into list - self.LDAP_SERVER_ADDRESS = server.split(',') - self.LDAP_SERVER_PORT = port + self.cacertdir = cacertdir - # USE FOR READ ONLY BIND TO LDAP SERVER + protocol = 'ldaps' if self.TLS_KIND == 'LDAPS' else 'ldap' + if not port: + port = 636 if self.TLS_KIND == 'LDAPS' else 389 + self.LDAP_SERVER = str(', '.join( + "%s://%s:%s" % (protocol, + host.strip(), + port) + for host in server.split(','))) + self.LDAP_BIND_DN = safe_str(bind_dn) self.LDAP_BIND_PASS = safe_str(bind_pass) - _LDAP_SERVERS = [] - for host in self.LDAP_SERVER_ADDRESS: - _LDAP_SERVERS.append("%s://%s:%s" % (ldap_server_type, - host.replace(' ', ''), - self.LDAP_SERVER_PORT)) - self.LDAP_SERVER = str(', '.join(s for s in _LDAP_SERVERS)) + self.BASE_DN = safe_str(base_dn) self.LDAP_FILTER = safe_str(ldap_filter) self.SEARCH_SCOPE = getattr(ldap, 'SCOPE_%s' % search_scope) @@ -96,10 +92,6 @@ class AuthLdap(object): :param password: password """ - from kallithea.lib.helpers import chop_at - - uid = chop_at(username, "@%s" % self.LDAP_SERVER_ADDRESS) - if not password: log.debug("Attempt to authenticate LDAP user " "with blank password rejected.") @@ -107,9 +99,11 @@ class AuthLdap(object): if "," in username: raise LdapUsernameError("invalid character in username: ,") try: - if hasattr(ldap, 'OPT_X_TLS_CACERTDIR'): - ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, - '/etc/openldap/cacerts') + if self.cacertdir: + if hasattr(ldap, 'OPT_X_TLS_CACERTDIR'): + ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, self.cacertdir) + else: + log.debug("OPT_X_TLS_CACERTDIR is not available - can't set %s", self.cacertdir) ldap.set_option(ldap.OPT_REFERRALS, ldap.OPT_OFF) ldap.set_option(ldap.OPT_RESTART, ldap.OPT_ON) ldap.set_option(ldap.OPT_TIMEOUT, 20) @@ -131,8 +125,9 @@ class AuthLdap(object): self.LDAP_BIND_DN) server.simple_bind_s(self.LDAP_BIND_DN, self.LDAP_BIND_PASS) - filter_ = '(&%s(%s=%s))' % (self.LDAP_FILTER, self.attr_login, - username) + filter_ = '(&%s(%s=%s))' % (self.LDAP_FILTER, + ldap.filter.escape_filter_chars(self.attr_login), + ldap.filter.escape_filter_chars(username)) log.debug("Authenticating %r filter %s at %s", self.BASE_DN, filter_, self.LDAP_SERVER) lobjects = server.search_ext_s(self.BASE_DN, self.SEARCH_SCOPE, @@ -148,26 +143,28 @@ class AuthLdap(object): try: log.debug('Trying simple bind with %s', dn) server.simple_bind_s(dn, safe_str(password)) - attrs = server.search_ext_s(dn, ldap.SCOPE_BASE, - '(objectClass=*)')[0][1] - break + results = server.search_ext_s(dn, ldap.SCOPE_BASE, + '(objectClass=*)') + if len(results) == 1: + dn_, attrs = results[0] + assert dn_ == dn + return dn, attrs except ldap.INVALID_CREDENTIALS: - log.debug("LDAP rejected password for user '%s' (%s): %s", - uid, username, dn) + log.debug("LDAP rejected password for user '%s': %s", + username, dn) + continue # accept authentication as another ldap user with same username - else: - log.debug("No matching LDAP objects for authentication " - "of '%s' (%s)", uid, username) - raise LdapPasswordError() + log.debug("No matching LDAP objects for authentication " + "of '%s'", username) + raise LdapPasswordError() except ldap.NO_SUCH_OBJECT: - log.debug("LDAP says no such user '%s' (%s)", uid, username) + log.debug("LDAP says no such user '%s'", username) raise LdapUsernameError() except ldap.SERVER_DOWN: - raise LdapConnectionError("LDAP can't access authentication server") - - return dn, attrs + # [0] might be {'info': "TLS error -8179:Peer's Certificate issuer is not recognized.", 'desc': "Can't contact LDAP server"} + raise LdapConnectionError("LDAP can't connect to authentication server") class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin): @@ -192,11 +189,11 @@ class KallitheaAuthPlugin(auth_modules.K }, { "name": "port", - "validator": self.validators.Number(strip=True, not_empty=True), + "validator": self.validators.Number(strip=True), "type": "string", - "description": "Port that the LDAP server is listening on", - "default": 389, - "formname": "Port" + "description": "Port that the LDAP server is listening on. Defaults to 389 for PLAIN/START_TLS and 636 for LDAPS.", + "default": "", + "formname": "Custom LDAP Port" }, { "name": "dn_user", @@ -218,7 +215,7 @@ class KallitheaAuthPlugin(auth_modules.K "type": "select", "values": self._tls_kind_values, "description": "TLS Type", - "default": 'PLAIN', + "default": 'LDAPS', "formname": "Connection Security" }, { @@ -230,6 +227,13 @@ class KallitheaAuthPlugin(auth_modules.K "formname": "Certificate Checks" }, { + "name": "cacertdir", + "validator": self.validators.UnicodeString(strip=True), + "type": "string", + "description": "Optional: Custom CA certificate directory for validating LDAPS", + "formname": "Custom CA Certificates" + }, + { "name": "base_dn", "validator": self.validators.UnicodeString(strip=True), "type": "string", @@ -285,10 +289,6 @@ class KallitheaAuthPlugin(auth_modules.K def use_fake_password(self): return True - def user_activation_state(self): - def_user_perms = User.get_default_user().AuthUser.permissions['global'] - return 'hg.extern_activate.auto' in def_user_perms - def auth(self, userobj, username, password, settings, **kwargs): """ Given a user object (which may be null), username, a plaintext password, @@ -313,6 +313,7 @@ class KallitheaAuthPlugin(auth_modules.K 'bind_pass': settings.get('dn_pass'), 'tls_kind': settings.get('tls_kind'), 'tls_reqcert': settings.get('tls_reqcert'), + 'cacertdir': settings.get('cacertdir'), 'ldap_filter': settings.get('filter'), 'search_scope': settings.get('search_scope'), 'attr_login': settings.get('attr_login'), @@ -334,7 +335,6 @@ class KallitheaAuthPlugin(auth_modules.K # old attrs fetched from Kallithea database admin = getattr(userobj, 'admin', False) - active = getattr(userobj, 'active', self.user_activation_state()) email = getattr(userobj, 'email', '') firstname = getattr(userobj, 'firstname', '') lastname = getattr(userobj, 'lastname', '') @@ -346,19 +346,18 @@ class KallitheaAuthPlugin(auth_modules.K 'groups': [], 'email': get_ldap_attr('attr_email') or email, 'admin': admin, - 'active': active, - "active_from_extern": None, 'extern_name': user_dn, } log.info('user %s authenticated correctly', user_data['username']) return user_data - except (LdapUsernameError, LdapPasswordError, LdapImportError): - log.error(traceback.format_exc()) - return None - except (Exception,): - log.error(traceback.format_exc()) - return None + except LdapUsernameError: + log.info('Error authenticating %s with LDAP: User not found', username) + except LdapPasswordError: + log.info('Error authenticating %s with LDAP: Password error', username) + except LdapImportError: + log.error('Error authenticating %s with LDAP: LDAP not available', username) + return None def get_managed_fields(self): return ['username', 'firstname', 'lastname', 'email', 'password'] diff --git a/kallithea/lib/auth_modules/auth_pam.py b/kallithea/lib/auth_modules/auth_pam.py --- a/kallithea/lib/auth_modules/auth_pam.py +++ b/kallithea/lib/auth_modules/auth_pam.py @@ -115,7 +115,6 @@ class KallitheaAuthPlugin(auth_modules.K # old attrs fetched from Kallithea database admin = getattr(userobj, 'admin', False) - active = getattr(userobj, 'active', True) email = getattr(userobj, 'email', '') or "%s@%s" % (username, socket.gethostname()) firstname = getattr(userobj, 'firstname', '') lastname = getattr(userobj, 'lastname', '') @@ -127,8 +126,6 @@ class KallitheaAuthPlugin(auth_modules.K 'groups': [g.gr_name for g in grp.getgrall() if username in g.gr_mem], 'email': email, 'admin': admin, - 'active': active, - "active_from_extern": None, 'extern_name': username, } diff --git a/kallithea/lib/base.py b/kallithea/lib/base.py --- a/kallithea/lib/base.py +++ b/kallithea/lib/base.py @@ -29,40 +29,45 @@ Original author and date, and relevant c """ import datetime +import decorator import logging import time import traceback +import warnings import webob.exc import paste.httpexceptions import paste.auth.basic import paste.httpheaders +from webhelpers.pylonslib import secure_form -from pylons import config, tmpl_context as c, request, session, url -from pylons.controllers import WSGIController -from pylons.controllers.util import redirect -from pylons.templating import render_mako as render # don't remove this import -from pylons.i18n.translation import _ +from tg import config, tmpl_context as c, request, response, session, render_template +from tg import TGController +from tg.i18n import ugettext as _ from kallithea import __version__, BACKENDS -from kallithea.lib.utils2 import str2bool, safe_unicode, AttributeDict,\ +from kallithea.config.routing import url +from kallithea.lib.utils2 import str2bool, safe_unicode, AttributeDict, \ safe_str, safe_int from kallithea.lib import auth_modules from kallithea.lib.auth import AuthUser, HasPermissionAnyMiddleware +from kallithea.lib.compat import json from kallithea.lib.utils import get_repo_slug from kallithea.lib.exceptions import UserCreationError from kallithea.lib.vcs.exceptions import RepositoryError, EmptyRepositoryError, ChangesetDoesNotExistError from kallithea.model import meta -from kallithea.model.db import Repository, Ui, User, Setting -from kallithea.model.notification import NotificationModel +from kallithea.model.db import PullRequest, Repository, Ui, User, Setting from kallithea.model.scm import ScmModel -from kallithea.model.pull_request import PullRequestModel log = logging.getLogger(__name__) +def render(template_path): + return render_template({'url': url}, 'mako', template_path) + + def _filter_proxy(ip): """ HEADERS can have multiple ips inside the left-most being the original @@ -98,7 +103,7 @@ def _get_ip_addr(environ): def _get_access_path(environ): path = environ.get('PATH_INFO') - org_req = environ.get('pylons.original_request') + org_req = environ.get('tg.original_request') if org_req: path = org_req.environ.get('PATH_INFO') return path @@ -117,7 +122,9 @@ def log_in_user(user, remember, is_exter auth_user = AuthUser(dbuser=user, is_external_auth=is_external_auth) - auth_user.set_authenticated() + # It should not be possible to explicitly log in as the default user. + assert not auth_user.is_default_user + auth_user.is_authenticated = True # Start new session to prevent session fixation attacks. session.invalidate() @@ -140,6 +147,42 @@ def log_in_user(user, remember, is_exter return auth_user +def check_locking_state(action, repo_name, user): + """ + Checks locking on this repository, if locking is enabled, and if lock + is present. Returns a tuple of make_lock, locked, locked_by. make_lock + can have 3 states: None (do nothing), True (make lock), and False + (release lock). This value is later propagated to hooks, telling them + what to do. + """ + locked = False # defines that locked error should be thrown to user + make_lock = None + repo = Repository.get_by_repo_name(repo_name) + locked_by = repo.locked + if repo and repo.enable_locking: + if action == 'push': + # Check if repo already is locked !, if it is compare users + user_id, _date = locked_by + if user.user_id == user_id: + log.debug('Got push from user %s, now unlocking', user) + # Unlock if we have push from the user who locked + make_lock = False + else: + # Another used tried to push - deny access with something like 423 Locked! + locked = True + if action == 'pull': + if repo.locked[0] and repo.locked[1]: + locked = True + else: + log.debug('Setting lock on repo %s by %s', repo, user) + make_lock = True + else: + log.debug('Repository %s does not have locking enabled', repo) + log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s', + make_lock, locked, locked_by) + return make_lock, locked, locked_by + + class BasicAuth(paste.auth.basic.AuthBasicAuthenticator): def __init__(self, realm, authfunc, auth_http_code=None): @@ -147,8 +190,14 @@ class BasicAuth(paste.auth.basic.AuthBas self.authfunc = authfunc self._rc_auth_http_code = auth_http_code - def build_authentication(self): + def build_authentication(self, environ): head = paste.httpheaders.WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm) + # Consume the whole body before sending a response + try: + request_body_size = int(environ.get('CONTENT_LENGTH', 0)) + except (ValueError): + request_body_size = 0 + environ['wsgi.input'].read(request_body_size) if self._rc_auth_http_code and self._rc_auth_http_code == '403': # return 403 if alternative http return code is specified in # Kallithea config @@ -158,22 +207,25 @@ class BasicAuth(paste.auth.basic.AuthBas def authenticate(self, environ): authorization = paste.httpheaders.AUTHORIZATION(environ) if not authorization: - return self.build_authentication() + return self.build_authentication(environ) (authmeth, auth) = authorization.split(' ', 1) if 'basic' != authmeth.lower(): - return self.build_authentication() + return self.build_authentication(environ) auth = auth.strip().decode('base64') _parts = auth.split(':', 1) if len(_parts) == 2: username, password = _parts if self.authfunc(username, password, environ) is not None: return username - return self.build_authentication() + return self.build_authentication(environ) __call__ = authenticate class BaseVCSController(object): + """Base controller for handling Mercurial/Git protocol requests + (coming from a VCS client, and not a browser). + """ def __init__(self, application, config): self.application = application @@ -183,7 +235,72 @@ class BaseVCSController(object): # authenticate this VCS request using the authentication modules self.authenticate = BasicAuth('', auth_modules.authenticate, config.get('auth_ret_code')) - self.ip_addr = '0.0.0.0' + + def _authorize(self, environ, start_response, action, repo_name, ip_addr): + """Authenticate and authorize user. + + Since we're dealing with a VCS client and not a browser, we only + support HTTP basic authentication, either directly via raw header + inspection, or by using container authentication to delegate the + authentication to the web server. + + Returns (user, None) on successful authentication and authorization. + Returns (None, wsgi_app) to send the wsgi_app response to the client. + """ + # Check if anonymous access is allowed. + default_user = User.get_default_user(cache=True) + is_default_user_allowed = (default_user.active and + self._check_permission(action, default_user, repo_name, ip_addr)) + if is_default_user_allowed: + return default_user, None + + if not default_user.active: + log.debug('Anonymous access is disabled') + else: + log.debug('Not authorized to access this ' + 'repository as anonymous user') + + username = None + #============================================================== + # DEFAULT PERM FAILED OR ANONYMOUS ACCESS IS DISABLED SO WE + # NEED TO AUTHENTICATE AND ASK FOR AUTH USER PERMISSIONS + #============================================================== + + # try to auth based on environ, container auth methods + log.debug('Running PRE-AUTH for container based authentication') + pre_auth = auth_modules.authenticate('', '', environ) + if pre_auth is not None and pre_auth.get('username'): + username = pre_auth['username'] + log.debug('PRE-AUTH got %s as username', username) + + # If not authenticated by the container, running basic auth + if not username: + self.authenticate.realm = safe_str(self.config['realm']) + result = self.authenticate(environ) + if isinstance(result, str): + paste.httpheaders.AUTH_TYPE.update(environ, 'basic') + paste.httpheaders.REMOTE_USER.update(environ, result) + username = result + else: + return None, result.wsgi_application + + #============================================================== + # CHECK PERMISSIONS FOR THIS REQUEST USING GIVEN USERNAME + #============================================================== + try: + user = User.get_by_username_or_email(username) + if user is None or not user.active: + return None, webob.exc.HTTPForbidden() + except Exception: + log.error(traceback.format_exc()) + return None, webob.exc.HTTPInternalServerError() + + # check permissions for this repository + perm = self._check_permission(action, user, repo_name, ip_addr) + if not perm: + return None, webob.exc.HTTPForbidden() + + return user, None def _handle_request(self, environ, start_response): raise NotImplementedError() @@ -205,14 +322,6 @@ class BaseVCSController(object): return '/'.join(data) - def _invalidate_cache(self, repo_name): - """ - Sets cache for this repository for invalidation on next access - - :param repo_name: full repo name, also a cache key - """ - ScmModel().mark_for_invalidation(repo_name) - def _check_permission(self, action, user, repo_name, ip_addr=None): """ Checks permissions using action (push/pull) user and repository @@ -248,64 +357,6 @@ class BaseVCSController(object): def _get_ip_addr(self, environ): return _get_ip_addr(environ) - def _check_ssl(self, environ): - """ - Checks the SSL check flag and returns False if SSL is not present - and required True otherwise - """ - #check if we have SSL required ! if not it's a bad request ! - if str2bool(Ui.get_by_key('push_ssl').ui_value): - org_proto = environ.get('wsgi._org_proto', environ['wsgi.url_scheme']) - if org_proto != 'https': - log.debug('proto is %s and SSL is required BAD REQUEST !', - org_proto) - return False - return True - - def _check_locking_state(self, environ, action, repo, user_id): - """ - Checks locking on this repository, if locking is enabled and lock is - present returns a tuple of make_lock, locked, locked_by. - make_lock can have 3 states None (do nothing) True, make lock - False release lock, This value is later propagated to hooks, which - do the locking. Think about this as signals passed to hooks what to do. - - """ - locked = False # defines that locked error should be thrown to user - make_lock = None - repo = Repository.get_by_repo_name(repo) - user = User.get(user_id) - - # this is kind of hacky, but due to how mercurial handles client-server - # server see all operation on changeset; bookmarks, phases and - # obsolescence marker in different transaction, we don't want to check - # locking on those - obsolete_call = environ['QUERY_STRING'] in ['cmd=listkeys',] - locked_by = repo.locked - if repo and repo.enable_locking and not obsolete_call: - if action == 'push': - #check if it's already locked !, if it is compare users - user_id, _date = repo.locked - if user.user_id == user_id: - log.debug('Got push from user %s, now unlocking', user) - # unlock if we have push from user who locked - make_lock = False - else: - # we're not the same user who locked, ban with 423 ! - locked = True - if action == 'pull': - if repo.locked[0] and repo.locked[1]: - locked = True - else: - log.debug('Setting lock on repo %s by %s', repo, user) - make_lock = True - - else: - log.debug('Repository %s do not have locking enabled', repo) - log.debug('FINAL locking values make_lock:%s,locked:%s,locked_by:%s', - make_lock, locked, locked_by) - return make_lock, locked, locked_by - def __call__(self, environ, start_response): start = time.time() try: @@ -316,11 +367,11 @@ class BaseVCSController(object): meta.Session.remove() -class BaseController(WSGIController): +class BaseController(TGController): - def __before__(self): + def _before(self, *args, **kwargs): """ - __before__ is called before controller methods and after __call__ + _before is called before controller methods and after __call__ """ c.kallithea_version = __version__ rc_config = Setting.get_app_settings() @@ -331,8 +382,8 @@ class BaseController(WSGIController): ## DB stored c.visual.show_public_icon = str2bool(rc_config.get('show_public_icon')) c.visual.show_private_icon = str2bool(rc_config.get('show_private_icon')) - c.visual.stylify_metatags = str2bool(rc_config.get('stylify_metatags')) - c.visual.dashboard_items = safe_int(rc_config.get('dashboard_items', 100)) + c.visual.stylify_metalabels = str2bool(rc_config.get('stylify_metalabels')) + c.visual.page_size = safe_int(rc_config.get('dashboard_items', 100)) c.visual.admin_grid_items = safe_int(rc_config.get('admin_grid_items', 100)) c.visual.repository_fields = str2bool(rc_config.get('repository_fields')) c.visual.show_version = str2bool(rc_config.get('show_version')) @@ -366,47 +417,45 @@ class BaseController(WSGIController): c.repo_name = get_repo_slug(request) # can be empty c.backends = BACKENDS.keys() - c.unread_notifications = NotificationModel()\ - .get_unread_cnt_for_user(c.authuser.user_id) self.cut_off_limit = safe_int(config.get('cut_off_limit')) - c.my_pr_count = PullRequestModel().get_pullrequest_cnt_for_user(c.authuser.user_id) + c.my_pr_count = PullRequest.query(reviewer_id=request.authuser.user_id, include_closed=False).count() - self.sa = meta.Session - self.scm_model = ScmModel(self.sa) + self.scm_model = ScmModel() @staticmethod - def _determine_auth_user(api_key, session_authuser): + def _determine_auth_user(api_key, bearer_token, session_authuser): """ - Create an `AuthUser` object given the API key (if any) and the - value of the authuser session cookie. + Create an `AuthUser` object given the API key/bearer token + (if any) and the value of the authuser session cookie. """ + # Authenticate by bearer token + if bearer_token is not None: + api_key = bearer_token + # Authenticate by API key - if api_key: - # when using API_KEY we are sure user exists. - return AuthUser(dbuser=User.get_by_api_key(api_key), - is_external_auth=True) + if api_key is not None: + au = AuthUser(dbuser=User.get_by_api_key(api_key), + authenticating_api_key=api_key, is_external_auth=True) + if au.is_anonymous: + log.warning('API key ****%s is NOT valid', api_key[-4:]) + raise webob.exc.HTTPForbidden(_('Invalid API key')) + return au # Authenticate by session cookie # In ancient login sessions, 'authuser' may not be a dict. # In that case, the user will have to log in again. - if isinstance(session_authuser, dict): - try: - return AuthUser.from_cookie(session_authuser) - except UserCreationError as e: - # container auth or other auth functions that create users on - # the fly can throw UserCreationError to signal issues with - # user creation. Explanation should be provided in the - # exception object. - from kallithea.lib import helpers as h - h.flash(e, 'error', logf=log.error) + # v0.3 and earlier included an 'is_authenticated' key; if present, + # this must be True. + if isinstance(session_authuser, dict) and session_authuser.get('is_authenticated', True): + return AuthUser.from_cookie(session_authuser) # Authenticate by auth_container plugin (if enabled) if any( - auth_modules.importplugin(name).is_container_auth - for name in Setting.get_auth_plugins() + plugin.is_container_auth + for plugin in auth_modules.get_auth_plugins() ): try: user_info = auth_modules.authenticate('', '', request.environ) @@ -423,29 +472,73 @@ class BaseController(WSGIController): # User is anonymous return AuthUser() - def __call__(self, environ, start_response): - """Invoke the Controller""" + @staticmethod + def _basic_security_checks(): + """Perform basic security/sanity checks before processing the request.""" + + # Only allow the following HTTP request methods. + if request.method not in ['GET', 'HEAD', 'POST']: + raise webob.exc.HTTPMethodNotAllowed() + + # Also verify the _method override - no longer allowed. + if request.params.get('_method') is None: + pass # no override, no problem + else: + raise webob.exc.HTTPMethodNotAllowed() - # WSGIController.__call__ dispatches to the Controller method - # the request is routed to. This routing information is - # available in environ['pylons.routes_dict'] + # Make sure CSRF token never appears in the URL. If so, invalidate it. + if secure_form.token_key in request.GET: + log.error('CSRF key leak detected') + session.pop(secure_form.token_key, None) + session.save() + from kallithea.lib import helpers as h + h.flash(_('CSRF token leak has been detected - all form tokens have been expired'), + category='error') + + # WebOb already ignores request payload parameters for anything other + # than POST/PUT, but double-check since other Kallithea code relies on + # this assumption. + if request.method not in ['POST', 'PUT'] and request.POST: + log.error('%r request with payload parameters; WebOb should have stopped this', request.method) + raise webob.exc.HTTPBadRequest() + + def __call__(self, environ, context): try: - self.ip_addr = _get_ip_addr(environ) + request.ip_addr = _get_ip_addr(environ) # make sure that we update permissions each time we call controller - #set globals for auth user - self.authuser = c.authuser = request.user = self._determine_auth_user( + self._basic_security_checks() + + # set globals for auth user + + bearer_token = None + try: + # Request.authorization may raise ValueError on invalid input + type, params = request.authorization + except (ValueError, TypeError): + pass + else: + if type.lower() == 'bearer': + bearer_token = params + + authuser = self._determine_auth_user( request.GET.get('api_key'), + bearer_token, session.get('authuser'), ) + if not AuthUser.check_ip_allowed(authuser, request.ip_addr): + raise webob.exc.HTTPForbidden() + + request.authuser = authuser + log.info('IP: %s User: %s accessed %s', - self.ip_addr, self.authuser, + request.ip_addr, request.authuser, safe_unicode(_get_access_path(environ)), ) - return WSGIController.__call__(self, environ, start_response) - finally: - meta.Session.remove() + return super(BaseController, self).__call__(environ, context) + except webob.exc.HTTPException as e: + return e class BaseRepoController(BaseController): @@ -460,8 +553,8 @@ class BaseRepoController(BaseController) c.repository_following: weather the current user is following the current repo """ - def __before__(self): - super(BaseRepoController, self).__before__() + def _before(self, *args, **kwargs): + super(BaseRepoController, self)._before(*args, **kwargs) if c.repo_name: # extracted from routes _dbr = Repository.get_by_repo_name(c.repo_name) if not _dbr: @@ -479,7 +572,7 @@ class BaseRepoController(BaseController) if route in ['repo_creating_home']: return check_url = url('repo_creating_home', repo_name=c.repo_name) - return redirect(check_url) + raise webob.exc.HTTPFound(location=check_url) dbr = c.db_repo = _dbr c.db_repo_scm_instance = c.db_repo.scm_instance @@ -489,14 +582,14 @@ class BaseRepoController(BaseController) from kallithea.lib import helpers as h h.flash(_('Repository not found in the filesystem'), category='error') - raise paste.httpexceptions.HTTPNotFound() + raise webob.exc.HTTPNotFound() # some globals counter for menu c.repository_followers = self.scm_model.get_followers(dbr) c.repository_forks = self.scm_model.get_forks(dbr) c.repository_pull_requests = self.scm_model.get_pull_requests(dbr) c.repository_following = self.scm_model.is_following_repo( - c.repo_name, self.authuser.user_id) + c.repo_name, request.authuser.user_id) @staticmethod def _get_ref_rev(repo, ref_type, ref_name, returnempty=False): @@ -522,18 +615,26 @@ class BaseRepoController(BaseController) raise webob.exc.HTTPBadRequest() -class WSGIResultCloseCallback(object): - """Wrap a WSGI result and let close call close after calling the - close method on the result. - """ - def __init__(self, result, close): - self._result = result - self._close = close +@decorator.decorator +def jsonify(func, *args, **kwargs): + """Action decorator that formats output for JSON - def __iter__(self): - return iter(self._result) - - def close(self): - if hasattr(self._result, 'close'): - self._result.close() - self._close() + Given a function that will return content, this decorator will turn + the result into JSON, with a content-type of 'application/json' and + output it. + """ + response.headers['Content-Type'] = 'application/json; charset=utf-8' + data = func(*args, **kwargs) + if isinstance(data, (list, tuple)): + # A JSON list response is syntactically valid JavaScript and can be + # loaded and executed as JavaScript by a malicious third-party site + # using +def submit(g_recaptcha_response, private_key, remoteip): + """ + Submits a reCAPTCHA request for verification. Returns RecaptchaResponse for the request - -""" % { - 'ApiServer': server, - 'PublicKey': public_key, - 'ErrorParam': error_param, - } - - -def submit(recaptcha_challenge_field, recaptcha_response_field, private_key, - remoteip): - """ - Submits a reCAPTCHA request for verification. Returns RecaptchaResponse - for the request - - recaptcha_challenge_field -- The value of recaptcha_challenge_field from the form - recaptcha_response_field -- The value of recaptcha_response_field from the form + g_recaptcha_response -- The value of g_recaptcha_response from the form private_key -- your reCAPTCHA private key remoteip -- the user's IP address """ - if not (recaptcha_response_field and recaptcha_challenge_field and - len(recaptcha_response_field) and len( - recaptcha_challenge_field)): - return RecaptchaResponse(is_valid=False, - error_code='incorrect-captcha-sol') + if not (g_recaptcha_response and len(g_recaptcha_response)): + return RecaptchaResponse(is_valid=False, error_code='incorrect-captcha-sol') def encode_if_necessary(s): if isinstance(s, unicode): @@ -70,14 +31,13 @@ def submit(recaptcha_challenge_field, re return s params = urllib.urlencode({ - 'privatekey': encode_if_necessary(private_key), + 'secret': encode_if_necessary(private_key), 'remoteip': encode_if_necessary(remoteip), - 'challenge': encode_if_necessary(recaptcha_challenge_field), - 'response': encode_if_necessary(recaptcha_response_field), + 'response': encode_if_necessary(g_recaptcha_response), }) - request = urllib2.Request( - url="http://%s/recaptcha/api/verify" % VERIFY_SERVER, + req = urllib2.Request( + url="https://www.google.com/recaptcha/api/siteverify", data=params, headers={ "Content-type": "application/x-www-form-urlencoded", @@ -85,14 +45,15 @@ def submit(recaptcha_challenge_field, re } ) - httpresp = urllib2.urlopen(request) - - return_values = httpresp.read().splitlines() + httpresp = urllib2.urlopen(req) + return_values = json.loads(httpresp.read()) httpresp.close() - return_code = return_values[0] - - if return_code == "true": + if not (isinstance(return_values, dict)): + return RecaptchaResponse(is_valid=False, error_code='incorrect-captcha-sol') + elif (("success" in return_values) and ((return_values["success"] == True) or (return_values["success"] == "true"))): return RecaptchaResponse(is_valid=True) + elif (("error-codes" in return_values) and isinstance(return_values["error-codes"], list) and (len(return_values["error-codes"]) > 0)): + return RecaptchaResponse(is_valid=False, error_code=return_values["error-codes"][0]) else: - return RecaptchaResponse(is_valid=False, error_code=return_values[1]) + return RecaptchaResponse(is_valid=False, error_code='incorrect-captcha-sol') diff --git a/kallithea/lib/utils.py b/kallithea/lib/utils.py --- a/kallithea/lib/utils.py +++ b/kallithea/lib/utils.py @@ -30,30 +30,20 @@ import re import logging import datetime import traceback -import paste import beaker -import tarfile -import shutil -import decorator -import warnings -from os.path import abspath -from os.path import dirname as dn, join as jn -from paste.script.command import Command, BadCommand - -from webhelpers.text import collapse, remove_formatting, strip_tags +from tg import request, response +from tg.i18n import ugettext as _ from beaker.cache import _cache_decorate -from kallithea import BRAND - from kallithea.lib.vcs.utils.hgcompat import ui, config from kallithea.lib.vcs.utils.helpers import get_scm from kallithea.lib.vcs.exceptions import VCSError +from kallithea.lib.exceptions import HgsubversionImportError from kallithea.model import meta from kallithea.model.db import Repository, User, Ui, \ UserLog, RepoGroup, Setting, UserGroup -from kallithea.model.meta import Session from kallithea.model.repo_group import RepoGroupModel from kallithea.lib.utils2 import safe_str, safe_unicode, get_current_authuser from kallithea.lib.vcs.utils.fakemod import create_module @@ -63,42 +53,6 @@ log = logging.getLogger(__name__) REMOVED_REPO_PAT = re.compile(r'rm__\d{8}_\d{6}_\d{6}_.*') -def recursive_replace(str_, replace=' '): - """ - Recursive replace of given sign to just one instance - - :param str_: given string - :param replace: char to find and replace multiple instances - - Examples:: - >>> recursive_replace("Mighty---Mighty-Bo--sstones",'-') - 'Mighty-Mighty-Bo-sstones' - """ - - if str_.find(replace * 2) == -1: - return str_ - else: - str_ = str_.replace(replace * 2, replace) - return recursive_replace(str_, replace) - - -def repo_name_slug(value): - """ - Return slug of name of repository - This function is called on each creation/modification - of repository to prevent bad names in repo - """ - - slug = remove_formatting(value) - slug = strip_tags(slug) - - for c in """`?=[]\;'"<>,/~!@#$%^&*()+{}|: """: - slug = slug.replace(c, '-') - slug = recursive_replace(slug, '-') - slug = collapse(slug, '-') - return slug - - #============================================================================== # PERM DECORATOR HELPERS FOR EXTRACTING NAMES FOR PERM CHECKS #============================================================================== @@ -149,7 +103,7 @@ def get_repo_by_id(repo_name): return None -def action_logger(user, action, repo, ipaddr='', sa=None, commit=False): +def action_logger(user, action, repo, ipaddr='', commit=False): """ Action logger for various actions made by users @@ -160,12 +114,9 @@ def action_logger(user, action, repo, ip :param repo: string name of repository or object containing repo_id, that action was made on :param ipaddr: optional IP address from what the action was made - :param sa: optional sqlalchemy session """ - if not sa: - sa = meta.Session() # if we don't get explicit IP address try to get one from registered user # in tmpl context var if not ipaddr: @@ -186,7 +137,7 @@ def action_logger(user, action, repo, ip repo_obj = Repository.get_by_repo_name(repo_name) else: repo_obj = None - repo_name = '' + repo_name = u'' user_log = UserLog() user_log.user_id = user_obj.user_id @@ -198,12 +149,12 @@ def action_logger(user, action, repo, ip user_log.action_date = datetime.datetime.now() user_log.user_ip = ipaddr - sa.add(user_log) + meta.Session().add(user_log) log.info('Logging action:%s on %s by user:%s ip:%s', action, safe_unicode(repo), user_obj, ipaddr) if commit: - sa.commit() + meta.Session().commit() def get_filesystem_repos(path): @@ -228,7 +179,7 @@ def get_filesystem_repos(path): if REMOVED_REPO_PAT.match(subdir): continue - #skip . dirs TODO: rly? then we should prevent creating them ... + # skip . dirs TODO: rly? then we should prevent creating them ... if subdir.startswith('.'): continue @@ -274,7 +225,11 @@ def is_valid_repo_uri(repo_type, url, ui # or does it pass basic auth MercurialRepository._check_url(url, ui) elif url.startswith('svn+http'): - from hgsubversion.svnrepo import svnremoterepo + try: + from hgsubversion.svnrepo import svnremoterepo + except ImportError: + raise HgsubversionImportError(_('Unable to activate hgsubversion support. ' + 'The "hgsubversion" library is missing')) svnremoterepo(ui, url).svn.uuid elif url.startswith('git+http'): raise NotImplementedError() @@ -347,19 +302,7 @@ def is_valid_repo_group(repo_group_name, return False -def ask_ok(prompt, retries=4, complaint='Yes or no please!'): - while True: - ok = raw_input(prompt) - if ok in ('y', 'ye', 'yes'): - return True - if ok in ('n', 'no', 'nop', 'nope'): - return False - retries = retries - 1 - if retries < 0: - raise IOError - print complaint - -#propagated from mercurial documentation +# propagated from mercurial documentation ui_sections = ['alias', 'auth', 'decode/encode', 'defaults', 'diff', 'email', @@ -372,13 +315,12 @@ ui_sections = ['alias', 'auth', 'ui', 'web', ] -def make_ui(read_from='file', path=None, checkpaths=True, clear_session=True): +def make_ui(read_from='file', path=None, clear_session=True): """ A function that will read python rc files or database and make an mercurial ui object from read options :param path: path to mercurial config file - :param checkpaths: check the path :param read_from: read from 'file' or 'db' """ @@ -392,7 +334,7 @@ def make_ui(read_from='file', path=None, if read_from == 'file': if not os.path.isfile(path): log.debug('hgrc file is not present at %s, skipping...', path) - return False + return baseui log.debug('reading hgrc from %s', path) cfg = config.config() cfg.read(path) @@ -408,21 +350,17 @@ def make_ui(read_from='file', path=None, hg_ui = ret for ui_ in hg_ui: if ui_.ui_active: - ui_val = safe_str(ui_.ui_value) - if ui_.ui_section == 'hooks' and BRAND != 'kallithea' and ui_val.startswith('python:' + BRAND + '.lib.hooks.'): - ui_val = ui_val.replace('python:' + BRAND + '.lib.hooks.', 'python:kallithea.lib.hooks.') - log.debug('settings ui from db: [%s] %s=%s', ui_.ui_section, + ui_val = '' if ui_.ui_value is None else safe_str(ui_.ui_value) + log.debug('settings ui from db: [%s] %s=%r', ui_.ui_section, ui_.ui_key, ui_val) baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key), ui_val) - if ui_.ui_key == 'push_ssl': - # force set push_ssl requirement to False, kallithea - # handles that - baseui.setconfig(safe_str(ui_.ui_section), safe_str(ui_.ui_key), - False) if clear_session: meta.Session.remove() + # force set push_ssl requirement to False, Kallithea handles that + baseui.setconfig('web', 'push_ssl', False) + baseui.setconfig('web', 'allow_push', '*') # prevent interactive questions for ssh password / passphrase ssh = baseui.config('ui', 'ssh', default='ssh') baseui.setconfig('ui', 'ssh', '%s -oBatchMode=yes -oIdentitiesOnly=yes' % ssh) @@ -432,14 +370,16 @@ def make_ui(read_from='file', path=None, def set_app_settings(config): """ - Updates pylons config with new settings from database + Updates app config with new settings from database :param config: """ - hgsettings = Setting.get_app_settings() - - for k, v in hgsettings.items(): - config[k] = v + try: + hgsettings = Setting.get_app_settings() + for k, v in hgsettings.items(): + config[k] = v + finally: + meta.Session.remove() def set_vcs_config(config): @@ -458,7 +398,22 @@ def set_vcs_config(config): conf.settings.GIT_EXECUTABLE_PATH = config.get('git_path', 'git') conf.settings.GIT_REV_FILTER = config.get('git_rev_filter', '--all').strip() conf.settings.DEFAULT_ENCODINGS = aslist(config.get('default_encoding', - 'utf8'), sep=',') + 'utf-8'), sep=',') + + +def set_indexer_config(config): + """ + Update Whoosh index mapping + + :param config: kallithea.CONFIG + """ + from kallithea.config import conf + + log.debug('adding extra into INDEX_EXTENSIONS') + conf.INDEX_EXTENSIONS.extend(re.split('\s+', config.get('index.extensions', ''))) + + log.debug('adding extra into INDEX_FILENAMES') + conf.INDEX_FILENAMES.extend(re.split('\s+', config.get('index.filenames', ''))) def map_groups(path): @@ -476,10 +431,10 @@ def map_groups(path): # last element is repo in nested groups structure groups = groups[:-1] - rgm = RepoGroupModel(sa) + rgm = RepoGroupModel() owner = User.get_first_admin() for lvl, group_name in enumerate(groups): - group_name = '/'.join(groups[:lvl] + [group_name]) + group_name = u'/'.join(groups[:lvl] + [group_name]) group = RepoGroup.get_by_group_name(group_name) desc = '%s group' % group_name @@ -492,10 +447,9 @@ def map_groups(path): lvl, group_name) group = RepoGroup(group_name, parent) group.group_description = desc - group.user = owner + group.owner = owner sa.add(group) - perm_obj = rgm._create_default_perms(group) - sa.add(perm_obj) + rgm._create_default_perms(group) sa.flush() parent = group @@ -524,7 +478,7 @@ def repo2db_mapper(initial_repo_list, re user = User.get_first_admin() added = [] - ##creation defaults + # creation defaults defs = Setting.get_default_repo_settings(strip_prefix=True) enable_statistics = defs.get('repo_enable_statistics') enable_locking = defs.get('repo_enable_locking') @@ -571,13 +525,14 @@ def repo2db_mapper(initial_repo_list, re removed = [] # remove from database those repositories that are not in the filesystem + unicode_initial_repo_list = set(safe_unicode(name) for name in initial_repo_list) for repo in sa.query(Repository).all(): - if repo.repo_name not in initial_repo_list.keys(): + if repo.repo_name not in unicode_initial_repo_list: if remove_obsolete: log.debug("Removing non-existing repository found in db `%s`", repo.repo_name) try: - RepoModel(sa).delete(repo, forks='detach', fs_remove=False) + RepoModel().delete(repo, forks='detach', fs_remove=False) sa.commit() except Exception: #don't hold further removals on error @@ -587,34 +542,6 @@ def repo2db_mapper(initial_repo_list, re return added, removed -# set cache regions for beaker so celery can utilise it -def add_cache(settings): - cache_settings = {'regions': None} - for key in settings.keys(): - for prefix in ['beaker.cache.', 'cache.']: - if key.startswith(prefix): - name = key.split(prefix)[1].strip() - cache_settings[name] = settings[key].strip() - if cache_settings['regions']: - for region in cache_settings['regions'].split(','): - region = region.strip() - region_settings = {} - for key, value in cache_settings.items(): - if key.startswith(region): - region_settings[key.split('.')[1]] = value - region_settings['expire'] = int(region_settings.get('expire', - 60)) - region_settings.setdefault('lock_dir', - cache_settings.get('lock_dir')) - region_settings.setdefault('data_dir', - cache_settings.get('data_dir')) - - if 'type' not in region_settings: - region_settings['type'] = cache_settings.get('type', - 'memory') - beaker.cache.cache_regions[region] = region_settings - - def load_rcextensions(root_path): import kallithea from kallithea.config import conf @@ -628,13 +555,13 @@ def load_rcextensions(root_path): # Additional mappings that are not present in the pygments lexers conf.LANGUAGES_EXTENSIONS_MAP.update(getattr(EXT, 'EXTRA_MAPPINGS', {})) - #OVERRIDE OUR EXTENSIONS FROM RC-EXTENSIONS (if present) + # OVERRIDE OUR EXTENSIONS FROM RC-EXTENSIONS (if present) if getattr(EXT, 'INDEX_EXTENSIONS', []): log.debug('settings custom INDEX_EXTENSIONS') conf.INDEX_EXTENSIONS = getattr(EXT, 'INDEX_EXTENSIONS', []) - #ADDITIONAL MAPPINGS + # ADDITIONAL MAPPINGS log.debug('adding extra into INDEX_EXTENSIONS') conf.INDEX_EXTENSIONS.extend(getattr(EXT, 'EXTRA_INDEX_EXTENSIONS', [])) @@ -646,187 +573,9 @@ def load_rcextensions(root_path): # setattr(EXT, k, getattr(rcextensions, k)) -def get_custom_lexer(extension): - """ - returns a custom lexer if it's defined in rcextensions module, or None - if there's no custom lexer defined - """ - import kallithea - from pygments import lexers - #check if we didn't define this extension as other lexer - if kallithea.EXTENSIONS and extension in kallithea.EXTENSIONS.EXTRA_LEXERS: - _lexer_name = kallithea.EXTENSIONS.EXTRA_LEXERS[extension] - return lexers.get_lexer_by_name(_lexer_name) - - -#============================================================================== -# TEST FUNCTIONS AND CREATORS #============================================================================== -def create_test_index(repo_location, config, full_index): - """ - Makes default test index - - :param config: test config - :param full_index: - """ - - from kallithea.lib.indexers.daemon import WhooshIndexingDaemon - from kallithea.lib.pidlock import DaemonLock, LockHeld - - repo_location = repo_location - - index_location = os.path.join(config['app_conf']['index_dir']) - if not os.path.exists(index_location): - os.makedirs(index_location) - - try: - l = DaemonLock(file_=jn(dn(index_location), 'make_index.lock')) - WhooshIndexingDaemon(index_location=index_location, - repo_location=repo_location)\ - .run(full_index=full_index) - l.release() - except LockHeld: - pass - - -def create_test_env(repos_test_path, config): - """ - Makes a fresh database and - install test repository into tmp dir - """ - from kallithea.lib.db_manage import DbManage - from kallithea.tests import HG_REPO, GIT_REPO, TESTS_TMP_PATH - - # PART ONE create db - dbconf = config['sqlalchemy.db1.url'] - log.debug('making test db %s', dbconf) - - # create test dir if it doesn't exist - if not os.path.isdir(repos_test_path): - log.debug('Creating testdir %s', repos_test_path) - os.makedirs(repos_test_path) - - dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=config['here'], - tests=True) - dbmanage.create_tables(override=True) - # for tests dynamically set new root paths based on generated content - dbmanage.create_settings(dbmanage.config_prompt(repos_test_path)) - dbmanage.create_default_user() - dbmanage.admin_prompt() - dbmanage.create_permissions() - dbmanage.populate_default_permissions() - Session().commit() - # PART TWO make test repo - log.debug('making test vcs repositories') - - idx_path = config['app_conf']['index_dir'] - data_path = config['app_conf']['cache_dir'] - - #clean index and data - if idx_path and os.path.exists(idx_path): - log.debug('remove %s', idx_path) - shutil.rmtree(idx_path) - - if data_path and os.path.exists(data_path): - log.debug('remove %s', data_path) - shutil.rmtree(data_path) - - #CREATE DEFAULT TEST REPOS - cur_dir = dn(dn(abspath(__file__))) - tar = tarfile.open(jn(cur_dir, 'tests', 'fixtures', "vcs_test_hg.tar.gz")) - tar.extractall(jn(TESTS_TMP_PATH, HG_REPO)) - tar.close() - - cur_dir = dn(dn(abspath(__file__))) - tar = tarfile.open(jn(cur_dir, 'tests', 'fixtures', "vcs_test_git.tar.gz")) - tar.extractall(jn(TESTS_TMP_PATH, GIT_REPO)) - tar.close() - - #LOAD VCS test stuff - from kallithea.tests.vcs import setup_package - setup_package() - - +# MISC #============================================================================== -# PASTER COMMANDS -#============================================================================== -class BasePasterCommand(Command): - """ - Abstract Base Class for paster commands. - - The celery commands are somewhat aggressive about loading - celery.conf, and since our module sets the `CELERY_LOADER` - environment variable to our loader, we have to bootstrap a bit and - make sure we've had a chance to load the pylons config off of the - command line, otherwise everything fails. - """ - min_args = 1 - min_args_error = "Please provide a paster config file as an argument." - takes_config_file = 1 - requires_config_file = True - - def notify_msg(self, msg, log=False): - """Make a notification to user, additionally if logger is passed - it logs this action using given logger - - :param msg: message that will be printed to user - :param log: logging instance, to use to additionally log this message - - """ - if log and isinstance(log, logging): - log(msg) - - def run(self, args): - """ - Overrides Command.run - - Checks for a config file argument and loads it. - """ - if len(args) < self.min_args: - raise BadCommand( - self.min_args_error % {'min_args': self.min_args, - 'actual_args': len(args)}) - - # Decrement because we're going to lob off the first argument. - # @@ This is hacky - self.min_args -= 1 - self.bootstrap_config(args[0]) - self.update_parser() - return super(BasePasterCommand, self).run(args[1:]) - - def update_parser(self): - """ - Abstract method. Allows for the class's parser to be updated - before the superclass's `run` method is called. Necessary to - allow options/arguments to be passed through to the underlying - celery command. - """ - raise NotImplementedError("Abstract Method.") - - def bootstrap_config(self, conf): - """ - Loads the pylons configuration. - """ - from pylons import config as pylonsconfig - - self.path_to_ini_file = os.path.realpath(conf) - conf = paste.deploy.appconfig('config:' + self.path_to_ini_file) - pylonsconfig.init_app(conf.global_conf, conf.local_conf) - - def _init_session(self): - """ - Inits SqlAlchemy Session - """ - logging.config.fileConfig(self.path_to_ini_file) - from pylons import config - from kallithea.model import init_model - from kallithea.lib.utils2 import engine_from_config - - #get to remove repos !! - add_cache(config) - engine = engine_from_config(config, 'sqlalchemy.db1.') - init_model(engine) - def check_git_version(): """ @@ -863,28 +612,38 @@ def check_git_version(): return ver -@decorator.decorator -def jsonify(func, *args, **kwargs): - """Action decorator that formats output for JSON - - Given a function that will return content, this decorator will turn - the result into JSON, with a content-type of 'application/json' and - output it. +#=============================================================================== +# CACHE RELATED METHODS +#=============================================================================== - """ - from pylons.decorators.util import get_pylons - from kallithea.lib.compat import json - pylons = get_pylons(args) - pylons.response.headers['Content-Type'] = 'application/json; charset=utf-8' - data = func(*args, **kwargs) - if isinstance(data, (list, tuple)): - msg = "JSON responses with Array envelopes are susceptible to " \ - "cross-site data leak attacks, see " \ - "http://wiki.pylonshq.com/display/pylonsfaq/Warnings" - warnings.warn(msg, Warning, 2) - log.warning(msg) - log.debug("Returning JSON wrapped action output") - return json.dumps(data, encoding='utf-8') +# set cache regions for beaker so celery can utilise it +def setup_cache_regions(settings): + # Create dict with just beaker cache configs with prefix stripped + cache_settings = {'regions': None} + prefix = 'beaker.cache.' + for key in settings: + if key.startswith(prefix): + name = key[len(prefix):] + cache_settings[name] = settings[key] + # Find all regions, apply defaults, and apply to beaker + if cache_settings['regions']: + for region in cache_settings['regions'].split(','): + region = region.strip() + prefix = region + '.' + region_settings = {} + for key in cache_settings: + if key.startswith(prefix): + name = key[len(prefix):] + region_settings[name] = cache_settings[key] + region_settings.setdefault('expire', + cache_settings.get('expire', '60')) + region_settings.setdefault('lock_dir', + cache_settings.get('lock_dir')) + region_settings.setdefault('data_dir', + cache_settings.get('data_dir')) + region_settings.setdefault('type', + cache_settings.get('type', 'memory')) + beaker.cache.cache_regions[region] = region_settings def conditional_cache(region, prefix, condition, func): @@ -895,8 +654,8 @@ def conditional_cache(region, prefix, co #heavy computation function return data - # denpending from condition the compute is wrapped in cache or not - compute = conditional_cache('short_term', 'cache_desc', codnition=True, func=func) + # depending from condition the compute is wrapped in cache or not + compute = conditional_cache('short_term', 'cache_desc', condition=True, func=func) return compute(arg) :param region: name of cache region diff --git a/kallithea/lib/utils2.py b/kallithea/lib/utils2.py --- a/kallithea/lib/utils2.py +++ b/kallithea/lib/utils2.py @@ -15,7 +15,9 @@ kallithea.lib.utils2 ~~~~~~~~~~~~~~~~~~~~ -Some simple helper functions +Some simple helper functions. +Note: all these functions should be independent of Kallithea classes, i.e. +models, controllers, etc. to prevent import cycles. This file was forked by the Kallithea project in July 2014. Original author and date, and relevant copyright and licensing information is below: @@ -37,50 +39,16 @@ import binascii import webob import urlobject +from webhelpers.text import collapse, remove_formatting, strip_tags -from pylons.i18n.translation import _, ungettext +from tg.i18n import ugettext as _, ungettext from kallithea.lib.vcs.utils.lazy import LazyProperty from kallithea.lib.compat import json -def __get_lem(): - """ - Get language extension map based on what's inside pygments lexers - """ - from pygments import lexers - from string import lower - from collections import defaultdict - - d = defaultdict(lambda: []) - - def __clean(s): - s = s.lstrip('*') - s = s.lstrip('.') - - if s.find('[') != -1: - exts = [] - start, stop = s.find('['), s.find(']') - - for suffix in s[start + 1:stop]: - exts.append(s[:s.find('[')] + suffix) - return map(lower, exts) - else: - return map(lower, [s]) - - for lx, t in sorted(lexers.LEXERS.items()): - m = map(__clean, t[-2]) - if m: - m = reduce(lambda x, y: x + y, m) - for ext in m: - desc = lx.replace('Lexer', '') - d[ext].append(desc) - - return dict(d) - - def str2bool(_str): """ - returs True/False value from given string, it tries to translate the + returns True/False value from given string, it tries to translate the string into boolean :param _str: string value to translate into boolean @@ -166,7 +134,14 @@ def detect_mode(line, default): def generate_api_key(): """ Generates a random (presumably unique) API key. + + This value is used in URLs and "Bearer" HTTP Authorization headers, + which in practice means it should only contain URL-safe characters + (RFC 3986): + + unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" """ + # Hexadecimal certainly qualifies as URL-safe. return binascii.hexlify(os.urandom(20)) @@ -204,7 +179,7 @@ def safe_unicode(str_, from_encoding=Non if not from_encoding: import kallithea DEFAULT_ENCODINGS = aslist(kallithea.CONFIG.get('default_encoding', - 'utf8'), sep=',') + 'utf-8'), sep=',') from_encoding = DEFAULT_ENCODINGS if not isinstance(from_encoding, (list, tuple)): @@ -253,7 +228,7 @@ def safe_str(unicode_, to_encoding=None) if not to_encoding: import kallithea DEFAULT_ENCODINGS = aslist(kallithea.CONFIG.get('default_encoding', - 'utf8'), sep=',') + 'utf-8'), sep=',') to_encoding = DEFAULT_ENCODINGS if not isinstance(to_encoding, (list, tuple)): @@ -288,63 +263,6 @@ def remove_prefix(s, prefix): return s -def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs): - """ - Custom engine_from_config functions that makes sure we use NullPool for - file based sqlite databases. This prevents errors on sqlite. This only - applies to sqlalchemy versions < 0.7.0 - - """ - import sqlalchemy - from sqlalchemy import engine_from_config as efc - import logging - - if int(sqlalchemy.__version__.split('.')[1]) < 7: - - # This solution should work for sqlalchemy < 0.7.0, and should use - # proxy=TimerProxy() for execution time profiling - - from sqlalchemy.pool import NullPool - url = configuration[prefix + 'url'] - - if url.startswith('sqlite'): - kwargs.update({'poolclass': NullPool}) - return efc(configuration, prefix, **kwargs) - else: - import time - from sqlalchemy import event - - log = logging.getLogger('sqlalchemy.engine') - BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = xrange(30, 38) - engine = efc(configuration, prefix, **kwargs) - - def color_sql(sql): - COLOR_SEQ = "\033[1;%dm" - COLOR_SQL = YELLOW - normal = '\x1b[0m' - return ''.join([COLOR_SEQ % COLOR_SQL, sql, normal]) - - if configuration['debug']: - #attach events only for debug configuration - - def before_cursor_execute(conn, cursor, statement, - parameters, context, executemany): - context._query_start_time = time.time() - log.info(color_sql(">>>>> STARTING QUERY >>>>>")) - - def after_cursor_execute(conn, cursor, statement, - parameters, context, executemany): - total = time.time() - context._query_start_time - log.info(color_sql("<<<<< TOTAL TIME: %f <<<<<" % total)) - - event.listen(engine, "before_cursor_execute", - before_cursor_execute) - event.listen(engine, "after_cursor_execute", - after_cursor_execute) - - return engine - - def age(prevdate, show_short_version=False, now=None): """ turns a datetime into an age string. @@ -352,7 +270,7 @@ def age(prevdate, show_short_version=Fal example: 2days ago, instead of 2 days and 23 hours ago. :param prevdate: datetime object - :param show_short_version: if it should aproximate the date and return a shorter string + :param show_short_version: if it should approximate the date and return a shorter string :rtype: unicode :returns: unicode words describing age """ @@ -486,7 +404,7 @@ def credentials_filter(uri): """ uri = uri_filter(uri) - #check if we have port + # check if we have port if len(uri) > 2 and uri[2]: uri[2] = ':' + uri[2] @@ -553,25 +471,32 @@ def time_to_datetime(tm): return return datetime.datetime.fromtimestamp(tm) + # Must match regexp in kallithea/public/js/base.js MentionsAutoComplete() # Check char before @ - it must not look like we are in an email addresses. -# Matching is gready so we don't have to look beyond the end. +# Matching is greedy so we don't have to look beyond the end. MENTIONS_REGEX = re.compile(r'(?:^|(?<=[^a-zA-Z0-9]))@([a-zA-Z0-9][-_.a-zA-Z0-9]*[a-zA-Z0-9])') -def extract_mentioned_users(s): - r""" - Returns unique usernames from given string s that have @mention - :param s: string to get mentions +def extract_mentioned_usernames(text): + r""" + Returns list of (possible) usernames @mentioned in given text. - >>> extract_mentioned_users('@1-2.a_X,@1234 not@not @ddd@not @n @ee @ff @gg, @gg;@hh @n\n@zz,') + >>> extract_mentioned_usernames('@1-2.a_X,@1234 not@not @ddd@not @n @ee @ff @gg, @gg;@hh @n\n@zz,') ['1-2.a_X', '1234', 'ddd', 'ee', 'ff', 'gg', 'hh', 'zz'] """ - usrs = set() - for username in MENTIONS_REGEX.findall(s): - usrs.add(username) + return MENTIONS_REGEX.findall(text) + - return sorted(list(usrs), key=lambda k: k.lower()) +def extract_mentioned_users(text): + """ Returns set of actual database Users @mentioned in given text. """ + from kallithea.model.db import User + result = set() + for name in extract_mentioned_usernames(text): + user = User.get_by_username(name, case_insensitive=True) + if user is not None and not user.is_default_user: + result.add(user) + return result class AttributeDict(dict): @@ -613,68 +538,28 @@ def get_server_url(environ): return req.host_url + req.script_name -def _extract_extras(env=None): +def _extract_extras(): """ Extracts the Kallithea extras data from os.environ, and wraps it into named AttributeDict object """ - if not env: - env = os.environ - try: - extras = json.loads(env['KALLITHEA_EXTRAS']) + extras = json.loads(os.environ['KALLITHEA_EXTRAS']) except KeyError: - extras = {} + raise Exception("Environment variable KALLITHEA_EXTRAS not found") try: for k in ['username', 'repository', 'locked_by', 'scm', 'make_lock', 'action', 'ip']: extras[k] - except KeyError as e: - raise Exception('Missing key %s in os.environ %s' % (e, extras)) + except KeyError: + raise Exception('Missing key %s in KALLITHEA_EXTRAS %s' % (k, extras)) return AttributeDict(extras) def _set_extras(extras): - # RC_SCM_DATA can probably be removed in the future, but for compatibilty now... - os.environ['KALLITHEA_EXTRAS'] = os.environ['RC_SCM_DATA'] = json.dumps(extras) - - -def unique_id(hexlen=32): - alphabet = "23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjklmnpqrstuvwxyz" - return suuid(truncate_to=hexlen, alphabet=alphabet) - - -def suuid(url=None, truncate_to=22, alphabet=None): - """ - Generate and return a short URL safe UUID. - - If the url parameter is provided, set the namespace to the provided - URL and generate a UUID. - - :param url to get the uuid for - :truncate_to: truncate the basic 22 UUID to shorter version - - The IDs won't be universally unique any longer, but the probability of - a collision will still be very low. - """ - # Define our alphabet. - _ALPHABET = alphabet or "23456789ABCDEFGHJKLMNPQRSTUVWXYZ" - - # If no URL is given, generate a random UUID. - if url is None: - unique_id = uuid.uuid4().int - else: - unique_id = uuid.uuid3(uuid.NAMESPACE_URL, url).int - - alphabet_length = len(_ALPHABET) - output = [] - while unique_id > 0: - digit = unique_id % alphabet_length - output.append(_ALPHABET[digit]) - unique_id = int(unique_id / alphabet_length) - return "".join(output)[:truncate_to] + os.environ['KALLITHEA_EXTRAS'] = json.dumps(extras) def get_current_authuser(): @@ -682,7 +567,7 @@ def get_current_authuser(): Gets kallithea user from threadlocal tmpl_context variable if it's defined, else returns None. """ - from pylons import tmpl_context + from tg import tmpl_context if hasattr(tmpl_context, 'authuser'): return tmpl_context.authuser @@ -708,7 +593,8 @@ class OptionalAttr(object): def __call__(self): return self -#alias + +# alias OAttr = OptionalAttr @@ -756,5 +642,55 @@ class Optional(object): return val.getval() return val + def urlreadable(s, _cleanstringsub=re.compile('[^-a-zA-Z0-9./]+').sub): return _cleanstringsub('_', safe_str(s)).rstrip('_') + + +def recursive_replace(str_, replace=' '): + """ + Recursive replace of given sign to just one instance + + :param str_: given string + :param replace: char to find and replace multiple instances + + Examples:: + >>> recursive_replace("Mighty---Mighty-Bo--sstones",'-') + 'Mighty-Mighty-Bo-sstones' + """ + + if str_.find(replace * 2) == -1: + return str_ + else: + str_ = str_.replace(replace * 2, replace) + return recursive_replace(str_, replace) + + +def repo_name_slug(value): + """ + Return slug of name of repository + This function is called on each creation/modification + of repository to prevent bad names in repo + """ + + slug = remove_formatting(value) + slug = strip_tags(slug) + + for c in """`?=[]\;'"<>,/~!@#$%^&*()+{}|: """: + slug = slug.replace(c, '-') + slug = recursive_replace(slug, '-') + slug = collapse(slug, '-') + return slug + + +def ask_ok(prompt, retries=4, complaint='Yes or no please!'): + while True: + ok = raw_input(prompt) + if ok in ('y', 'ye', 'yes'): + return True + if ok in ('n', 'no', 'nop', 'nope'): + return False + retries = retries - 1 + if retries < 0: + raise IOError + print complaint diff --git a/kallithea/lib/vcs/__init__.py b/kallithea/lib/vcs/__init__.py --- a/kallithea/lib/vcs/__init__.py +++ b/kallithea/lib/vcs/__init__.py @@ -29,15 +29,3 @@ def get_version(): Returns shorter version (digit parts only) as string. """ return '.'.join((str(each) for each in VERSION[:3])) - - -def main(argv=None): - if argv is None: - argv = sys.argv - from kallithea.lib.vcs.cli import ExecutionManager - manager = ExecutionManager(argv) - manager.execute() - return 0 - -if __name__ == '__main__': - sys.exit(main(sys.argv)) diff --git a/kallithea/lib/vcs/backends/base.py b/kallithea/lib/vcs/backends/base.py --- a/kallithea/lib/vcs/backends/base.py +++ b/kallithea/lib/vcs/backends/base.py @@ -97,6 +97,9 @@ class BaseRepository(object): @LazyProperty def name(self): + """ + Return repository name (without group name) + """ raise NotImplementedError @property @@ -137,9 +140,6 @@ class BaseRepository(object): def is_empty(self): return self._empty - def get_last_change(self): - self.get_changesets() - #========================================================================== # CHANGESETS #========================================================================== @@ -163,11 +163,10 @@ class BaseRepository(object): yield self.get_changeset(revision) def get_changesets(self, start=None, end=None, start_date=None, - end_date=None, branch_name=None, reverse=False): + end_date=None, branch_name=None, reverse=False, max_revisions=None): """ - Returns iterator of ``MercurialChangeset`` objects from start to end - not inclusive This should behave just like a list, ie. end is not - inclusive + Returns iterator of ``BaseChangeset`` objects from start to end, + both inclusive. :param start: None or str :param end: None or str @@ -385,15 +384,28 @@ class BaseChangeset(object): def __eq__(self, other): return self.raw_id == other.raw_id - def __json__(self): - return dict( - short_id=self.short_id, - raw_id=self.raw_id, - revision=self.revision, - message=self.message, - date=self.date, - author=self.author, - ) + def __json__(self, with_file_list=False): + if with_file_list: + return dict( + short_id=self.short_id, + raw_id=self.raw_id, + revision=self.revision, + message=self.message, + date=self.date, + author=self.author, + added=[safe_unicode(el.path) for el in self.added], + changed=[safe_unicode(el.path) for el in self.changed], + removed=[safe_unicode(el.path) for el in self.removed], + ) + else: + return dict( + short_id=self.short_id, + raw_id=self.raw_id, + revision=self.revision, + message=self.message, + date=self.date, + author=self.author, + ) @LazyProperty def last(self): @@ -655,9 +667,9 @@ class BaseChangeset(object): data = get_dict_for_attrs(self, ['id', 'raw_id', 'short_id', 'revision', 'date', 'message']) data['author'] = {'name': self.author_name, 'email': self.author_email} - data['added'] = [node.path for node in self.added] - data['changed'] = [node.path for node in self.changed] - data['removed'] = [node.path for node in self.removed] + data['added'] = [safe_unicode(node.path) for node in self.added] + data['changed'] = [safe_unicode(node.path) for node in self.changed] + data['removed'] = [safe_unicode(node.path) for node in self.removed] return data @LazyProperty @@ -668,6 +680,27 @@ class BaseChangeset(object): def obsolete(self): return False + @LazyProperty + def bumped(self): + return False + + @LazyProperty + def divergent(self): + return False + + @LazyProperty + def extinct(self): + return False + + @LazyProperty + def unstable(self): + return False + + @LazyProperty + def phase(self): + return '' + + class BaseWorkdir(object): """ Working directory representation of single repository. @@ -1005,6 +1038,11 @@ class EmptyChangeset(BaseChangeset): return get_backend(self.alias).DEFAULT_BRANCH_NAME @LazyProperty + def branches(self): + from kallithea.lib.vcs.backends import get_backend + return [get_backend(self.alias).DEFAULT_BRANCH_NAME] + + @LazyProperty def short_id(self): return self.raw_id[:12] @@ -1031,12 +1069,13 @@ class CollectionGenerator(object): for rev in self.revs: yield self.repo.get_changeset(rev) - def __getslice__(self, i, j): - """ - Returns a iterator of sliced repository - """ - sliced_revs = self.revs[i:j] - return CollectionGenerator(self.repo, sliced_revs) + def __getitem__(self, what): + """Return either a single element by index, or a sliced collection.""" + if isinstance(what, slice): + return CollectionGenerator(self.repo, self.revs[what]) + else: + # single item + return self.repo.get_changeset(self.revs[what]) def __repr__(self): return '' % (len(self)) diff --git a/kallithea/lib/vcs/backends/git/changeset.py b/kallithea/lib/vcs/backends/git/changeset.py --- a/kallithea/lib/vcs/backends/git/changeset.py +++ b/kallithea/lib/vcs/backends/git/changeset.py @@ -1,7 +1,9 @@ import re from itertools import chain from dulwich import objects +from dulwich.config import ConfigFile from subprocess import Popen, PIPE +from io import BytesIO from kallithea.lib.vcs.conf import settings from kallithea.lib.vcs.backends.base import BaseChangeset, EmptyChangeset @@ -50,6 +52,10 @@ class GitChangeset(BaseChangeset): self._paths = {} @LazyProperty + def bookmarks(self): + return () + + @LazyProperty def message(self): return safe_unicode(self._commit.message) @@ -87,13 +93,19 @@ class GitChangeset(BaseChangeset): @LazyProperty def branch(self): - + # Note: This function will return one branch name for the changeset - + # that might not make sense in Git where branches() is a better match + # for the basic model heads = self.repository._heads(reverse=False) - ref = heads.get(self.raw_id) if ref: return safe_unicode(ref) + @LazyProperty + def branches(self): + heads = self.repository._heads(reverse=True) + return [b for b in heads if heads[b] == self.raw_id] # FIXME: Inefficient ... and returning None! + def _fix_path(self, path): """ Paths are stored without trailing slash so we need to get rid off it if @@ -106,7 +118,7 @@ class GitChangeset(BaseChangeset): def _get_id_for_path(self, path): path = safe_str(path) # FIXME: Please, spare a couple of minutes and make those codes cleaner; - if not path in self._paths: + if path not in self._paths: path = path.strip('/') # set root tree tree = self.repository._repo[self._tree_id] @@ -151,7 +163,7 @@ class GitChangeset(BaseChangeset): name = item self._paths[name] = id self._stat_modes[name] = stat - if not path in self._paths: + if path not in self._paths: raise NodeDoesNotExistError("There is no file nor directory " "at the given path '%s' at revision %s" % (path, safe_str(self.short_id))) @@ -398,16 +410,19 @@ class GitChangeset(BaseChangeset): filenodes = [] als = self.repository.alias for name, stat, id in tree.iteritems(): + if path != '': + obj_path = '/'.join((path, name)) + else: + obj_path = name if objects.S_ISGITLINK(stat): - dirnodes.append(SubModuleNode(name, url=None, changeset=id, + root_tree = self.repository._repo[self._tree_id] + cf = ConfigFile.from_file(BytesIO(self.repository._repo.get_object(root_tree['.gitmodules'][1]).data)) + url = cf.get(('submodule', obj_path), 'url') + dirnodes.append(SubModuleNode(obj_path, url=url, changeset=id, alias=als)) continue obj = self.repository._repo.get_object(id) - if path != '': - obj_path = '/'.join((path, name)) - else: - obj_path = name if obj_path not in self._stat_modes: self._stat_modes[obj_path] = stat if isinstance(obj, objects.Tree): @@ -419,7 +434,7 @@ class GitChangeset(BaseChangeset): "or Blob, is %r" % type(obj)) nodes = dirnodes + filenodes for node in nodes: - if not node.path in self.nodes: + if node.path not in self.nodes: self.nodes[node.path] = node nodes.sort() return nodes @@ -428,7 +443,7 @@ class GitChangeset(BaseChangeset): if isinstance(path, unicode): path = path.encode('utf-8') path = self._fix_path(path) - if not path in self.nodes: + if path not in self.nodes: try: id_ = self._get_id_for_path(path) except ChangesetError: @@ -437,7 +452,10 @@ class GitChangeset(BaseChangeset): _GL = lambda m: m and objects.S_ISGITLINK(m) if _GL(self._stat_modes.get(path)): - node = SubModuleNode(path, url=None, changeset=id_, + tree = self.repository._repo[self._tree_id] + cf = ConfigFile.from_file(BytesIO(self.repository._repo.get_object(tree['.gitmodules'][1]).data)) + url = cf.get(('submodule', path), 'url') + node = SubModuleNode(path, url=url, changeset=id_, alias=self.repository.alias) else: obj = self.repository._repo.get_object(id_) diff --git a/kallithea/lib/vcs/backends/git/inmemory.py b/kallithea/lib/vcs/backends/git/inmemory.py --- a/kallithea/lib/vcs/backends/git/inmemory.py +++ b/kallithea/lib/vcs/backends/git/inmemory.py @@ -40,7 +40,7 @@ class GitInMemoryChangeset(BaseInMemoryC ENCODING = "UTF-8" # Create tree and populates it with blobs - commit_tree = self.parents[0] and repo[self.parents[0]._commit.tree] or\ + commit_tree = self.parents[0] and repo[self.parents[0]._commit.tree] or \ objects.Tree() for node in self.added + self.changed: # Compute subdirs if needed diff --git a/kallithea/lib/vcs/backends/git/repository.py b/kallithea/lib/vcs/backends/git/repository.py --- a/kallithea/lib/vcs/backends/git/repository.py +++ b/kallithea/lib/vcs/backends/git/repository.py @@ -30,7 +30,7 @@ from kallithea.lib.vcs.exceptions import BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError, TagAlreadyExistError, TagDoesNotExistError ) -from kallithea.lib.vcs.utils import safe_unicode, makedate, date_fromtimestamp +from kallithea.lib.vcs.utils import safe_str, safe_unicode, makedate, date_fromtimestamp from kallithea.lib.vcs.utils.lazy import LazyProperty from kallithea.lib.vcs.utils.ordered_dict import OrderedDict from kallithea.lib.vcs.utils.paths import abspath, get_user_home @@ -58,9 +58,9 @@ class GitRepository(BaseRepository): def __init__(self, repo_path, create=False, src_url=None, update_after_clone=False, bare=False): - self.path = abspath(repo_path) - repo = self._get_repo(create, src_url, update_after_clone, bare) - self.bare = repo.bare + self.path = safe_unicode(abspath(repo_path)) + self.repo = self._get_repo(create, src_url, update_after_clone, bare) + self.bare = self.repo.bare @property def _config_files(self): @@ -72,7 +72,7 @@ class GitRepository(BaseRepository): @property def _repo(self): - return Repo(self.path) + return self.repo @property def head(self): @@ -118,7 +118,7 @@ class GitRepository(BaseRepository): _copts = ['-c', 'core.quotepath=false', ] safe_call = False if '_safe' in opts: - #no exc on failure + # no exc on failure del opts['_safe'] safe_call = True @@ -189,7 +189,7 @@ class GitRepository(BaseRepository): test_uri = test_uri.rstrip('/') + '/info/refs' if authinfo: - #create a password manager + # create a password manager passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm() passmgr.add_password(*authinfo) @@ -214,7 +214,7 @@ class GitRepository(BaseRepository): # now detect if it's proper git repo gitdata = resp.read() - if not 'service=git-upload-pack' in gitdata: + if 'service=git-upload-pack' not in gitdata: raise urllib2.URLError( "url [%s] does not look like an git" % (cleaned_uri)) @@ -239,7 +239,7 @@ class GitRepository(BaseRepository): else: return Repo.init(self.path) else: - return self._repo + return Repo(self.path) except (NotGitRepository, OSError) as err: raise RepositoryError(err) @@ -262,7 +262,7 @@ class GitRepository(BaseRepository): return so.splitlines() def _get_all_revisions2(self): - #alternate implementation using dulwich + # alternate implementation using dulwich includes = [x[1][0] for x in self._parsed_refs.iteritems() if x[1][1] != 'T'] return [c.commit.id for c in self._repo.get_walker(include=includes)] @@ -328,8 +328,8 @@ class GitRepository(BaseRepository): Returns normalized url. If schema is not given, would fall to filesystem (``file:///``) schema. """ - url = str(url) - if url != 'default' and not '://' in url: + url = safe_str(url) + if url != 'default' and '://' not in url: url = ':///'.join(('file', url)) return url @@ -504,7 +504,7 @@ class GitRepository(BaseRepository): return changeset def get_changesets(self, start=None, end=None, start_date=None, - end_date=None, branch_name=None, reverse=False): + end_date=None, branch_name=None, reverse=False, max_revisions=None): """ Returns iterator of ``GitChangeset`` objects from start to end (both are inclusive), in ascending date order (unless ``reverse`` is set). @@ -527,7 +527,7 @@ class GitRepository(BaseRepository): """ if branch_name and branch_name not in self.branches: - raise BranchDoesNotExistError("Branch '%s' not found" \ + raise BranchDoesNotExistError("Branch '%s' not found" % branch_name) # actually we should check now if it's not an empty repo to not spaw # subprocess commands @@ -537,6 +537,8 @@ class GitRepository(BaseRepository): # %H at format means (full) commit hash, initial hashes are retrieved # in ascending date order cmd = ['log', '--date-order', '--reverse', '--pretty=format:%H'] + if max_revisions: + cmd += ['--max-count=%s' % max_revisions] if start_date: cmd += ['--since', start_date.strftime('%m/%d/%y %H:%M:%S')] if end_date: @@ -604,7 +606,7 @@ class GitRepository(BaseRepository): overflowed_long_int = 2**31 if context >= overflowed_long_int: - context = overflowed_long_int-1 + context = overflowed_long_int - 1 # Negative context values make no sense, and will result in # errors. Ensure this does not happen. diff --git a/kallithea/lib/vcs/backends/hg/changeset.py b/kallithea/lib/vcs/backends/hg/changeset.py --- a/kallithea/lib/vcs/backends/hg/changeset.py +++ b/kallithea/lib/vcs/backends/hg/changeset.py @@ -18,6 +18,7 @@ from kallithea.lib.vcs.utils.hgcompat im from mercurial import obsolete + class MercurialChangeset(BaseChangeset): """ Represents state of the repository at the single revision. @@ -37,19 +38,63 @@ class MercurialChangeset(BaseChangeset): @LazyProperty def branch(self): - return safe_unicode(self._ctx.branch()) + return safe_unicode(self._ctx.branch()) + + @LazyProperty + def branches(self): + return [safe_unicode(self._ctx.branch())] @LazyProperty def closesbranch(self): - return self._ctx.closesbranch() + return self._ctx.closesbranch() @LazyProperty def obsolete(self): - return self._ctx.obsolete() + return self._ctx.obsolete() + + @LazyProperty + def bumped(self): + try: + return self._ctx.phasedivergent() + except AttributeError: # renamed in Mercurial 4.6 (9fa874fb34e1) + return self._ctx.bumped() + + @LazyProperty + def divergent(self): + try: + return self._ctx.contentdivergent() + except AttributeError: # renamed in Mercurial 4.6 (8b2d7684407b) + return self._ctx.divergent() + + @LazyProperty + def extinct(self): + return self._ctx.extinct() + + @LazyProperty + def unstable(self): + try: + return self._ctx.orphan() + except AttributeError: # renamed in Mercurial 4.6 (03039ff3082b) + return self._ctx.unstable() + + @LazyProperty + def phase(self): + if(self._ctx.phase() == 1): + return 'Draft' + elif(self._ctx.phase() == 2): + return 'Secret' + else: + return '' @LazyProperty def successors(self): - successors = obsolete.successorssets(self._ctx._repo, self._ctx.node()) + try: + # This works starting from Mercurial 4.3: the function `successorssets` was moved to the mercurial.obsutil module and gained the `closest` parameter. + from mercurial import obsutil + successors = obsutil.successorssets(self._ctx._repo, self._ctx.node(), closest=True) + except ImportError: + # fallback for older versions + successors = obsolete.successorssets(self._ctx._repo, self._ctx.node()) if successors: # flatten the list here handles both divergent (len > 1) # and the usual case (len = 1) @@ -58,14 +103,20 @@ class MercurialChangeset(BaseChangeset): return successors @LazyProperty - def precursors(self): - precursors = set() - nm = self._ctx._repo.changelog.nodemap - for p in self._ctx._repo.obsstore.precursors.get(self._ctx.node(), ()): - pr = nm.get(p[0]) - if pr is not None: - precursors.add(hex(p[0])[:12]) - return precursors + def predecessors(self): + try: + # This works starting from Mercurial 4.3: the function `closestpredecessors` was added. + from mercurial import obsutil + return [hex(n)[:12] for n in obsutil.closestpredecessors(self._ctx._repo, self._ctx.node())] + except ImportError: + # fallback for older versions + predecessors = set() + nm = self._ctx._repo.changelog.nodemap + for p in self._ctx._repo.obsstore.precursors.get(self._ctx.node(), ()): + pr = nm.get(p[0]) + if pr is not None: + predecessors.add(hex(p[0])[:12]) + return predecessors @LazyProperty def bookmarks(self): @@ -147,7 +198,7 @@ class MercurialChangeset(BaseChangeset): cs = self while True: try: - next_ = cs.revision + 1 + next_ = cs.repository.revisions.index(cs.raw_id) + 1 next_rev = cs.repository.revisions[next_] except IndexError: raise ChangesetDoesNotExistError @@ -164,7 +215,7 @@ class MercurialChangeset(BaseChangeset): cs = self while True: try: - prev_ = cs.revision - 1 + prev_ = cs.repository.revisions.index(cs.raw_id) - 1 if prev_ < 0: raise IndexError prev_rev = cs.repository.revisions[prev_] @@ -175,10 +226,9 @@ class MercurialChangeset(BaseChangeset): if not branch or branch == cs.branch: return cs - def diff(self, ignore_whitespace=True, context=3): - return ''.join(self._ctx.diff(git=True, - ignore_whitespace=ignore_whitespace, - context=context)) + def diff(self): + # Only used for feed diffstat + return ''.join(self._ctx.diff()) def _fix_path(self, path): """ @@ -266,12 +316,17 @@ class MercurialChangeset(BaseChangeset): Returns a generator of four element tuples with lineno, sha, changeset lazy loader and line """ - - fctx = self._get_filectx(path) - for i, annotate_data in enumerate(fctx.annotate(linenumber=False)): - ln_no = i + 1 - sha = hex(annotate_data[0][0].node()) - yield (ln_no, sha, lambda: self.repository.get_changeset(sha), annotate_data[1],) + annotations = self._get_filectx(path).annotate() + try: + annotation_lines = [(annotateline.fctx, annotateline.text) for annotateline in annotations] + except AttributeError: # annotateline was introduced in Mercurial 4.6 (b33b91ca2ec2) + try: + annotation_lines = [(aline.fctx, l) for aline, l in annotations] + except AttributeError: # aline.fctx was introduced in Mercurial 4.4 + annotation_lines = [(aline[0], l) for aline, l in annotations] + for i, (fctx, l) in enumerate(annotation_lines): + sha = fctx.hex() + yield (i + 1, sha, lambda sha=sha, l=l: self.repository.get_changeset(sha), l) def fill_archive(self, stream=None, kind='tgz', prefix=None, subrepos=False): @@ -351,7 +406,7 @@ class MercurialChangeset(BaseChangeset): path = self._fix_path(path) - if not path in self.nodes: + if path not in self.nodes: if path in self._file_paths: node = FileNode(path, changeset=self) elif path in self._dir_paths or path in self._dir_paths: @@ -386,7 +441,7 @@ class MercurialChangeset(BaseChangeset): """ Returns list of modified ``FileNode`` objects. """ - return ChangedFileNodesGenerator([n for n in self.status[0]], self) + return ChangedFileNodesGenerator([n for n in self.status[0]], self) @property def removed(self): diff --git a/kallithea/lib/vcs/backends/hg/inmemory.py b/kallithea/lib/vcs/backends/hg/inmemory.py --- a/kallithea/lib/vcs/backends/hg/inmemory.py +++ b/kallithea/lib/vcs/backends/hg/inmemory.py @@ -47,18 +47,13 @@ class MercurialInMemoryChangeset(BaseInM # check if this path is removed if path in (node.path for node in self.removed): - if getattr(memctx, '_returnnoneformissingfiles', False): - return None - else: - # (hg < 3.2) Raising exception is the way to mark node for - # removal - raise IOError(errno.ENOENT, '%s is deleted' % path) + return None # check if this path is added for node in self.added: if node.path == path: - return memfilectx(_repo, path=node.path, - data=(node.content.encode('utf8') + return memfilectx(_repo, memctx, path=node.path, + data=(node.content.encode('utf-8') if not node.is_binary else node.content), islink=False, isexec=node.is_executable, @@ -67,8 +62,8 @@ class MercurialInMemoryChangeset(BaseInM # or changed for node in self.changed: if node.path == path: - return memfilectx(_repo, path=node.path, - data=(node.content.encode('utf8') + return memfilectx(_repo, memctx, path=node.path, + data=(node.content.encode('utf-8') if not node.is_binary else node.content), islink=False, isexec=node.is_executable, @@ -83,7 +78,7 @@ class MercurialInMemoryChangeset(BaseInM parents[i] = parent._ctx.node() if date and isinstance(date, datetime.datetime): - date = date.ctime() + date = date.strftime('%a, %d %b %Y %H:%M:%S') commit_ctx = memctx(repo=self.repository._repo, parents=parents, diff --git a/kallithea/lib/vcs/backends/hg/repository.py b/kallithea/lib/vcs/backends/hg/repository.py --- a/kallithea/lib/vcs/backends/hg/repository.py +++ b/kallithea/lib/vcs/backends/hg/repository.py @@ -30,8 +30,8 @@ from kallithea.lib.vcs.utils.ordered_dic from kallithea.lib.vcs.utils.paths import abspath from kallithea.lib.vcs.utils.hgcompat import ( ui, nullid, match, patch, diffopts, clone, get_contact, - localrepository, RepoLookupError, Abort, RepoError, hex, scmutil, hg_url, - httpbasicauthhandler, httpdigestauthhandler, peer, httppeer, sshpeer + localrepo, RepoLookupError, Abort, RepoError, hex, scmutil, hg_url, + httpbasicauthhandler, httpdigestauthhandler, peer, httppeer, sshpeer, tag ) from .changeset import MercurialChangeset @@ -172,11 +172,10 @@ class MercurialRepository(BaseRepository changeset.short_id) if date is None: - date = datetime.datetime.now().ctime() + date = datetime.datetime.now().strftime('%a, %d %b %Y %H:%M:%S') try: - self._repo.tag(name, changeset._ctx.node(), message, local, user, - date) + tag(self._repo, name, changeset._ctx.node(), message, local, user, date) except Abort as e: raise RepositoryError(e.message) @@ -202,11 +201,11 @@ class MercurialRepository(BaseRepository if message is None: message = "Removed tag %s" % name if date is None: - date = datetime.datetime.now().ctime() + date = datetime.datetime.now().strftime('%a, %d %b %Y %H:%M:%S') local = False try: - self._repo.tag(name, nullid, message, local, user, date) + tag(self._repo, name, nullid, message, local, user, date) self.tags = self._get_tags() except Abort as e: raise RepositoryError(e.message) @@ -293,7 +292,7 @@ class MercurialRepository(BaseRepository if url.startswith('ssh:'): # in case of invalid uri or authentication issues, sshpeer will # throw an exception. - sshpeer(repoui or ui.ui(), url).lookup('tip') + sshpeer.instance(repoui or ui.ui(), url, False).lookup('tip') return True url_prefix = None @@ -307,7 +306,7 @@ class MercurialRepository(BaseRepository cleaned_uri = str(url_obj) if authinfo: - #create a password manager + # create a password manager passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm() passmgr.add_password(*authinfo) @@ -335,7 +334,7 @@ class MercurialRepository(BaseRepository if not url_prefix: # skip svn+http://... (and git+... too) # now check if it's a proper hg repo try: - httppeer(repoui or ui.ui(), url).lookup('tip') + httppeer.instance(repoui or ui.ui(), url, False).lookup('tip') except Exception as e: raise urllib2.URLError( "url [%s] does not look like an hg repo org_exc: %s" @@ -356,7 +355,7 @@ class MercurialRepository(BaseRepository try: if src_url: - url = str(self._get_url(src_url)) + url = safe_str(self._get_url(src_url)) opts = {} if not update_after_clone: opts.update({'noupdate': True}) @@ -365,13 +364,13 @@ class MercurialRepository(BaseRepository # Don't try to create if we've already cloned repo create = False - return localrepository(self.baseui, self.path, create=create) + return localrepo.instance(self.baseui, self.path, create=create) except (Abort, RepoError) as err: if create: - msg = "Cannot create repository at %s. Original error was %s"\ + msg = "Cannot create repository at %s. Original error was %s" \ % (self.path, err) else: - msg = "Not valid repository at %s. Original error was %s"\ + msg = "Not valid repository at %s. Original error was %s" \ % (self.path, err) raise RepositoryError(msg) @@ -402,7 +401,7 @@ class MercurialRepository(BaseRepository try: return time.mktime(self.get_changeset().date.timetuple()) except RepositoryError: - #fallback to filesystem + # fallback to filesystem cl_path = os.path.join(self.path, '.hg', "00changelog.i") st_path = os.path.join(self.path, '.hg', "store") if os.path.exists(cl_path): @@ -412,7 +411,7 @@ class MercurialRepository(BaseRepository def _get_revision(self, revision): """ - Gets an ID revision given as str. This will always return a fill + Gets an ID revision given as str. This will always return a full 40 char revision number :param revision: str or int or None @@ -423,19 +422,22 @@ class MercurialRepository(BaseRepository if self._empty: raise EmptyRepositoryError("There are no changesets yet") - if revision in [-1, 'tip', None]: + if revision in [-1, None]: revision = 'tip' try: - revision = hex(self._repo.lookup(revision)) + if isinstance(revision, int): + return self._repo[revision].hex() + try: + return scmutil.revsymbol(self._repo, revision).hex() + except AttributeError: # revsymbol was introduced in Mercurial 4.6 + return self._repo[revision].hex() + except (IndexError, ValueError, RepoLookupError, TypeError): + msg = ("Revision %s does not exist for %s" % (revision, self)) + raise ChangesetDoesNotExistError(msg) except (LookupError, ): msg = ("Ambiguous identifier `%s` for %s" % (revision, self)) raise ChangesetDoesNotExistError(msg) - except (IndexError, ValueError, RepoLookupError, TypeError): - msg = ("Revision %s does not exist for %s" % (revision, self)) - raise ChangesetDoesNotExistError(msg) - - return revision def get_ref_revision(self, ref_type, ref_name): """ @@ -488,8 +490,8 @@ class MercurialRepository(BaseRepository to filesystem (``file:///``) schema. """ - url = str(url) - if url != 'default' and not '://' in url: + url = safe_str(url) + if url != 'default' and '://' not in url: url = "file:" + urllib.pathname2url(url) return url @@ -509,7 +511,7 @@ class MercurialRepository(BaseRepository return changeset def get_changesets(self, start=None, end=None, start_date=None, - end_date=None, branch_name=None, reverse=False): + end_date=None, branch_name=None, reverse=False, max_revisions=None): """ Returns iterator of ``MercurialChangeset`` objects from start to end (both are inclusive) @@ -521,7 +523,6 @@ class MercurialRepository(BaseRepository :param branch_name: :param reversed: return changesets in reversed order """ - start_raw_id = self._get_revision(start) start_pos = self.revisions.index(start_raw_id) if start else None end_raw_id = self._get_revision(end) @@ -536,19 +537,22 @@ class MercurialRepository(BaseRepository raise BranchDoesNotExistError(msg) if end_pos is not None: end_pos += 1 - #filter branches + # filter branches filter_ = [] if branch_name: - filter_.append('branch("%s")' % (branch_name)) - - if start_date and not end_date: + filter_.append('branch("%s")' % safe_str(branch_name)) + if start_date: filter_.append('date(">%s")' % start_date) - if end_date and not start_date: + if end_date: filter_.append('date("<%s")' % end_date) - if start_date and end_date: - filter_.append('date(">%s") and date("<%s")' % (start_date, end_date)) - if filter_: - revisions = scmutil.revrange(self._repo, filter_) + if filter_ or max_revisions: + if filter_: + revspec = ' and '.join(filter_) + else: + revspec = 'all()' + if max_revisions: + revspec = 'limit(%s, %s)' % (revspec, max_revisions) + revisions = scmutil.revrange(self._repo, [revspec]) else: revisions = self.revisions @@ -598,8 +602,10 @@ class MercurialRepository(BaseRepository config_file = [config_file] config = self._repo.ui - for path in config_file: - config.readconfig(path) + if config_file: + config = ui.ui() + for path in config_file: + config.readconfig(path) return config.config(section, name) def get_user_name(self, config_file=None): @@ -609,7 +615,7 @@ class MercurialRepository(BaseRepository :param config_file: A path to file which should be used to retrieve configuration from (might also be a list of file paths) """ - username = self.get_config_value('ui', 'username') + username = self.get_config_value('ui', 'username', config_file=config_file) if username: return author_name(username) return None @@ -621,7 +627,7 @@ class MercurialRepository(BaseRepository :param config_file: A path to file which should be used to retrieve configuration from (might also be a list of file paths) """ - username = self.get_config_value('ui', 'username') + username = self.get_config_value('ui', 'username', config_file=config_file) if username: return author_email(username) return None diff --git a/kallithea/lib/vcs/backends/hg/workdir.py b/kallithea/lib/vcs/backends/hg/workdir.py --- a/kallithea/lib/vcs/backends/hg/workdir.py +++ b/kallithea/lib/vcs/backends/hg/workdir.py @@ -19,4 +19,5 @@ class MercurialWorkdir(BaseWorkdir): if branch not in self.repository.branches: raise BranchDoesNotExistError - hg_merge.update(self.repository._repo, branch, False, False, None) + raw_id = self.repository.branches[branch] + hg_merge.update(self.repository._repo, raw_id, False, False, None) diff --git a/kallithea/lib/vcs/conf/settings.py b/kallithea/lib/vcs/conf/settings.py --- a/kallithea/lib/vcs/conf/settings.py +++ b/kallithea/lib/vcs/conf/settings.py @@ -17,7 +17,7 @@ if os.path.isdir(VCSRC_PATH): VCSRC_PATH = os.path.join(VCSRC_PATH, '__init__.py') # list of default encoding used in safe_unicode/safe_str methods -DEFAULT_ENCODINGS = aslist('utf8') +DEFAULT_ENCODINGS = aslist('utf-8') # path to git executable run by run_git_command function GIT_EXECUTABLE_PATH = 'git' diff --git a/kallithea/lib/vcs/nodes.py b/kallithea/lib/vcs/nodes.py --- a/kallithea/lib/vcs/nodes.py +++ b/kallithea/lib/vcs/nodes.py @@ -315,18 +315,8 @@ class FileNode(Node): def get_mimetype(self): """ - Mimetype is calculated based on the file's content. If ``_mimetype`` - attribute is available, it will be returned (backends which store - mimetypes or can easily recognize them, should set this private - attribute to indicate that type should *NOT* be calculated). + Mimetype is calculated based on the file's content. """ - if hasattr(self, '_mimetype'): - if (isinstance(self._mimetype, (tuple, list,)) and - len(self._mimetype) == 2): - return self._mimetype - else: - raise NodeError('given _mimetype attribute must be an 2 ' - 'element list or tuple') mtype, encoding = mimetypes.guess_type(self.name) @@ -338,7 +328,7 @@ class FileNode(Node): mtype = 'text/plain' encoding = None - #try with pygments + # try with pygments try: from pygments import lexers mt = lexers.get_lexer_for_filename(self.name).mimetypes @@ -604,27 +594,19 @@ class SubModuleNode(Node): is_binary = False size = 0 - def __init__(self, name, url=None, changeset=None, alias=None): + def __init__(self, name, url, changeset=None, alias=None): self.path = name self.kind = NodeKind.SUBMODULE self.alias = alias # we have to use emptyChangeset here since this can point to svn/git/hg # submodules we cannot get from repository self.changeset = EmptyChangeset(str(changeset), alias=alias) - self.url = url or self._extract_submodule_url() + self.url = url def __repr__(self): return '<%s %r @ %s>' % (self.__class__.__name__, self.path, getattr(self.changeset, 'short_id', '')) - def _extract_submodule_url(self): - if self.alias == 'git': - #TODO: find a way to parse gits submodule file and extract the - # linking URL - return self.path - if self.alias == 'hg': - return self.path - @LazyProperty def name(self): """ diff --git a/kallithea/lib/vcs/subprocessio.py b/kallithea/lib/vcs/subprocessio.py --- a/kallithea/lib/vcs/subprocessio.py +++ b/kallithea/lib/vcs/subprocessio.py @@ -1,8 +1,8 @@ """ Module provides a class allowing to wrap communication over subprocess.Popen -input, output, error streams into a meaningfull, non-blocking, concurrent +input, output, error streams into a meaningful, non-blocking, concurrent stream processor exposing the output data as an iterator fitting to be a -return value passed by a WSGI applicaiton to a WSGI server per PEP 3333. +return value passed by a WSGI application to a WSGI server per PEP 3333. Copyright (c) 2011 Daniel Dotsenko @@ -24,10 +24,11 @@ If not, see sign are found, it fallbacks to regex findall() - and returns first found result or empty string + Returns email address of given author string. + If author contains <> brackets, only look inside that. + If any RFC valid email address is found, return that. + Else, return empty string. - Regex taken from http://www.regular-expressions.info/email.html """ if not author: return '' - import re - r = author.find('>') - l = author.find('<') - if l == -1 or r == -1: - # fallback to regex match of email out of a string - email_re = re.compile(r"""[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!""" - r"""#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z""" - r"""0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]""" - r"""*[a-z0-9])?""", re.IGNORECASE) - m = re.findall(email_re, author) - return m[0] if m else '' + l = author.find('<') + 1 + if l != 0: + r = author.find('>', l) + if r != -1: + author = author[l:r] - return author[l + 1:r].strip() + m = email_re.search(author) + if m is None: + return '' + return safe_str(m.group(0)) def author_name(author): @@ -184,7 +189,7 @@ def author_name(author): """ if not author: return '' - if not '@' in author: + if '@' not in author: return author - return author.replace(author_email(author), '').replace('<', '')\ + return author.replace(author_email(author), '').replace('<', '') \ .replace('>', '').strip() diff --git a/kallithea/lib/vcs/utils/annotate.py b/kallithea/lib/vcs/utils/annotate.py --- a/kallithea/lib/vcs/utils/annotate.py +++ b/kallithea/lib/vcs/utils/annotate.py @@ -41,7 +41,7 @@ class AnnotateHtmlFormatter(HtmlFormatte following function as ``annotate_from_changeset_func``:: def changeset_to_anchor(changeset): - return '%s\n' %\ + return '%s\n' % \ (changeset.id, changeset.id) :param annotate_from_changeset_func: see above @@ -122,7 +122,7 @@ class AnnotateHtmlFormatter(HtmlFormatte for i in range(fl, fl + lncount): if i % st == 0: if aln: - lines.append('%*d' \ + lines.append('%*d' % (la, i, mw, i)) else: lines.append('%*d' % (mw, i)) @@ -134,7 +134,7 @@ class AnnotateHtmlFormatter(HtmlFormatte # If pygments cropped last lines break we need do that too ln_cs = len(annotate_changesets) ln_ = len(ls.splitlines()) - if ln_cs > ln_: + if ln_cs > ln_: annotate_changesets = annotate_changesets[:ln_ - ln_cs] annotate = ''.join((self.annotate_from_changeset(changeset) for changeset in annotate_changesets)) diff --git a/kallithea/lib/vcs/utils/baseui_config.py b/kallithea/lib/vcs/utils/baseui_config.py deleted file mode 100644 --- a/kallithea/lib/vcs/utils/baseui_config.py +++ /dev/null @@ -1,47 +0,0 @@ -from kallithea.lib.vcs.utils.hgcompat import ui, config - - -def make_ui(self, path='hgwebdir.config'): - """ - A function that will read python rc files and make an ui from read options - - :param path: path to mercurial config file - """ - #propagated from mercurial documentation - sections = [ - 'alias', - 'auth', - 'decode/encode', - 'defaults', - 'diff', - 'email', - 'extensions', - 'format', - 'merge-patterns', - 'merge-tools', - 'hooks', - 'http_proxy', - 'smtp', - 'patch', - 'paths', - 'profiling', - 'server', - 'trusted', - 'ui', - 'web', - ] - - repos = path - baseui = ui.ui() - cfg = config.config() - cfg.read(repos) - self.paths = cfg.items('paths') - self.base_path = self.paths[0][1].replace('*', '') - self.check_repo_dir(self.paths) - self.set_statics(cfg) - - for section in sections: - for k, v in cfg.items(section): - baseui.setconfig(section, k, v) - - return baseui diff --git a/kallithea/lib/vcs/utils/compat.py b/kallithea/lib/vcs/utils/compat.py --- a/kallithea/lib/vcs/utils/compat.py +++ b/kallithea/lib/vcs/utils/compat.py @@ -4,6 +4,7 @@ Various utilities to work with Python < Those utilities may be deleted once ``vcs`` stops support for older Python versions. """ + import sys import array @@ -11,308 +12,3 @@ if sys.version_info >= (2, 7): unittest = __import__('unittest') else: unittest = __import__('unittest2') - - -if sys.version_info >= (2, 6): - _bytes = bytes -else: - # in py2.6 bytes is a synonym for str - _bytes = str - -if sys.version_info >= (2, 6): - _bytearray = bytearray -else: - # no idea if this is correct but all integration tests are passing - # i think we never use bytearray anyway - _bytearray = array - -if sys.version_info >= (2, 6): - from collections import deque -else: - #need to implement our own deque with maxlen - class deque(object): - - def __init__(self, iterable=(), maxlen= -1): - if not hasattr(self, 'data'): - self.left = self.right = 0 - self.data = {} - self.maxlen = maxlen or -1 - self.extend(iterable) - - def append(self, x): - self.data[self.right] = x - self.right += 1 - if self.maxlen != -1 and len(self) > self.maxlen: - self.popleft() - - def appendleft(self, x): - self.left -= 1 - self.data[self.left] = x - if self.maxlen != -1 and len(self) > self.maxlen: - self.pop() - - def pop(self): - if self.left == self.right: - raise IndexError('cannot pop from empty deque') - self.right -= 1 - elem = self.data[self.right] - del self.data[self.right] - return elem - - def popleft(self): - if self.left == self.right: - raise IndexError('cannot pop from empty deque') - elem = self.data[self.left] - del self.data[self.left] - self.left += 1 - return elem - - def clear(self): - self.data.clear() - self.left = self.right = 0 - - def extend(self, iterable): - for elem in iterable: - self.append(elem) - - def extendleft(self, iterable): - for elem in iterable: - self.appendleft(elem) - - def rotate(self, n=1): - if self: - n %= len(self) - for i in xrange(n): - self.appendleft(self.pop()) - - def __getitem__(self, i): - if i < 0: - i += len(self) - try: - return self.data[i + self.left] - except KeyError: - raise IndexError - - def __setitem__(self, i, value): - if i < 0: - i += len(self) - try: - self.data[i + self.left] = value - except KeyError: - raise IndexError - - def __delitem__(self, i): - size = len(self) - if not (-size <= i < size): - raise IndexError - data = self.data - if i < 0: - i += size - for j in xrange(self.left + i, self.right - 1): - data[j] = data[j + 1] - self.pop() - - def __len__(self): - return self.right - self.left - - def __cmp__(self, other): - if type(self) != type(other): - return cmp(type(self), type(other)) - return cmp(list(self), list(other)) - - def __repr__(self, _track=[]): - if id(self) in _track: - return '...' - _track.append(id(self)) - r = 'deque(%r, maxlen=%s)' % (list(self), self.maxlen) - _track.remove(id(self)) - return r - - def __getstate__(self): - return (tuple(self),) - - def __setstate__(self, s): - self.__init__(s[0]) - - def __hash__(self): - raise TypeError - - def __copy__(self): - return self.__class__(self) - - def __deepcopy__(self, memo={}): - from copy import deepcopy - result = self.__class__() - memo[id(self)] = result - result.__init__(deepcopy(tuple(self), memo)) - return result - - -#============================================================================== -# threading.Event -#============================================================================== - -if sys.version_info >= (2, 6): - from threading import Event, Thread -else: - from threading import _Verbose, Lock, Thread, _time, \ - _allocate_lock, RLock, _sleep - - def Condition(*args, **kwargs): - return _Condition(*args, **kwargs) - - class _Condition(_Verbose): - - def __init__(self, lock=None, verbose=None): - _Verbose.__init__(self, verbose) - if lock is None: - lock = RLock() - self.__lock = lock - # Export the lock's acquire() and release() methods - self.acquire = lock.acquire - self.release = lock.release - # If the lock defines _release_save() and/or _acquire_restore(), - # these override the default implementations (which just call - # release() and acquire() on the lock). Ditto for _is_owned(). - try: - self._release_save = lock._release_save - except AttributeError: - pass - try: - self._acquire_restore = lock._acquire_restore - except AttributeError: - pass - try: - self._is_owned = lock._is_owned - except AttributeError: - pass - self.__waiters = [] - - def __enter__(self): - return self.__lock.__enter__() - - def __exit__(self, *args): - return self.__lock.__exit__(*args) - - def __repr__(self): - return "" % (self.__lock, len(self.__waiters)) - - def _release_save(self): - self.__lock.release() # No state to save - - def _acquire_restore(self, x): - self.__lock.acquire() # Ignore saved state - - def _is_owned(self): - # Return True if lock is owned by current_thread. - # This method is called only if __lock doesn't have _is_owned(). - if self.__lock.acquire(0): - self.__lock.release() - return False - else: - return True - - def wait(self, timeout=None): - if not self._is_owned(): - raise RuntimeError("cannot wait on un-acquired lock") - waiter = _allocate_lock() - waiter.acquire() - self.__waiters.append(waiter) - saved_state = self._release_save() - try: # restore state no matter what (e.g., KeyboardInterrupt) - if timeout is None: - waiter.acquire() - if __debug__: - self._note("%s.wait(): got it", self) - else: - # Balancing act: We can't afford a pure busy loop, so we - # have to sleep; but if we sleep the whole timeout time, - # we'll be unresponsive. The scheme here sleeps very - # little at first, longer as time goes on, but never longer - # than 20 times per second (or the timeout time remaining). - endtime = _time() + timeout - delay = 0.0005 # 500 us -> initial delay of 1 ms - while True: - gotit = waiter.acquire(0) - if gotit: - break - remaining = endtime - _time() - if remaining <= 0: - break - delay = min(delay * 2, remaining, .05) - _sleep(delay) - if not gotit: - if __debug__: - self._note("%s.wait(%s): timed out", self, timeout) - try: - self.__waiters.remove(waiter) - except ValueError: - pass - else: - if __debug__: - self._note("%s.wait(%s): got it", self, timeout) - finally: - self._acquire_restore(saved_state) - - def notify(self, n=1): - if not self._is_owned(): - raise RuntimeError("cannot notify on un-acquired lock") - __waiters = self.__waiters - waiters = __waiters[:n] - if not waiters: - if __debug__: - self._note("%s.notify(): no waiters", self) - return - self._note("%s.notify(): notifying %d waiter%s", self, n, - n != 1 and "s" or "") - for waiter in waiters: - waiter.release() - try: - __waiters.remove(waiter) - except ValueError: - pass - - def notifyAll(self): - self.notify(len(self.__waiters)) - - notify_all = notifyAll - - def Event(*args, **kwargs): - return _Event(*args, **kwargs) - - class _Event(_Verbose): - - # After Tim Peters' event class (without is_posted()) - - def __init__(self, verbose=None): - _Verbose.__init__(self, verbose) - self.__cond = Condition(Lock()) - self.__flag = False - - def isSet(self): - return self.__flag - - is_set = isSet - - def set(self): - self.__cond.acquire() - try: - self.__flag = True - self.__cond.notify_all() - finally: - self.__cond.release() - - def clear(self): - self.__cond.acquire() - try: - self.__flag = False - finally: - self.__cond.release() - - def wait(self, timeout=None): - self.__cond.acquire() - try: - if not self.__flag: - self.__cond.wait(timeout) - finally: - self.__cond.release() diff --git a/kallithea/lib/vcs/utils/diffs.py b/kallithea/lib/vcs/utils/diffs.py deleted file mode 100644 --- a/kallithea/lib/vcs/utils/diffs.py +++ /dev/null @@ -1,460 +0,0 @@ -# -*- coding: utf-8 -*- -# original copyright: 2007-2008 by Armin Ronacher -# licensed under the BSD license. - -import re -import difflib -import logging -import itertools - -from difflib import unified_diff - -from kallithea.lib.vcs.exceptions import VCSError -from kallithea.lib.vcs.nodes import FileNode, NodeError -from kallithea.lib.vcs.utils import safe_unicode - - -def get_udiff(filenode_old, filenode_new, show_whitespace=True): - """ - Returns unified diff between given ``filenode_old`` and ``filenode_new``. - """ - try: - filenode_old_date = filenode_old.changeset.date - except NodeError: - filenode_old_date = None - - try: - filenode_new_date = filenode_new.changeset.date - except NodeError: - filenode_new_date = None - - for filenode in (filenode_old, filenode_new): - if not isinstance(filenode, FileNode): - raise VCSError("Given object should be FileNode object, not %s" - % filenode.__class__) - - if filenode_old_date and filenode_new_date: - if not filenode_old_date < filenode_new_date: - logging.debug("Generating udiff for filenodes with not increasing " - "dates") - - vcs_udiff = unified_diff(filenode_old.content.splitlines(True), - filenode_new.content.splitlines(True), - filenode_old.name, - filenode_new.name, - filenode_old_date, - filenode_old_date) - return vcs_udiff - - -def get_gitdiff(filenode_old, filenode_new, ignore_whitespace=True): - """ - Returns git style diff between given ``filenode_old`` and ``filenode_new``. - - :param ignore_whitespace: ignore whitespaces in diff - """ - - for filenode in (filenode_old, filenode_new): - if not isinstance(filenode, FileNode): - raise VCSError("Given object should be FileNode object, not %s" - % filenode.__class__) - - old_raw_id = getattr(filenode_old.changeset, 'raw_id', '0' * 40) - new_raw_id = getattr(filenode_new.changeset, 'raw_id', '0' * 40) - - repo = filenode_new.changeset.repository - vcs_gitdiff = repo.get_diff(old_raw_id, new_raw_id, filenode_new.path, - ignore_whitespace) - - return vcs_gitdiff - - -class DiffProcessor(object): - """ - Give it a unified diff and it returns a list of the files that were - mentioned in the diff together with a dict of meta information that - can be used to render it in a HTML template. - """ - _chunk_re = re.compile(r'@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)') - - def __init__(self, diff, differ='diff', format='udiff'): - """ - :param diff: a text in diff format or generator - :param format: format of diff passed, `udiff` or `gitdiff` - """ - if isinstance(diff, basestring): - diff = [diff] - - self.__udiff = diff - self.__format = format - self.adds = 0 - self.removes = 0 - - if isinstance(self.__udiff, basestring): - self.lines = iter(self.__udiff.splitlines(1)) - - elif self.__format == 'gitdiff': - udiff_copy = self.copy_iterator() - self.lines = itertools.imap(self.escaper, - self._parse_gitdiff(udiff_copy)) - else: - udiff_copy = self.copy_iterator() - self.lines = itertools.imap(self.escaper, udiff_copy) - - # Select a differ. - if differ == 'difflib': - self.differ = self._highlight_line_difflib - else: - self.differ = self._highlight_line_udiff - - def escaper(self, string): - return string.replace('<', '<').replace('>', '>') - - def copy_iterator(self): - """ - make a fresh copy of generator, we should not iterate thru - an original as it's needed for repeating operations on - this instance of DiffProcessor - """ - self.__udiff, iterator_copy = itertools.tee(self.__udiff) - return iterator_copy - - def _extract_rev(self, line1, line2): - """ - Extract the filename and revision hint from a line. - """ - - try: - if line1.startswith('--- ') and line2.startswith('+++ '): - l1 = line1[4:].split(None, 1) - old_filename = l1[0].lstrip('a/') if len(l1) >= 1 else None - old_rev = l1[1] if len(l1) == 2 else 'old' - - l2 = line2[4:].split(None, 1) - new_filename = l2[0].lstrip('b/') if len(l1) >= 1 else None - new_rev = l2[1] if len(l2) == 2 else 'new' - - filename = old_filename if (old_filename != - 'dev/null') else new_filename - - return filename, new_rev, old_rev - except (ValueError, IndexError): - pass - - return None, None, None - - def _parse_gitdiff(self, diffiterator): - def line_decoder(l): - if l.startswith('+') and not l.startswith('+++'): - self.adds += 1 - elif l.startswith('-') and not l.startswith('---'): - self.removes += 1 - return safe_unicode(l) - - output = list(diffiterator) - size = len(output) - - if size == 2: - l = [] - l.extend([output[0]]) - l.extend(output[1].splitlines(1)) - return map(line_decoder, l) - elif size == 1: - return map(line_decoder, output[0].splitlines(1)) - elif size == 0: - return [] - - raise Exception('wrong size of diff %s' % size) - - def _highlight_line_difflib(self, line, next): - """ - Highlight inline changes in both lines. - """ - - if line['action'] == 'del': - old, new = line, next - else: - old, new = next, line - - oldwords = re.split(r'(\W)', old['line']) - newwords = re.split(r'(\W)', new['line']) - - sequence = difflib.SequenceMatcher(None, oldwords, newwords) - - oldfragments, newfragments = [], [] - for tag, i1, i2, j1, j2 in sequence.get_opcodes(): - oldfrag = ''.join(oldwords[i1:i2]) - newfrag = ''.join(newwords[j1:j2]) - if tag != 'equal': - if oldfrag: - oldfrag = '%s' % oldfrag - if newfrag: - newfrag = '%s' % newfrag - oldfragments.append(oldfrag) - newfragments.append(newfrag) - - old['line'] = "".join(oldfragments) - new['line'] = "".join(newfragments) - - def _highlight_line_udiff(self, line, next): - """ - Highlight inline changes in both lines. - """ - start = 0 - limit = min(len(line['line']), len(next['line'])) - while start < limit and line['line'][start] == next['line'][start]: - start += 1 - end = -1 - limit -= start - while -end <= limit and line['line'][end] == next['line'][end]: - end -= 1 - end += 1 - if start or end: - def do(l): - last = end + len(l['line']) - if l['action'] == 'add': - tag = 'ins' - else: - tag = 'del' - l['line'] = '%s<%s>%s%s' % ( - l['line'][:start], - tag, - l['line'][start:last], - tag, - l['line'][last:] - ) - do(line) - do(next) - - def _parse_udiff(self): - """ - Parse the diff an return data for the template. - """ - lineiter = self.lines - files = [] - try: - line = lineiter.next() - # skip first context - skipfirst = True - while 1: - # continue until we found the old file - if not line.startswith('--- '): - line = lineiter.next() - continue - - chunks = [] - filename, old_rev, new_rev = \ - self._extract_rev(line, lineiter.next()) - files.append({ - 'filename': filename, - 'old_revision': old_rev, - 'new_revision': new_rev, - 'chunks': chunks - }) - - line = lineiter.next() - while line: - match = self._chunk_re.match(line) - if not match: - break - - lines = [] - chunks.append(lines) - - old_line, old_end, new_line, new_end = \ - [int(x or 1) for x in match.groups()[:-1]] - old_line -= 1 - new_line -= 1 - context = len(match.groups()) == 5 - old_end += old_line - new_end += new_line - - if context: - if not skipfirst: - lines.append({ - 'old_lineno': '...', - 'new_lineno': '...', - 'action': 'context', - 'line': line, - }) - else: - skipfirst = False - - line = lineiter.next() - while old_line < old_end or new_line < new_end: - if line: - command, line = line[0], line[1:] - else: - command = ' ' - affects_old = affects_new = False - - # ignore those if we don't expect them - if command in '#@': - continue - elif command == '+': - affects_new = True - action = 'add' - elif command == '-': - affects_old = True - action = 'del' - else: - affects_old = affects_new = True - action = 'unmod' - - old_line += affects_old - new_line += affects_new - lines.append({ - 'old_lineno': affects_old and old_line or '', - 'new_lineno': affects_new and new_line or '', - 'action': action, - 'line': line - }) - line = lineiter.next() - - except StopIteration: - pass - - # highlight inline changes - for file in files: - for chunk in chunks: - lineiter = iter(chunk) - #first = True - try: - while 1: - line = lineiter.next() - if line['action'] != 'unmod': - nextline = lineiter.next() - if nextline['action'] == 'unmod' or \ - nextline['action'] == line['action']: - continue - self.differ(line, nextline) - except StopIteration: - pass - - return files - - def prepare(self): - """ - Prepare the passed udiff for HTML rendering. It'l return a list - of dicts - """ - return self._parse_udiff() - - def _safe_id(self, idstring): - """Make a string safe for including in an id attribute. - - The HTML spec says that id attributes 'must begin with - a letter ([A-Za-z]) and may be followed by any number - of letters, digits ([0-9]), hyphens ("-"), underscores - ("_"), colons (":"), and periods (".")'. These regexps - are slightly over-zealous, in that they remove colons - and periods unnecessarily. - - Whitespace is transformed into underscores, and then - anything which is not a hyphen or a character that - matches \w (alphanumerics and underscore) is removed. - - """ - # Transform all whitespace to underscore - idstring = re.sub(r'\s', "_", idstring) - # Remove everything that is not a hyphen or a member of \w - idstring = re.sub(r'(?!-)\W', "", idstring).lower() - return idstring - - def raw_diff(self): - """ - Returns raw string as udiff - """ - udiff_copy = self.copy_iterator() - if self.__format == 'gitdiff': - udiff_copy = self._parse_gitdiff(udiff_copy) - return u''.join(udiff_copy) - - def as_html(self, table_class='code-difftable', line_class='line', - new_lineno_class='lineno old', old_lineno_class='lineno new', - code_class='code'): - """ - Return udiff as html table with customized css classes - """ - def _link_to_if(condition, label, url): - """ - Generates a link if condition is meet or just the label if not. - """ - - if condition: - return '''%(label)s''' % {'url': url, - 'label': label} - else: - return label - diff_lines = self.prepare() - _html_empty = True - _html = [] - _html.append('''\n''' \ - % {'table_class': table_class}) - for diff in diff_lines: - for line in diff['chunks']: - _html_empty = False - for change in line: - _html.append('''\n''' \ - % {'line_class': line_class, - 'action': change['action']}) - anchor_old_id = '' - anchor_new_id = '' - anchor_old = "%(filename)s_o%(oldline_no)s" % \ - {'filename': self._safe_id(diff['filename']), - 'oldline_no': change['old_lineno']} - anchor_new = "%(filename)s_n%(oldline_no)s" % \ - {'filename': self._safe_id(diff['filename']), - 'oldline_no': change['new_lineno']} - cond_old = change['old_lineno'] != '...' and \ - change['old_lineno'] - cond_new = change['new_lineno'] != '...' and \ - change['new_lineno'] - if cond_old: - anchor_old_id = 'id="%s"' % anchor_old - if cond_new: - anchor_new_id = 'id="%s"' % anchor_new - ########################################################### - # OLD LINE NUMBER - ########################################################### - _html.append('''\t\n''') - ########################################################### - # NEW LINE NUMBER - ########################################################### - - _html.append('''\t\n''') - ########################################################### - # CODE - ########################################################### - _html.append('''\t''') - _html.append('''\n\n''') - _html.append('''
''' \ - % {'a_id': anchor_old_id, - 'old_lineno_cls': old_lineno_class}) - - _html.append('''
%(link)s
''' \ - % {'link': - _link_to_if(cond_old, change['old_lineno'], '#%s' \ - % anchor_old)}) - _html.append('''		''' \ - % {'a_id': anchor_new_id, - 'new_lineno_cls': new_lineno_class}) - - _html.append('''
%(link)s
''' \ - % {'link': - _link_to_if(cond_new, change['new_lineno'], '#%s' \ - % anchor_new)}) - _html.append('''		''' \ - % {'code_class': code_class}) - _html.append('''\n\t\t
%(code)s
\n''' \ - % {'code': change['line']}) - _html.append('''\t
''') - if _html_empty: - return None - return ''.join(_html) - - def stat(self): - """ - Returns tuple of adde,and removed lines for this instance - """ - return self.adds, self.removes diff --git a/kallithea/lib/vcs/utils/helpers.py b/kallithea/lib/vcs/utils/helpers.py --- a/kallithea/lib/vcs/utils/helpers.py +++ b/kallithea/lib/vcs/utils/helpers.py @@ -99,16 +99,6 @@ def get_scms_for_path(path): return result -def run_command(cmd, *args): - """ - Runs command on the system with given ``args``. - """ - command = ' '.join((cmd, args)) - p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE) - stdout, stderr = p.communicate() - return p.retcode, stdout, stderr - - def get_highlighted_code(name, code, type='terminal'): """ If pygments are available on the system @@ -149,7 +139,7 @@ def parse_changesets(text): """ text = text.strip() CID_RE = r'[a-zA-Z0-9]+' - if not '..' in text: + if '..' not in text: m = re.match(r'^(?P%s)$' % CID_RE, text) if m: return { diff --git a/kallithea/lib/vcs/utils/hgcompat.py b/kallithea/lib/vcs/utils/hgcompat.py --- a/kallithea/lib/vcs/utils/hgcompat.py +++ b/kallithea/lib/vcs/utils/hgcompat.py @@ -3,46 +3,52 @@ Mercurial libs compatibility """ import mercurial -import mercurial.demandimport -## patch demandimport, due to bug in mercurial when it always triggers demandimport.enable() -mercurial.demandimport.enable = lambda *args, **kwargs: 1 +from mercurial import demandimport +# patch demandimport, due to bug in mercurial when it always triggers demandimport.enable() +demandimport.enable = lambda *args, **kwargs: 1 from mercurial import archival, merge as hg_merge, patch, ui from mercurial import discovery from mercurial import localrepo from mercurial import unionrepo from mercurial import scmutil from mercurial import config +from mercurial import tags as tagsmod +from mercurial import httppeer +from mercurial import sshpeer from mercurial.commands import clone, nullid, pull from mercurial.context import memctx, memfilectx from mercurial.error import RepoError, RepoLookupError, Abort from mercurial.hgweb import hgweb_mod from mercurial.hgweb.common import get_contact -from mercurial.localrepo import localrepository from mercurial.match import match from mercurial.mdiff import diffopts from mercurial.node import hex from mercurial.encoding import tolocal from mercurial.discovery import findcommonoutgoing from mercurial.hg import peer -from mercurial.httppeer import httppeer -from mercurial.sshpeer import sshpeer from mercurial.util import url as hg_url from mercurial.scmutil import revrange from mercurial.node import nullrev - -# those authhandlers are patched for python 2.6.5 bug an -# infinite looping when given invalid resources from mercurial.url import httpbasicauthhandler, httpdigestauthhandler + +# Mercurial 4.5 8a0cac20a1ad introduced an extra memctx changectx argument +# - introduce an optional wrapper factory that doesn't pass it on import inspect -# Mercurial 3.1 503bb3af70fe -if inspect.getargspec(memfilectx.__init__).args[1] != 'repo': - _org__init__=memfilectx.__init__ - def _memfilectx__init__(self, repo, *a, **b): - return _org__init__(self, *a, **b) - memfilectx.__init__ = _memfilectx__init__ +if inspect.getargspec(memfilectx.__init__).args[2] != 'changectx': + __org_memfilectx = memfilectx + memfilectx = lambda repo, changectx, *args, **kwargs: __org_memfilectx(repo, *args, **kwargs) + # workaround for 3.3 94ac64bcf6fe and not calling largefiles reposetup correctly -localrepository._lfstatuswriters = [lambda *msg, **opts: None] +localrepo.localrepository._lfstatuswriters = [lambda *msg, **opts: None] # 3.5 7699d3212994 added the invariant that repo.lfstatus must exist before hitting overridearchive -localrepository.lfstatus = False +localrepo.localrepository.lfstatus = False + +# Mercurial 4.2 moved tag from localrepo to the tags module +def tag(repo, *args): + try: + tag_f = tagsmod.tag + except AttributeError: + return repo.tag(*args) + tag_f(repo, *args) diff --git a/kallithea/lib/vcs/utils/imports.py b/kallithea/lib/vcs/utils/imports.py --- a/kallithea/lib/vcs/utils/imports.py +++ b/kallithea/lib/vcs/utils/imports.py @@ -19,7 +19,7 @@ def import_class(class_path): try: class_mod = __import__(mod_path, {}, {}, [class_name]) except ImportError as err: - msg = "There was problem while trying to import backend class. "\ + msg = "There was problem while trying to import backend class. " \ "Original error was:\n%s" % err raise VCSError(msg) cls = getattr(class_mod, class_name) diff --git a/kallithea/lib/vcs/utils/lazy.py b/kallithea/lib/vcs/utils/lazy.py --- a/kallithea/lib/vcs/utils/lazy.py +++ b/kallithea/lib/vcs/utils/lazy.py @@ -9,6 +9,7 @@ class _Missing(object): def __reduce__(self): return '_missing' + _missing = _Missing() diff --git a/kallithea/lib/vcs/utils/progressbar.py b/kallithea/lib/vcs/utils/progressbar.py --- a/kallithea/lib/vcs/utils/progressbar.py +++ b/kallithea/lib/vcs/utils/progressbar.py @@ -10,6 +10,7 @@ from kallithea.lib.vcs.utils.helpers imp class ProgressBarError(Exception): pass + class AlreadyFinishedError(ProgressBarError): pass @@ -179,6 +180,7 @@ background = dict([(color_names[x], '4%s RESET = '0' opt_dict = {'bold': '1', 'underscore': '4', 'blink': '5', 'reverse': '7', 'conceal': '8'} + def colorize(text='', opts=(), **kwargs): """ Returns your text, enclosed in ANSI graphics codes. @@ -223,6 +225,7 @@ def colorize(text='', opts=(), **kwargs) text = text + '\x1b[%sm' % RESET return ('\x1b[%sm' % ';'.join(code_list)) + text + def make_style(opts=(), **kwargs): """ Returns a function with default parameters for colorize() @@ -235,6 +238,7 @@ def make_style(opts=(), **kwargs): """ return lambda text: colorize(text, opts, **kwargs) + NOCOLOR_PALETTE = 'nocolor' DARK_PALETTE = 'dark' LIGHT_PALETTE = 'light' @@ -348,7 +352,6 @@ class BarOnlyColoredProgressBar(ColoredP pass - def main(): import time diff --git a/kallithea/lib/vcs/utils/termcolors.py b/kallithea/lib/vcs/utils/termcolors.py --- a/kallithea/lib/vcs/utils/termcolors.py +++ b/kallithea/lib/vcs/utils/termcolors.py @@ -11,6 +11,7 @@ background = dict([(color_names[x], '4%s RESET = '0' opt_dict = {'bold': '1', 'underscore': '4', 'blink': '5', 'reverse': '7', 'conceal': '8'} + def colorize(text='', opts=(), **kwargs): """ Returns your text, enclosed in ANSI graphics codes. @@ -55,6 +56,7 @@ def colorize(text='', opts=(), **kwargs) text = text + '\x1b[%sm' % RESET return ('\x1b[%sm' % ';'.join(code_list)) + text + def make_style(opts=(), **kwargs): """ Returns a function with default parameters for colorize() @@ -67,6 +69,7 @@ def make_style(opts=(), **kwargs): """ return lambda text: colorize(text, opts, **kwargs) + NOCOLOR_PALETTE = 'nocolor' DARK_PALETTE = 'dark' LIGHT_PALETTE = 'light' @@ -120,10 +123,11 @@ PALETTES = { } DEFAULT_PALETTE = DARK_PALETTE + def parse_color_setting(config_string): """Parse a DJANGO_COLORS environment variable to produce the system palette - The general form of a pallete definition is: + The general form of a palette definition is: "palette;role=fg;role=fg/bg;role=fg,option,option;role=fg/bg,option,option" @@ -135,7 +139,7 @@ def parse_color_setting(config_string): option is a display options. Specifying a named palette is the same as manually specifying the individual - definitions for each role. Any individual definitions following the pallete + definitions for each role. Any individual definitions following the palette definition will augment the base palette definition. Valid roles: diff --git a/kallithea/lib/verlib.py b/kallithea/lib/verlib.py --- a/kallithea/lib/verlib.py +++ b/kallithea/lib/verlib.py @@ -5,10 +5,12 @@ discussion at PyCon 2009. import re + class IrrationalVersionError(Exception): """This is an irrational version.""" pass + class HugeMajorVersionNumError(IrrationalVersionError): """An irrational version because the major version number is huge (often because a year or date was used). @@ -18,6 +20,7 @@ class HugeMajorVersionNumError(Irrationa """ pass + # A marker used in the second and third parts of the `parts` tuple, for # versions that don't have those segments, to sort properly. An example # of versions in sort order ('highest' last): @@ -47,6 +50,7 @@ VERSION_RE = re.compile(r''' (?P(\.post(?P\d+))?(\.dev(?P\d+))?)? $''', re.VERBOSE) + class NormalizedVersion(object): """A rational version. @@ -212,6 +216,7 @@ class NormalizedVersion(object): def __ge__(self, other): return self.__eq__(other) or self.__gt__(other) + def suggest_normalized_version(s): """Suggest a normalized version close to the given version string. @@ -251,7 +256,7 @@ def suggest_normalized_version(s): rs = re.sub(r"dev$", r"dev0", rs) # if we have something like "b-2" or "a.2" at the end of the - # version, that is pobably beta, alpha, etc + # version, that is probably beta, alpha, etc # let's remove the dash or dot rs = re.sub(r"([abc|rc])[\-\.](\d+)$", r"\1\2", rs) @@ -267,7 +272,7 @@ def suggest_normalized_version(s): rs = rs[1:] # Clean leading '0's on numbers. - #TODO: unintended side-effect on, e.g., "2003.05.09" + # TODO: unintended side-effect on, e.g., "2003.05.09" # PyPI stats: 77 (~2%) better rs = re.sub(r"\b0+(\d+)(?!\d)", r"\1", rs) @@ -313,7 +318,6 @@ def suggest_normalized_version(s): # PyPI stats: ~21 (0.62%) better rs = re.sub(r"\.?(pre|preview|-c)(\d+)$", r"c\g<2>", rs) - # Tcl/Tk uses "px" for their post release markers rs = re.sub(r"p(\d+)$", r".post\1", rs) diff --git a/kallithea/model/__init__.py b/kallithea/model/__init__.py --- a/kallithea/model/__init__.py +++ b/kallithea/model/__init__.py @@ -23,119 +23,4 @@ Original author and date, and relevant c :author: marcink :copyright: (c) 2013 RhodeCode GmbH, and others. :license: GPLv3, see LICENSE.md for more details. - - -:example: - - .. code-block:: python - - from paste.deploy import appconfig - from pylons import config - from sqlalchemy import engine_from_config - from kallithea.config.environment import load_environment - - conf = appconfig('config:development.ini', relative_to = './../../') - load_environment(conf.global_conf, conf.local_conf) - - engine = engine_from_config(config, 'sqlalchemy.') - init_model(engine) - # RUN YOUR CODE HERE - """ - - -import logging -from kallithea.model import meta -from kallithea.lib.utils2 import safe_str, obfuscate_url_pw - -log = logging.getLogger(__name__) - - -def init_model(engine): - """ - Initializes db session, bind the engine with the metadata, - Call this before using any of the tables or classes in the model, - preferably once in application start - - :param engine: engine to bind to - """ - engine_str = obfuscate_url_pw(str(engine.url)) - log.info("initializing db for %s", engine_str) - meta.Base.metadata.bind = engine - - -class BaseModel(object): - """ - Base Model for all Kallithea models, it adds sql alchemy session - into instance of model - - :param sa: If passed it reuses this session instead of creating a new one - """ - - cls = None # override in child class - - def __init__(self, sa=None): - if sa is not None: - self.sa = sa - else: - self.sa = meta.Session() - - def _get_instance(self, cls, instance, callback=None): - """ - Gets instance of given cls using some simple lookup mechanism. - - :param cls: class to fetch - :param instance: int or Instance - :param callback: callback to call if all lookups failed - """ - - if isinstance(instance, cls): - return instance - elif isinstance(instance, (int, long)) or safe_str(instance).isdigit(): - return cls.get(instance) - else: - if instance is not None: - if callback is None: - raise Exception( - 'given object must be int, long or Instance of %s ' - 'got %s, no callback provided' % (cls, type(instance)) - ) - else: - return callback(instance) - - def _get_user(self, user): - """ - Helper method to get user by ID, or username fallback - - :param user: UserID, username, or User instance - """ - from kallithea.model.db import User - return self._get_instance(User, user, - callback=User.get_by_username) - - def _get_repo(self, repository): - """ - Helper method to get repository by ID, or repository name - - :param repository: RepoID, repository name or Repository Instance - """ - from kallithea.model.db import Repository - return self._get_instance(Repository, repository, - callback=Repository.get_by_repo_name) - - def _get_perm(self, permission): - """ - Helper method to get permission by ID, or permission name - - :param permission: PermissionID, permission_name or Permission instance - """ - from kallithea.model.db import Permission - return self._get_instance(Permission, permission, - callback=Permission.get_by_key) - - @classmethod - def get_all(cls): - """ - Returns all instances of what is defined in `cls` class variable - """ - return cls.cls.getAll() diff --git a/kallithea/model/api_key.py b/kallithea/model/api_key.py --- a/kallithea/model/api_key.py +++ b/kallithea/model/api_key.py @@ -27,18 +27,15 @@ Original author and date, and relevant c import time import logging -from sqlalchemy import or_ from kallithea.lib.utils2 import generate_api_key -from kallithea.model import BaseModel -from kallithea.model.db import UserApiKeys +from kallithea.model.db import User, UserApiKeys from kallithea.model.meta import Session log = logging.getLogger(__name__) -class ApiKeyModel(BaseModel): - cls = UserApiKeys +class ApiKeyModel(object): def create(self, user, description, lifetime=-1): """ @@ -46,7 +43,7 @@ class ApiKeyModel(BaseModel): :param description: description of ApiKey :param lifetime: expiration time in seconds """ - user = self._get_user(user) + user = User.guess_instance(user) new_api_key = UserApiKeys() new_api_key.api_key = generate_api_key() @@ -65,18 +62,16 @@ class ApiKeyModel(BaseModel): api_key = UserApiKeys.query().filter(UserApiKeys.api_key == api_key) if user is not None: - user = self._get_user(user) + user = User.guess_instance(user) api_key = api_key.filter(UserApiKeys.user_id == user.user_id) api_key = api_key.scalar() Session().delete(api_key) def get_api_keys(self, user, show_expired=True): - user = self._get_user(user) - user_api_keys = UserApiKeys.query()\ + user = User.guess_instance(user) + user_api_keys = UserApiKeys.query() \ .filter(UserApiKeys.user_id == user.user_id) if not show_expired: - user_api_keys = user_api_keys\ - .filter(or_(UserApiKeys.expires == -1, - UserApiKeys.expires >= time.time())) + user_api_keys = user_api_keys.filter_by(is_expired=False) return user_api_keys diff --git a/kallithea/model/__init__.py b/kallithea/model/base.py copy from kallithea/model/__init__.py copy to kallithea/model/base.py --- a/kallithea/model/__init__.py +++ b/kallithea/model/base.py @@ -12,8 +12,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . """ -kallithea.model -~~~~~~~~~~~~~~~ +kallithea.model.base +~~~~~~~~~~~~~~~~~~~~ The application's model objects @@ -23,30 +23,12 @@ Original author and date, and relevant c :author: marcink :copyright: (c) 2013 RhodeCode GmbH, and others. :license: GPLv3, see LICENSE.md for more details. - - -:example: - - .. code-block:: python - - from paste.deploy import appconfig - from pylons import config - from sqlalchemy import engine_from_config - from kallithea.config.environment import load_environment - - conf = appconfig('config:development.ini', relative_to = './../../') - load_environment(conf.global_conf, conf.local_conf) - - engine = engine_from_config(config, 'sqlalchemy.') - init_model(engine) - # RUN YOUR CODE HERE - """ import logging from kallithea.model import meta -from kallithea.lib.utils2 import safe_str, obfuscate_url_pw +from kallithea.lib.utils2 import obfuscate_url_pw log = logging.getLogger(__name__) @@ -62,80 +44,3 @@ def init_model(engine): engine_str = obfuscate_url_pw(str(engine.url)) log.info("initializing db for %s", engine_str) meta.Base.metadata.bind = engine - - -class BaseModel(object): - """ - Base Model for all Kallithea models, it adds sql alchemy session - into instance of model - - :param sa: If passed it reuses this session instead of creating a new one - """ - - cls = None # override in child class - - def __init__(self, sa=None): - if sa is not None: - self.sa = sa - else: - self.sa = meta.Session() - - def _get_instance(self, cls, instance, callback=None): - """ - Gets instance of given cls using some simple lookup mechanism. - - :param cls: class to fetch - :param instance: int or Instance - :param callback: callback to call if all lookups failed - """ - - if isinstance(instance, cls): - return instance - elif isinstance(instance, (int, long)) or safe_str(instance).isdigit(): - return cls.get(instance) - else: - if instance is not None: - if callback is None: - raise Exception( - 'given object must be int, long or Instance of %s ' - 'got %s, no callback provided' % (cls, type(instance)) - ) - else: - return callback(instance) - - def _get_user(self, user): - """ - Helper method to get user by ID, or username fallback - - :param user: UserID, username, or User instance - """ - from kallithea.model.db import User - return self._get_instance(User, user, - callback=User.get_by_username) - - def _get_repo(self, repository): - """ - Helper method to get repository by ID, or repository name - - :param repository: RepoID, repository name or Repository Instance - """ - from kallithea.model.db import Repository - return self._get_instance(Repository, repository, - callback=Repository.get_by_repo_name) - - def _get_perm(self, permission): - """ - Helper method to get permission by ID, or permission name - - :param permission: PermissionID, permission_name or Permission instance - """ - from kallithea.model.db import Permission - return self._get_instance(Permission, permission, - callback=Permission.get_by_key) - - @classmethod - def get_all(cls): - """ - Returns all instances of what is defined in `cls` class variable - """ - return cls.cls.getAll() diff --git a/kallithea/model/changeset_status.py b/kallithea/model/changeset_status.py --- a/kallithea/model/changeset_status.py +++ b/kallithea/model/changeset_status.py @@ -28,36 +28,27 @@ Original author and date, and relevant c import logging from sqlalchemy.orm import joinedload -from kallithea.model import BaseModel -from kallithea.model.db import ChangesetStatus, PullRequest -from kallithea.lib.exceptions import StatusChangeOnClosedPullRequestError +from kallithea.model.db import ChangesetStatus, PullRequest, Repository, User, Session log = logging.getLogger(__name__) -class ChangesetStatusModel(BaseModel): - - cls = ChangesetStatus - - def __get_changeset_status(self, changeset_status): - return self._get_instance(ChangesetStatus, changeset_status) - - def __get_pull_request(self, pull_request): - return self._get_instance(PullRequest, pull_request) +class ChangesetStatusModel(object): def _get_status_query(self, repo, revision, pull_request, with_revisions=False): - repo = self._get_repo(repo) + repo = Repository.guess_instance(repo) - q = ChangesetStatus.query()\ + q = ChangesetStatus.query() \ .filter(ChangesetStatus.repo == repo) if not with_revisions: + # only report the latest vote across all users! TODO: be smarter! q = q.filter(ChangesetStatus.version == 0) if revision: q = q.filter(ChangesetStatus.revision == revision) elif pull_request: - pull_request = self.__get_pull_request(pull_request) + pull_request = PullRequest.guess_instance(pull_request) q = q.filter(ChangesetStatus.pull_request == pull_request) else: raise Exception('Please specify revision or pull_request') @@ -98,14 +89,14 @@ class ChangesetStatusModel(BaseModel): pull_request_reviewers = [] pull_request_pending_reviewers = [] relevant_statuses = [] - for r in pull_request.reviewers: - st = cs_statuses.get(r.user.username) + for user in pull_request.get_reviewer_users(): + st = cs_statuses.get(user.username) relevant_statuses.append(st) - if not st or st.status in (ChangesetStatus.STATUS_NOT_REVIEWED, - ChangesetStatus.STATUS_UNDER_REVIEW): - st = None - pull_request_pending_reviewers.append(r.user) - pull_request_reviewers.append((r.user, st)) + status = ChangesetStatus.STATUS_NOT_REVIEWED if st is None else st.status + if status in (ChangesetStatus.STATUS_NOT_REVIEWED, + ChangesetStatus.STATUS_UNDER_REVIEW): + pull_request_pending_reviewers.append(user) + pull_request_reviewers.append((user, status)) result = self._calculate_status(relevant_statuses) @@ -141,7 +132,7 @@ class ChangesetStatusModel(BaseModel): return status def set_status(self, repo, status, user, comment, revision=None, - pull_request=None, dont_allow_on_closed_pull_request=False): + pull_request=None): """ Creates new status for changeset or updates the old ones bumping their version, leaving the current status at the value of 'status'. @@ -152,11 +143,8 @@ class ChangesetStatusModel(BaseModel): :param comment: :param revision: :param pull_request: - :param dont_allow_on_closed_pull_request: don't allow a status change - if last status was for pull request and it's closed. We shouldn't - mess around this manually """ - repo = self._get_repo(repo) + repo = Repository.guess_instance(repo) q = ChangesetStatus.query() if revision is not None: @@ -166,37 +154,27 @@ class ChangesetStatusModel(BaseModel): revisions = [revision] else: assert pull_request is not None - pull_request = self.__get_pull_request(pull_request) + pull_request = PullRequest.guess_instance(pull_request) repo = pull_request.org_repo q = q.filter(ChangesetStatus.repo == repo) q = q.filter(ChangesetStatus.revision.in_(pull_request.revisions)) revisions = pull_request.revisions cur_statuses = q.all() - #if statuses exists and last is associated with a closed pull request - # we need to check if we can allow this status change - if (dont_allow_on_closed_pull_request and cur_statuses - and getattr(cur_statuses[0].pull_request, 'status', '') - == PullRequest.STATUS_CLOSED): - raise StatusChangeOnClosedPullRequestError( - 'Changing status on closed pull request is not allowed' - ) - - #update all current statuses with older version + # update all current statuses with older version for st in cur_statuses: st.version += 1 - self.sa.add(st) new_statuses = [] for rev in revisions: new_status = ChangesetStatus() new_status.version = 0 # default - new_status.author = self._get_user(user) - new_status.repo = self._get_repo(repo) + new_status.author = User.guess_instance(user) + new_status.repo = Repository.guess_instance(repo) new_status.status = status new_status.comment = comment new_status.revision = rev new_status.pull_request = pull_request new_statuses.append(new_status) - self.sa.add(new_status) + Session().add(new_status) return new_statuses diff --git a/kallithea/model/comment.py b/kallithea/model/comment.py --- a/kallithea/model/comment.py +++ b/kallithea/model/comment.py @@ -27,39 +27,35 @@ Original author and date, and relevant c import logging -from pylons.i18n.translation import _ +from tg.i18n import ugettext as _ from collections import defaultdict from kallithea.lib.utils2 import extract_mentioned_users, safe_unicode from kallithea.lib import helpers as h -from kallithea.model import BaseModel from kallithea.model.db import ChangesetComment, User, \ - Notification, PullRequest + PullRequest, Repository from kallithea.model.notification import NotificationModel from kallithea.model.meta import Session log = logging.getLogger(__name__) -class ChangesetCommentsModel(BaseModel): - - cls = ChangesetComment - - def __get_changeset_comment(self, changeset_comment): - return self._get_instance(ChangesetComment, changeset_comment) - - def __get_pull_request(self, pull_request): - return self._get_instance(PullRequest, pull_request) +def _list_changeset_commenters(revision): + return (Session().query(User) + .join(ChangesetComment.author) + .filter(ChangesetComment.revision == revision) + .all()) - def _extract_mentions(self, s): - user_objects = [] - for username in extract_mentioned_users(s): - user_obj = User.get_by_username(username, case_insensitive=True) - if user_obj: - user_objects.append(user_obj) - return user_objects +def _list_pull_request_commenters(pull_request): + return (Session().query(User) + .join(ChangesetComment.author) + .filter(ChangesetComment.pull_request_id == pull_request.pull_request_id) + .all()) - def _get_notification_data(self, repo, comment, user, comment_text, + +class ChangesetCommentsModel(object): + + def _get_notification_data(self, repo, comment, author, comment_text, line_no=None, revision=None, pull_request=None, status_change=None, closing_pr=False): """ @@ -71,9 +67,9 @@ class ChangesetCommentsModel(BaseModel): if line_no: line = _('on line %s') % line_no - #changeset + # changeset if revision: - notification_type = Notification.TYPE_CHANGESET_COMMENT + notification_type = NotificationModel.TYPE_CHANGESET_COMMENT cs = repo.scm_instance.get_changeset(revision) desc = cs.short_id @@ -91,31 +87,37 @@ class ChangesetCommentsModel(BaseModel): comment_url) ) # get the current participants of this changeset - recipients = ChangesetComment.get_users(revision=revision) + recipients = _list_changeset_commenters(revision) # add changeset author if it's known locally cs_author = User.get_from_cs_author(cs.author) if not cs_author: - #use repo owner if we cannot extract the author correctly - cs_author = repo.user - recipients += [cs_author] + # use repo owner if we cannot extract the author correctly + # FIXME: just use committer name even if not a user + cs_author = repo.owner + recipients.append(cs_author) + email_kwargs = { 'status_change': status_change, - 'cs_comment_user': user.full_name_and_username, + 'cs_comment_user': author.full_name_and_username, 'cs_target_repo': h.canonical_url('summary_home', repo_name=repo.repo_name), 'cs_comment_url': comment_url, + 'cs_url': h.canonical_url('changeset_home', repo_name=repo.repo_name, revision=revision), 'raw_id': revision, 'message': cs.message, + 'message_short': h.shorter(cs.message, 50, firstline=True), + 'cs_author': cs_author, 'repo_name': repo.repo_name, 'short_id': h.short_id(revision), 'branch': cs.branch, - 'comment_username': user.username, + 'comment_username': author.username, 'threading': threading, } - #pull request + # pull request elif pull_request: - notification_type = Notification.TYPE_PULL_REQUEST_COMMENT + notification_type = NotificationModel.TYPE_PULL_REQUEST_COMMENT desc = comment.pull_request.title _org_ref_type, org_ref_name, _org_rev = comment.pull_request.org_ref.split(':') + _other_ref_type, other_ref_name, _other_rev = comment.pull_request.other_ref.split(':') threading = ['%s-pr-%s@%s' % (pull_request.other_repo.repo_name, pull_request.pull_request_id, h.canonical_hostname())] @@ -126,40 +128,43 @@ class ChangesetCommentsModel(BaseModel): comment_url = pull_request.url(canonical=True, anchor='comment-%s' % comment.comment_id) subj = safe_unicode( - h.link_to('Re pull request %(pr_nice_id)s: %(desc)s %(line)s' % \ + h.link_to('Re pull request %(pr_nice_id)s: %(desc)s %(line)s' % {'desc': desc, 'pr_nice_id': comment.pull_request.nice_id(), 'line': line}, comment_url) ) # get the current participants of this pull request - recipients = ChangesetComment.get_users(pull_request_id= - pull_request.pull_request_id) - # add pull request author - recipients += [pull_request.owner] + recipients = _list_pull_request_commenters(pull_request) + recipients.append(pull_request.owner) + recipients += pull_request.get_reviewer_users() - # add the reviewers to notification - recipients += [x.user for x in pull_request.reviewers] - - #set some variables for email notification + # set some variables for email notification email_kwargs = { 'pr_title': pull_request.title, + 'pr_title_short': h.shorter(pull_request.title, 50), 'pr_nice_id': pull_request.nice_id(), 'status_change': status_change, 'closing_pr': closing_pr, 'pr_comment_url': comment_url, - 'pr_comment_user': user.full_name_and_username, + 'pr_url': pull_request.url(canonical=True), + 'pr_comment_user': author.full_name_and_username, 'pr_target_repo': h.canonical_url('summary_home', repo_name=pull_request.other_repo.repo_name), + 'pr_target_branch': other_ref_name, + 'pr_source_repo': h.canonical_url('summary_home', + repo_name=pull_request.org_repo.repo_name), + 'pr_source_branch': org_ref_name, + 'pr_owner': pull_request.owner, + 'pr_owner_username': pull_request.owner.username, 'repo_name': pull_request.other_repo.repo_name, - 'ref': org_ref_name, - 'comment_username': user.username, + 'comment_username': author.username, 'threading': threading, } return subj, body, recipients, notification_type, email_kwargs - def create(self, text, repo, user, revision=None, pull_request=None, + def create(self, text, repo, author, revision=None, pull_request=None, f_path=None, line_no=None, status_change=None, closing_pr=False, send_email=True): """ @@ -172,11 +177,11 @@ class ChangesetCommentsModel(BaseModel): log.warning('Missing text for comment, skipping...') return None - repo = self._get_repo(repo) - user = self._get_user(user) + repo = Repository.guess_instance(repo) + author = User.guess_instance(author) comment = ChangesetComment() comment.repo = repo - comment.author = user + comment.author = author comment.text = text comment.f_path = f_path comment.line_no = line_no @@ -184,7 +189,7 @@ class ChangesetCommentsModel(BaseModel): if revision is not None: comment.revision = revision elif pull_request is not None: - pull_request = self.__get_pull_request(pull_request) + pull_request = PullRequest.guess_instance(pull_request) comment.pull_request = pull_request else: raise Exception('Please specify revision or pull_request_id') @@ -195,7 +200,7 @@ class ChangesetCommentsModel(BaseModel): if send_email: (subj, body, recipients, notification_type, email_kwargs) = self._get_notification_data( - repo, comment, user, + repo, comment, author, comment_text=text, line_no=line_no, revision=revision, @@ -205,18 +210,18 @@ class ChangesetCommentsModel(BaseModel): email_kwargs['is_mention'] = False # create notification objects, and emails NotificationModel().create( - created_by=user, subject=subj, body=body, + created_by=author, subject=subj, body=body, recipients=recipients, type_=notification_type, email_kwargs=email_kwargs, ) - mention_recipients = set(self._extract_mentions(body))\ - .difference(recipients) + mention_recipients = extract_mentioned_users(body).difference(recipients) if mention_recipients: email_kwargs['is_mention'] = True subj = _('[Mention]') + ' ' + subj + # FIXME: this subject is wrong and unused! NotificationModel().create( - created_by=user, subject=subj, body=body, + created_by=author, subject=subj, body=body, recipients=mention_recipients, type_=notification_type, email_kwargs=email_kwargs @@ -225,7 +230,7 @@ class ChangesetCommentsModel(BaseModel): return comment def delete(self, comment): - comment = self.__get_changeset_comment(comment) + comment = ChangesetComment.guess_instance(comment) Session().delete(comment) return comment @@ -239,38 +244,59 @@ class ChangesetCommentsModel(BaseModel): return self._get_comments(repo_id, revision=revision, pull_request=pull_request, inline=False) - def get_inline_comments(self, repo_id, revision=None, pull_request=None): + def get_inline_comments(self, repo_id, revision=None, pull_request=None, + f_path=None, line_no=None): """ Gets inline comments for either revision or pull_request. Returns a list of tuples with file path and list of comments per line number. """ comments = self._get_comments(repo_id, revision=revision, pull_request=pull_request, - inline=True) + inline=True, f_path=f_path, line_no=line_no) paths = defaultdict(lambda: defaultdict(list)) for co in comments: paths[co.f_path][co.line_no].append(co) return paths.items() - def _get_comments(self, repo_id, revision=None, pull_request=None, inline=False): + def _get_comments(self, repo_id, revision=None, pull_request=None, + inline=False, f_path=None, line_no=None): """ Gets comments for either revision or pull_request_id, either inline or general. + If a file path and optionally line number are given, return only the matching inline comments. """ + if f_path is None and line_no is not None: + raise Exception("line_no only makes sense if f_path is given.") + + if inline is None and f_path is not None: + raise Exception("f_path only makes sense for inline comments.") + q = Session().query(ChangesetComment) if inline: - q = q.filter(ChangesetComment.line_no != None)\ - .filter(ChangesetComment.f_path != None) + if f_path is not None: + # inline comments for a given file... + q = q.filter(ChangesetComment.f_path == f_path) + if line_no is None: + # ... on any line + q = q.filter(ChangesetComment.line_no != None) + else: + # ... on specific line + q = q.filter(ChangesetComment.line_no == line_no) + else: + # all inline comments + q = q.filter(ChangesetComment.line_no != None) \ + .filter(ChangesetComment.f_path != None) else: - q = q.filter(ChangesetComment.line_no == None)\ + # all general comments + q = q.filter(ChangesetComment.line_no == None) \ .filter(ChangesetComment.f_path == None) - if revision: - q = q.filter(ChangesetComment.revision == revision)\ + if revision is not None: + q = q.filter(ChangesetComment.revision == revision) \ .filter(ChangesetComment.repo_id == repo_id) - elif pull_request: - pull_request = self.__get_pull_request(pull_request) + elif pull_request is not None: + pull_request = PullRequest.guess_instance(pull_request) q = q.filter(ChangesetComment.pull_request == pull_request) else: raise Exception('Please specify either revision or pull_request') diff --git a/kallithea/model/db.py b/kallithea/model/db.py --- a/kallithea/model/db.py +++ b/kallithea/model/db.py @@ -41,9 +41,8 @@ from sqlalchemy.orm import relationship, from beaker.cache import cache_region, region_invalidate from webob.exc import HTTPNotFound -from pylons.i18n.translation import lazy_ugettext as _ - -from kallithea import DB_PREFIX +from tg.i18n import lazy_ugettext as _ + from kallithea.lib.exceptions import DefaultUserException from kallithea.lib.vcs import get_backend from kallithea.lib.vcs.utils.helpers import get_scm @@ -68,7 +67,7 @@ log = logging.getLogger(__name__) _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest() -class BaseModel(object): +class BaseDbModel(object): """ Base Model for all classes """ @@ -101,10 +100,10 @@ class BaseModel(object): """return list with keys and values tuples corresponding to this model data """ - l = [] - for k in self._get_keys(): - l.append((k, getattr(self, k),)) - return l + return [ + (k, getattr(self, k)) + for k in self._get_keys() + ] def populate_obj(self, populate_dict): """populate model with data from given populate_dict""" @@ -123,6 +122,32 @@ class BaseModel(object): return cls.query().get(id_) @classmethod + def guess_instance(cls, value, callback=None): + """Haphazardly attempt to convert `value` to a `cls` instance. + + If `value` is None or already a `cls` instance, return it. If `value` + is a number (or looks like one if you squint just right), assume it's + a database primary key and let SQLAlchemy sort things out. Otherwise, + fall back to resolving it using `callback` (if specified); this could + e.g. be a function that looks up instances by name (though that won't + work if the name begins with a digit). Otherwise, raise Exception. + """ + + if value is None: + return None + if isinstance(value, cls): + return value + if isinstance(value, (int, long)) or safe_str(value).isdigit(): + return cls.get(value) + if callback is not None: + return callback(value) + + raise Exception( + 'given object must be int, long or Instance of %s ' + 'got %s, no callback provided' % (cls, type(value)) + ) + + @classmethod def get_or_404(cls, id_): try: id_ = int(id_) @@ -135,15 +160,6 @@ class BaseModel(object): return res @classmethod - def getAll(cls): - # deprecated and left for backward compatibility - return cls.get_all() - - @classmethod - def get_all(cls): - return cls.query().all() - - @classmethod def delete(cls, id_): obj = cls.query().get(id_) Session().delete(obj) @@ -158,13 +174,16 @@ class BaseModel(object): return '' % (self.__class__.__name__) -class Setting(Base, BaseModel): - __tablename__ = DB_PREFIX + 'settings' - +_table_args_default_dict = {'extend_existing': True, + 'mysql_engine': 'InnoDB', + 'mysql_charset': 'utf8', + 'sqlite_autoincrement': True, + } + +class Setting(Base, BaseDbModel): + __tablename__ = 'settings' __table_args__ = ( - UniqueConstraint('app_settings_name'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) SETTINGS_TYPES = { @@ -176,10 +195,10 @@ class Setting(Base, BaseModel): } DEFAULT_UPDATE_URL = '' - app_settings_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - app_settings_name = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - _app_settings_value = Column("app_settings_value", String(4096, convert_unicode=False), nullable=True, unique=None, default=None) - _app_settings_type = Column("app_settings_type", String(255, convert_unicode=False), nullable=True, unique=None, default=None) + app_settings_id = Column(Integer(), primary_key=True) + app_settings_name = Column(String(255), nullable=False, unique=True) + _app_settings_value = Column("app_settings_value", Unicode(4096), nullable=False) + _app_settings_type = Column("app_settings_type", String(255), nullable=True) # FIXME: not nullable? def __init__(self, key='', val='', type='unicode'): self.app_settings_name = key @@ -226,7 +245,7 @@ class Setting(Base, BaseModel): @classmethod def get_by_name(cls, key): - return cls.query()\ + return cls.query() \ .filter(cls.app_settings_name == key).scalar() @classmethod @@ -252,6 +271,7 @@ class Setting(Base, BaseModel): val = Optional.extract(val) type = Optional.extract(type) res = cls(key, val, type) + Session().add(res) else: res.app_settings_name = key if not isinstance(val, Optional): @@ -280,13 +300,8 @@ class Setting(Base, BaseModel): return settings @classmethod - def get_auth_plugins(cls, cache=False): - auth_plugins = cls.get_by_name("auth_plugins").app_settings_value - return auth_plugins - - @classmethod def get_auth_settings(cls, cache=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('auth_')).all() fd = {} for row in ret: @@ -295,7 +310,7 @@ class Setting(Base, BaseModel): @classmethod def get_default_repo_settings(cls, cache=False, strip_prefix=False): - ret = cls.query()\ + ret = cls.query() \ .filter(cls.app_settings_name.startswith('default_')).all() fd = {} for row in ret: @@ -324,99 +339,104 @@ class Setting(Base, BaseModel): return info -class Ui(Base, BaseModel): - __tablename__ = DB_PREFIX + 'ui' +class Ui(Base, BaseDbModel): + __tablename__ = 'ui' __table_args__ = ( + # FIXME: ui_key as key is wrong and should be removed when the corresponding + # Ui.get_by_key has been replaced by the composite key UniqueConstraint('ui_key'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + UniqueConstraint('ui_section', 'ui_key'), + _table_args_default_dict, ) HOOK_UPDATE = 'changegroup.update' HOOK_REPO_SIZE = 'changegroup.repo_size' - HOOK_PUSH = 'changegroup.push_logger' - HOOK_PRE_PUSH = 'prechangegroup.pre_push' - HOOK_PULL = 'outgoing.pull_logger' - HOOK_PRE_PULL = 'preoutgoing.pre_pull' - - ui_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - ui_section = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - ui_key = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - ui_value = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - ui_active = Column(Boolean(), nullable=True, unique=None, default=True) - - # def __init__(self, section='', key='', value=''): - # self.ui_section = section - # self.ui_key = key - # self.ui_value = value + HOOK_PUSH_LOG = 'changegroup.push_logger' + HOOK_PUSH_LOCK = 'prechangegroup.push_lock_handling' + HOOK_PULL_LOG = 'outgoing.pull_logger' + HOOK_PULL_LOCK = 'preoutgoing.pull_lock_handling' + + ui_id = Column(Integer(), primary_key=True) + ui_section = Column(String(255), nullable=False) + ui_key = Column(String(255), nullable=False) + ui_value = Column(String(255), nullable=True) # FIXME: not nullable? + ui_active = Column(Boolean(), nullable=False, default=True) @classmethod - def get_by_key(cls, key): - return cls.query().filter(cls.ui_key == key).scalar() + def get_by_key(cls, section, key): + """ Return specified Ui object, or None if not found. """ + return cls.query().filter_by(ui_section=section, ui_key=key).scalar() + + @classmethod + def get_or_create(cls, section, key): + """ Return specified Ui object, creating it if necessary. """ + setting = cls.get_by_key(section, key) + if setting is None: + setting = cls(ui_section=section, ui_key=key) + Session().add(setting) + return setting @classmethod def get_builtin_hooks(cls): q = cls.query() q = q.filter(cls.ui_key.in_([cls.HOOK_UPDATE, cls.HOOK_REPO_SIZE, - cls.HOOK_PUSH, cls.HOOK_PRE_PUSH, - cls.HOOK_PULL, cls.HOOK_PRE_PULL])) + cls.HOOK_PUSH_LOG, cls.HOOK_PUSH_LOCK, + cls.HOOK_PULL_LOG, cls.HOOK_PULL_LOCK])) + q = q.filter(cls.ui_section == 'hooks') return q.all() @classmethod def get_custom_hooks(cls): q = cls.query() q = q.filter(~cls.ui_key.in_([cls.HOOK_UPDATE, cls.HOOK_REPO_SIZE, - cls.HOOK_PUSH, cls.HOOK_PRE_PUSH, - cls.HOOK_PULL, cls.HOOK_PRE_PULL])) + cls.HOOK_PUSH_LOG, cls.HOOK_PUSH_LOCK, + cls.HOOK_PULL_LOG, cls.HOOK_PULL_LOCK])) q = q.filter(cls.ui_section == 'hooks') return q.all() @classmethod def get_repos_location(cls): - return cls.get_by_key('/').ui_value + return cls.get_by_key('paths', '/').ui_value @classmethod def create_or_update_hook(cls, key, val): - new_ui = cls.get_by_key(key) or cls() - new_ui.ui_section = 'hooks' + new_ui = cls.get_or_create('hooks', key) new_ui.ui_active = True - new_ui.ui_key = key new_ui.ui_value = val - Session().add(new_ui) - def __repr__(self): return '<%s[%s]%s=>%s]>' % (self.__class__.__name__, self.ui_section, self.ui_key, self.ui_value) -class User(Base, BaseModel): +class User(Base, BaseDbModel): __tablename__ = 'users' __table_args__ = ( - UniqueConstraint('username'), UniqueConstraint('email'), Index('u_username_idx', 'username'), Index('u_email_idx', 'email'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) + DEFAULT_USER = 'default' DEFAULT_GRAVATAR_URL = 'https://secure.gravatar.com/avatar/{md5email}?d=identicon&s={size}' - - user_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - username = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - password = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - active = Column(Boolean(), nullable=True, unique=None, default=True) - admin = Column(Boolean(), nullable=True, unique=None, default=False) - name = Column("firstname", String(255, convert_unicode=False), nullable=True, unique=None, default=None) - lastname = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - _email = Column("email", String(255, convert_unicode=False), nullable=True, unique=None, default=None) - last_login = Column(DateTime(timezone=False), nullable=True, unique=None, default=None) - extern_type = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - extern_name = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - api_key = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - inherit_default_permissions = Column(Boolean(), nullable=False, unique=None, default=True) + # The name of the default auth type in extern_type, 'internal' lives in auth_internal.py + DEFAULT_AUTH_TYPE = 'internal' + + user_id = Column(Integer(), primary_key=True) + username = Column(String(255), nullable=False, unique=True) + password = Column(String(255), nullable=False) + active = Column(Boolean(), nullable=False, default=True) + admin = Column(Boolean(), nullable=False, default=False) + name = Column("firstname", Unicode(255), nullable=False) + lastname = Column(Unicode(255), nullable=False) + _email = Column("email", String(255), nullable=True, unique=True) # FIXME: not nullable? + last_login = Column(DateTime(timezone=False), nullable=True) + extern_type = Column(String(255), nullable=True) # FIXME: not nullable? + extern_name = Column(String(255), nullable=True) # FIXME: not nullable? + api_key = Column(String(255), nullable=False) + inherit_default_permissions = Column(Boolean(), nullable=False, default=True) created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) - _user_data = Column("user_data", LargeBinary(), nullable=True) # JSON data + _user_data = Column("user_data", LargeBinary(), nullable=True) # JSON data # FIXME: not nullable? user_log = relationship('UserLog') user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all') @@ -432,17 +452,13 @@ class User(Base, BaseModel): group_member = relationship('UserGroupMember', cascade='all') - notifications = relationship('UserNotification', cascade='all') - # notifications assigned to this user - user_created_notifications = relationship('Notification', cascade='all') # comments created by this user user_comments = relationship('ChangesetComment', cascade='all') - #extra emails for this user + # extra emails for this user user_emails = relationship('UserEmailMap', cascade='all') - #extra API keys + # extra API keys user_api_keys = relationship('UserApiKeys', cascade='all') - @hybrid_property def email(self): return self._email @@ -458,12 +474,12 @@ class User(Base, BaseModel): @property def emails(self): - other = UserEmailMap.query().filter(UserEmailMap.user==self).all() + other = UserEmailMap.query().filter(UserEmailMap.user == self).all() return [self.email] + [x.email for x in other] @property def api_keys(self): - other = UserApiKeys.query().filter(UserApiKeys.user==self).all() + other = UserApiKeys.query().filter(UserApiKeys.user == self).all() return [self.api_key] + [x.api_key for x in other] @property @@ -505,13 +521,9 @@ class User(Base, BaseModel): def is_admin(self): return self.admin - @property - def AuthUser(self): - """ - Returns instance of AuthUser for this user - """ - from kallithea.lib.auth import AuthUser - return AuthUser(dbuser=self) + @hybrid_property + def is_default_user(self): + return self.username == User.DEFAULT_USER @hybrid_property def user_data(self): @@ -535,21 +547,38 @@ class User(Base, BaseModel): self.user_id, self.username) @classmethod + def guess_instance(cls, value): + return super(User, cls).guess_instance(value, User.get_by_username) + + @classmethod def get_or_404(cls, id_, allow_default=True): ''' - Overridden version of BaseModel.get_or_404, with an extra check on + Overridden version of BaseDbModel.get_or_404, with an extra check on the default user. ''' user = super(User, cls).get_or_404(id_) - if allow_default == False: - if user.username == User.DEFAULT_USER: - raise DefaultUserException + if not allow_default and user.is_default_user: + raise DefaultUserException() return user @classmethod + def get_by_username_or_email(cls, username_or_email, case_insensitive=False, cache=False): + """ + For anything that looks like an email address, look up by the email address (matching + case insensitively). + For anything else, try to look up by the user name. + + This assumes no normal username can have '@' symbol. + """ + if '@' in username_or_email: + return User.get_by_email(username_or_email, cache=cache) + else: + return User.get_by_username(username_or_email, case_insensitive=case_insensitive, cache=cache) + + @classmethod def get_by_username(cls, username, case_insensitive=False, cache=False): if case_insensitive: - q = cls.query().filter(cls.username.ilike(username)) + q = cls.query().filter(func.lower(cls.username) == func.lower(username)) else: q = cls.query().filter(cls.username == username) @@ -574,22 +603,15 @@ class User(Base, BaseModel): res = q.scalar() if fallback and not res: - #fallback to additional keys - _res = UserApiKeys.query()\ - .filter(UserApiKeys.api_key == api_key)\ - .filter(or_(UserApiKeys.expires == -1, - UserApiKeys.expires >= time.time()))\ - .first() + # fallback to additional keys + _res = UserApiKeys.query().filter_by(api_key=api_key, is_expired=False).first() if _res: res = _res.user return res @classmethod - def get_by_email(cls, email, case_insensitive=False, cache=False): - if case_insensitive: - q = cls.query().filter(cls.email.ilike(email)) - else: - q = cls.query().filter(cls.email == email) + def get_by_email(cls, email, cache=False): + q = cls.query().filter(func.lower(cls.email) == func.lower(email)) if cache: q = q.options(FromCache("sql_cache_short", @@ -599,10 +621,7 @@ class User(Base, BaseModel): if ret is None: q = UserEmailMap.query() # try fetching in alternate email map - if case_insensitive: - q = q.filter(UserEmailMap.email.ilike(email)) - else: - q = q.filter(UserEmailMap.email == email) + q = q.filter(func.lower(UserEmailMap.email) == func.lower(email)) q = q.options(joinedload(UserEmailMap.user)) if cache: q = q.options(FromCache("sql_cache_short", @@ -622,7 +641,7 @@ class User(Base, BaseModel): # Valid email in the attribute passed, see if they're in the system _email = email(author) if _email: - user = cls.get_by_email(_email, case_insensitive=True) + user = cls.get_by_email(_email) if user is not None: return user # Maybe we can match by username? @@ -634,7 +653,6 @@ class User(Base, BaseModel): def update_lastlogin(self): """Update user lastlogin""" self.last_login = datetime.datetime.now() - Session().add(self) log.debug('updated user %s lastlogin', self.username) @classmethod @@ -688,46 +706,40 @@ class User(Base, BaseModel): return data -class UserApiKeys(Base, BaseModel): +class UserApiKeys(Base, BaseDbModel): __tablename__ = 'user_api_keys' __table_args__ = ( Index('uak_api_key_idx', 'api_key'), Index('uak_api_key_expires_idx', 'api_key', 'expires'), - UniqueConstraint('api_key'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) __mapper_args__ = {} - user_api_key_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None) - api_key = Column(String(255, convert_unicode=False), nullable=False, unique=True) - description = Column(UnicodeText(1024)) + user_api_key_id = Column(Integer(), primary_key=True) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) + api_key = Column(String(255), nullable=False, unique=True) + description = Column(UnicodeText(), nullable=False) expires = Column(Float(53), nullable=False) created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) user = relationship('User') - @property - def expired(self): - if self.expires == -1: - return False - return time.time() > self.expires - - -class UserEmailMap(Base, BaseModel): + @hybrid_property + def is_expired(self): + return (self.expires != -1) & (time.time() > self.expires) + + +class UserEmailMap(Base, BaseDbModel): __tablename__ = 'user_email_map' __table_args__ = ( Index('uem_email_idx', 'email'), - UniqueConstraint('email'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) __mapper_args__ = {} - email_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None) - _email = Column("email", String(255, convert_unicode=False), nullable=True, unique=False, default=None) + email_id = Column(Integer(), primary_key=True) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) + _email = Column("email", String(255), nullable=False, unique=True) user = relationship('User') @validates('_email') @@ -747,19 +759,18 @@ class UserEmailMap(Base, BaseModel): self._email = val.lower() if val else None -class UserIpMap(Base, BaseModel): +class UserIpMap(Base, BaseDbModel): __tablename__ = 'user_ip_map' __table_args__ = ( UniqueConstraint('user_id', 'ip_addr'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) __mapper_args__ = {} - ip_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None) - ip_addr = Column(String(255, convert_unicode=False), nullable=True, unique=False, default=None) - active = Column(Boolean(), nullable=True, unique=None, default=True) + ip_id = Column(Integer(), primary_key=True) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) + ip_addr = Column(String(255), nullable=False) + active = Column(Boolean(), nullable=False, default=True) user = relationship('User') @classmethod @@ -778,20 +789,21 @@ class UserIpMap(Base, BaseModel): return u"<%s('user_id:%s=>%s')>" % (self.__class__.__name__, self.user_id, self.ip_addr) -class UserLog(Base, BaseModel): + +class UserLog(Base, BaseDbModel): __tablename__ = 'user_logs' __table_args__ = ( - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + _table_args_default_dict, ) - user_log_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None) - username = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) + + user_log_id = Column(Integer(), primary_key=True) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=True) + username = Column(String(255), nullable=False) repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=True) - repository_name = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - user_ip = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - action = Column(UnicodeText(1200000, convert_unicode=False), nullable=True, unique=None, default=None) - action_date = Column(DateTime(timezone=False), nullable=True, unique=None, default=None) + repository_name = Column(Unicode(255), nullable=False) + user_ip = Column(String(255), nullable=True) + action = Column(UnicodeText(), nullable=False) + action_date = Column(DateTime(timezone=False), nullable=False) def __unicode__(self): return u"<%s('id:%s:%s')>" % (self.__class__.__name__, @@ -806,21 +818,20 @@ class UserLog(Base, BaseModel): repository = relationship('Repository', cascade='') -class UserGroup(Base, BaseModel): +class UserGroup(Base, BaseDbModel): __tablename__ = 'users_groups' __table_args__ = ( - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + _table_args_default_dict, ) - users_group_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - users_group_name = Column(String(255, convert_unicode=False), nullable=False, unique=True, default=None) - user_group_description = Column(String(10000, convert_unicode=False), nullable=True, unique=None, default=None) - users_group_active = Column(Boolean(), nullable=True, unique=None, default=None) - inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None) + users_group_id = Column(Integer(), primary_key=True) + users_group_name = Column(Unicode(255), nullable=False, unique=True) + user_group_description = Column(Unicode(10000), nullable=True) # FIXME: not nullable? + users_group_active = Column(Boolean(), nullable=False) + inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, default=True) + owner_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False) created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) - _group_data = Column("group_data", LargeBinary(), nullable=True) # JSON data + _group_data = Column("group_data", LargeBinary(), nullable=True) # JSON data # FIXME: not nullable? members = relationship('UserGroupMember', cascade="all, delete-orphan") users_group_to_perm = relationship('UserGroupToPerm', cascade='all') @@ -829,7 +840,7 @@ class UserGroup(Base, BaseModel): user_user_group_to_perm = relationship('UserUserGroupToPerm ', cascade='all') user_group_user_group_to_perm = relationship('UserGroupUserGroupToPerm ', primaryjoin="UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id", cascade='all') - user = relationship('User') + owner = relationship('User') @hybrid_property def group_data(self): @@ -854,10 +865,14 @@ class UserGroup(Base, BaseModel): self.users_group_name) @classmethod + def guess_instance(cls, value): + return super(UserGroup, cls).guess_instance(value, UserGroup.get_by_group_name) + + @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): if case_insensitive: - q = cls.query().filter(cls.users_group_name.ilike(group_name)) + q = cls.query().filter(func.lower(cls.users_group_name) == func.lower(group_name)) else: q = cls.query().filter(cls.users_group_name == group_name) if cache: @@ -884,28 +899,26 @@ class UserGroup(Base, BaseModel): group_name=user_group.users_group_name, group_description=user_group.user_group_description, active=user_group.users_group_active, - owner=user_group.user.username, + owner=user_group.owner.username, ) if with_members: - members = [] - for user in user_group.members: - user = user.user - members.append(user.get_api_data()) - data['members'] = members + data['members'] = [ + ugm.user.get_api_data() + for ugm in user_group.members + ] return data -class UserGroupMember(Base, BaseModel): +class UserGroupMember(Base, BaseDbModel): __tablename__ = 'users_groups_members' __table_args__ = ( - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + _table_args_default_dict, ) - users_group_member_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - users_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) + users_group_member_id = Column(Integer(), primary_key=True) + users_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) user = relationship('User') users_group = relationship('UserGroup') @@ -915,22 +928,22 @@ class UserGroupMember(Base, BaseModel): self.user_id = u_id -class RepositoryField(Base, BaseModel): +class RepositoryField(Base, BaseDbModel): __tablename__ = 'repositories_fields' __table_args__ = ( UniqueConstraint('repository_id', 'field_key'), # no-multi field - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + _table_args_default_dict, ) + PREFIX = 'ex_' # prefix used in form to not conflict with already existing fields - repo_field_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None) - field_key = Column(String(250, convert_unicode=False)) - field_label = Column(String(1024, convert_unicode=False), nullable=False) - field_value = Column(String(10000, convert_unicode=False), nullable=False) - field_desc = Column(String(1024, convert_unicode=False), nullable=False) - field_type = Column(String(255), nullable=False, unique=None) + repo_field_id = Column(Integer(), primary_key=True) + repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False) + field_key = Column(String(250), nullable=False) + field_label = Column(String(1024), nullable=False) + field_value = Column(String(10000), nullable=False) + field_desc = Column(String(1024), nullable=False) + field_type = Column(String(255), nullable=False) created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) repository = relationship('Repository') @@ -947,49 +960,48 @@ class RepositoryField(Base, BaseModel): @classmethod def get_by_key_name(cls, key, repo): - row = cls.query()\ - .filter(cls.repository == repo)\ + row = cls.query() \ + .filter(cls.repository == repo) \ .filter(cls.field_key == key).scalar() return row -class Repository(Base, BaseModel): +class Repository(Base, BaseDbModel): __tablename__ = 'repositories' __table_args__ = ( - UniqueConstraint('repo_name'), Index('r_repo_name_idx', 'repo_name'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + _table_args_default_dict, ) + DEFAULT_CLONE_URI = '{scheme}://{user}@{netloc}/{repo}' DEFAULT_CLONE_URI_ID = '{scheme}://{user}@{netloc}/_{repoid}' - STATE_CREATED = 'repo_state_created' - STATE_PENDING = 'repo_state_pending' - STATE_ERROR = 'repo_state_error' - - repo_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - repo_name = Column(String(255, convert_unicode=False), nullable=False, unique=True, default=None) - repo_state = Column(String(255), nullable=True) - - clone_uri = Column(String(255, convert_unicode=False), nullable=True, unique=False, default=None) - repo_type = Column(String(255, convert_unicode=False), nullable=False, unique=False, default=None) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None) - private = Column(Boolean(), nullable=True, unique=None, default=None) - enable_statistics = Column("statistics", Boolean(), nullable=True, unique=None, default=True) - enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True) - description = Column(String(10000, convert_unicode=False), nullable=True, unique=None, default=None) - created_on = Column(DateTime(timezone=False), nullable=False, unique=None, default=datetime.datetime.now) - updated_on = Column(DateTime(timezone=False), nullable=False, unique=None, default=datetime.datetime.now) - _landing_revision = Column("landing_revision", String(255, convert_unicode=False), nullable=False, unique=False, default=None) - enable_locking = Column(Boolean(), nullable=False, unique=None, default=False) - _locked = Column("locked", String(255, convert_unicode=False), nullable=True, unique=False, default=None) - _changeset_cache = Column("changeset_cache", LargeBinary(), nullable=True) #JSON data - - fork_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=False, default=None) - group_id = Column(Integer(), ForeignKey('groups.group_id'), nullable=True, unique=False, default=None) - - user = relationship('User') + STATE_CREATED = u'repo_state_created' + STATE_PENDING = u'repo_state_pending' + STATE_ERROR = u'repo_state_error' + + repo_id = Column(Integer(), primary_key=True) + repo_name = Column(Unicode(255), nullable=False, unique=True) + repo_state = Column(String(255), nullable=False) + + clone_uri = Column(String(255), nullable=True) # FIXME: not nullable? + repo_type = Column(String(255), nullable=False) + owner_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False) + private = Column(Boolean(), nullable=False) + enable_statistics = Column("statistics", Boolean(), nullable=False, default=True) + enable_downloads = Column("downloads", Boolean(), nullable=False, default=True) + description = Column(Unicode(10000), nullable=False) + created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) + updated_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) + _landing_revision = Column("landing_revision", String(255), nullable=False) + enable_locking = Column(Boolean(), nullable=False, default=False) + _locked = Column("locked", String(255), nullable=True) # FIXME: not nullable? + _changeset_cache = Column("changeset_cache", LargeBinary(), nullable=True) # JSON data # FIXME: not nullable? + + fork_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=True) + group_id = Column(Integer(), ForeignKey('groups.group_id'), nullable=True) + + owner = relationship('User') fork = relationship('Repository', remote_side=repo_id) group = relationship('RepoGroup') repo_to_perm = relationship('UserRepoToPerm', cascade='all', order_by='UserRepoToPerm.repo_to_perm_id') @@ -997,7 +1009,7 @@ class Repository(Base, BaseModel): stats = relationship('Statistics', cascade='all', uselist=False) followers = relationship('UserFollowing', - primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', + primaryjoin='UserFollowing.follows_repository_id==Repository.repo_id', cascade='all') extra_fields = relationship('RepositoryField', cascade="all, delete-orphan") @@ -1066,6 +1078,19 @@ class Repository(Base, BaseModel): log.error(traceback.format_exc()) @classmethod + def query(cls, sorted=False): + """Add Repository-specific helpers for common query constructs. + + sorted: if True, apply the default ordering (name, case insensitive). + """ + q = super(Repository, cls).query() + + if sorted: + q = q.order_by(func.lower(Repository.repo_name)) + + return q + + @classmethod def url_sep(cls): return URL_SEP @@ -1081,16 +1106,28 @@ class Repository(Base, BaseModel): return cls.url_sep().join(repo_name.split(os.sep)) @classmethod - def get_by_repo_name(cls, repo_name): - q = Session().query(cls).filter(cls.repo_name == repo_name) - q = q.options(joinedload(Repository.fork))\ - .options(joinedload(Repository.user))\ + def guess_instance(cls, value): + return super(Repository, cls).guess_instance(value, Repository.get_by_repo_name) + + @classmethod + def get_by_repo_name(cls, repo_name, case_insensitive=False): + """Get the repo, defaulting to database case sensitivity. + case_insensitive will be slower and should only be specified if necessary.""" + if case_insensitive: + q = Session().query(cls).filter(func.lower(cls.repo_name) == func.lower(repo_name)) + else: + q = Session().query(cls).filter(cls.repo_name == repo_name) + q = q.options(joinedload(Repository.fork)) \ + .options(joinedload(Repository.owner)) \ .options(joinedload(Repository.group)) return q.scalar() @classmethod def get_by_full_path(cls, repo_full_path): - repo_name = repo_full_path.split(cls.base_path(), 1)[-1] + base_full_path = os.path.realpath(cls.base_path()) + repo_full_path = os.path.realpath(repo_full_path) + assert repo_full_path.startswith(base_full_path + os.path.sep) + repo_name = repo_full_path[len(base_full_path) + 1:] repo_name = cls.normalize_repo_name(repo_name) return cls.get_by_repo_name(repo_name.strip(URL_SEP)) @@ -1105,7 +1142,7 @@ class Repository(Base, BaseModel): :param cls: """ - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == cls.url_sep()) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return q.one().ui_value @@ -1131,24 +1168,14 @@ class Repository(Base, BaseModel): @property def groups_with_parents(self): groups = [] - if self.group is None: - return groups - - cur_gr = self.group - groups.insert(0, cur_gr) - while 1: - gr = getattr(cur_gr, 'parent_group', None) - cur_gr = cur_gr.parent_group - if gr is None: - break - groups.insert(0, gr) - + group = self.group + while group is not None: + groups.append(group) + group = group.parent_group + assert group not in groups, group # avoid recursion on bad db content + groups.reverse() return groups - @property - def groups_and_repo(self): - return self.groups_with_parents, self.just_name, self.repo_name - @LazyProperty def repo_path(self): """ @@ -1174,9 +1201,9 @@ class Repository(Base, BaseModel): """ Returns associated cache keys for that repo """ - return CacheInvalidation.query()\ - .filter(CacheInvalidation.cache_args == self.repo_name)\ - .order_by(CacheInvalidation.cache_key)\ + return CacheInvalidation.query() \ + .filter(CacheInvalidation.cache_args == self.repo_name) \ + .order_by(CacheInvalidation.cache_key) \ .all() def get_new_name(self, repo_name): @@ -1208,10 +1235,11 @@ class Repository(Base, BaseModel): return is_valid_repo(repo_name, cls.base_path()) - def get_api_data(self): + def get_api_data(self, with_revision_names=False, + with_pullrequests=False): """ - Common function for generating repo api data - + Common function for generating repo api data. + Optionally, also return tags, branches, bookmarks and PRs. """ repo = self data = dict( @@ -1223,7 +1251,7 @@ class Repository(Base, BaseModel): created_on=repo.created_on, description=repo.description, landing_rev=repo.landing_rev, - owner=repo.user.username, + owner=repo.owner.username, fork_of=repo.fork.repo_name if repo.fork else None, enable_statistics=repo.enable_statistics, enable_locking=repo.enable_locking, @@ -1234,6 +1262,15 @@ class Repository(Base, BaseModel): locked_date=time_to_datetime(self.locked[1]) \ if self.locked[1] else None ) + if with_revision_names: + scm_repo = repo.scm_instance_no_cache() + data.update(dict( + tags=scm_repo.tags, + branches=scm_repo.branches, + bookmarks=scm_repo.bookmarks, + )) + if with_pullrequests: + data['pull_requests'] = repo.pull_requests_other rc_config = Setting.get_app_settings() repository_fields = str2bool(rc_config.get('repository_fields')) if repository_fields: @@ -1247,13 +1284,11 @@ class Repository(Base, BaseModel): if lock_time is not None: lock_time = time.time() repo.locked = [user_id, lock_time] - Session().add(repo) Session().commit() @classmethod def unlock(cls, repo): repo.locked = None - Session().add(repo) Session().commit() @classmethod @@ -1291,7 +1326,7 @@ class Repository(Base, BaseModel): if not uri_tmpl: uri_tmpl = self.DEFAULT_CLONE_URI try: - from pylons import tmpl_context as c + from tg import tmpl_context as c uri_tmpl = c.clone_uri_tmpl except AttributeError: # in any case if we call this outside of request context, @@ -1305,7 +1340,7 @@ class Repository(Base, BaseModel): def set_state(self, state): self.repo_state = state - Session().add(self) + #========================================================================== # SCM PROPERTIES #========================================================================== @@ -1354,7 +1389,6 @@ class Repository(Base, BaseModel): self.repo_name, cs_cache) self.updated_on = last_change self.changeset_cache = cs_cache - Session().add(self) Session().commit() else: log.debug('changeset_cache for %s already up to date with %s', @@ -1378,11 +1412,11 @@ class Repository(Base, BaseModel): :param revisions: filter query by revisions only """ - cmts = ChangesetComment.query()\ + cmts = ChangesetComment.query() \ .filter(ChangesetComment.repo == self) if revisions is not None: if not revisions: - return [] # don't use sql 'in' on empty set + return {} # don't use sql 'in' on empty set cmts = cmts.filter(ChangesetComment.revision.in_(revisions)) grouped = collections.defaultdict(list) for cmt in cmts.all(): @@ -1399,9 +1433,9 @@ class Repository(Base, BaseModel): if not revisions: return {} - statuses = ChangesetStatus.query()\ - .filter(ChangesetStatus.repo == self)\ - .filter(ChangesetStatus.version == 0)\ + statuses = ChangesetStatus.query() \ + .filter(ChangesetStatus.repo == self) \ + .filter(ChangesetStatus.version == 0) \ .filter(ChangesetStatus.revision.in_(revisions)) grouped = {} @@ -1412,7 +1446,8 @@ class Repository(Base, BaseModel): pr_nice_id = PullRequest.make_nice_id(pr_id) pr_repo = stat.pull_request.other_repo.repo_name grouped[stat.revision] = [str(stat.status), stat.status_lbl, - pr_id, pr_repo, pr_nice_id] + pr_id, pr_repo, pr_nice_id, + stat.author] return grouped def _repo_size(self): @@ -1430,41 +1465,38 @@ class Repository(Base, BaseModel): """ CacheInvalidation.set_invalidate(self.repo_name) - def scm_instance_no_cache(self): - return self.__get_instance() + _scm_instance = None @property def scm_instance(self): - import kallithea - full_cache = str2bool(kallithea.CONFIG.get('vcs_full_cache')) - if full_cache: - return self.scm_instance_cached() - return self.__get_instance() + if self._scm_instance is None: + self._scm_instance = self.scm_instance_cached() + return self._scm_instance def scm_instance_cached(self, valid_cache_keys=None): - @cache_region('long_term') - def _c(repo_name): - return self.__get_instance() + @cache_region('long_term', 'scm_instance_cached') + def _c(repo_name): # repo_name is just for the cache key + log.debug('Creating new %s scm_instance and populating cache', repo_name) + return self.scm_instance_no_cache() rn = self.repo_name valid = CacheInvalidation.test_and_set_valid(rn, None, valid_cache_keys=valid_cache_keys) if not valid: log.debug('Cache for %s invalidated, getting new object', rn) - region_invalidate(_c, None, rn) + region_invalidate(_c, None, 'scm_instance_cached', rn) else: - log.debug('Getting scm_instance of %s from cache', rn) + log.debug('Trying to get scm_instance of %s from cache', rn) return _c(rn) - def __get_instance(self): - repo_full_path = self.repo_full_path - - alias = get_scm(safe_str(repo_full_path))[0] + def scm_instance_no_cache(self): + repo_full_path = safe_str(self.repo_full_path) + alias = get_scm(repo_full_path)[0] log.debug('Creating instance of %s repository from %s', - alias, repo_full_path) + alias, self.repo_full_path) backend = get_backend(alias) if alias == 'hg': - repo = backend(safe_str(repo_full_path), create=False, + repo = backend(repo_full_path, create=False, baseui=self._ui) else: repo = backend(repo_full_path, create=False) @@ -1472,31 +1504,47 @@ class Repository(Base, BaseModel): return repo def __json__(self): - return dict(landing_rev = self.landing_rev) - -class RepoGroup(Base, BaseModel): + return dict( + repo_id=self.repo_id, + repo_name=self.repo_name, + landing_rev=self.landing_rev, + ) + + +class RepoGroup(Base, BaseDbModel): __tablename__ = 'groups' __table_args__ = ( - UniqueConstraint('group_name', 'group_parent_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + _table_args_default_dict, ) - __mapper_args__ = {'order_by': 'group_name'} + __mapper_args__ = {'order_by': 'group_name'} # TODO: Deprecated as of SQLAlchemy 1.1. SEP = ' » ' - group_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - group_name = Column(String(255, convert_unicode=False), nullable=False, unique=True, default=None) - group_parent_id = Column(Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None) - group_description = Column(String(10000, convert_unicode=False), nullable=True, unique=None, default=None) - enable_locking = Column(Boolean(), nullable=False, unique=None, default=False) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None) + group_id = Column(Integer(), primary_key=True) + group_name = Column(Unicode(255), nullable=False, unique=True) # full path + parent_group_id = Column('group_parent_id', Integer(), ForeignKey('groups.group_id'), nullable=True) + group_description = Column(Unicode(10000), nullable=False) + enable_locking = Column(Boolean(), nullable=False, default=False) + owner_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False) created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id') users_group_to_perm = relationship('UserGroupRepoGroupToPerm', cascade='all') parent_group = relationship('RepoGroup', remote_side=group_id) - user = relationship('User') + owner = relationship('User') + + @classmethod + def query(cls, sorted=False): + """Add RepoGroup-specific helpers for common query constructs. + + sorted: if True, apply the default ordering (name, case insensitive). + """ + q = super(RepoGroup, cls).query() + + if sorted: + q = q.order_by(func.lower(RepoGroup.group_name)) + + return q def __init__(self, group_name='', parent_group=None): self.group_name = group_name @@ -1525,12 +1573,17 @@ class RepoGroup(Base, BaseModel): return URL_SEP @classmethod + def guess_instance(cls, value): + return super(RepoGroup, cls).guess_instance(value, RepoGroup.get_by_group_name) + + @classmethod def get_by_group_name(cls, group_name, cache=False, case_insensitive=False): + group_name = group_name.rstrip('/') if case_insensitive: - gr = cls.query()\ - .filter(cls.group_name.ilike(group_name)) + gr = cls.query() \ + .filter(func.lower(cls.group_name) == func.lower(group_name)) else: - gr = cls.query()\ + gr = cls.query() \ .filter(cls.group_name == group_name) if cache: gr = gr.options(FromCache( @@ -1542,26 +1595,13 @@ class RepoGroup(Base, BaseModel): @property def parents(self): - parents_recursion_limit = 10 groups = [] - if self.parent_group is None: - return groups - cur_gr = self.parent_group - groups.insert(0, cur_gr) - cnt = 0 - while 1: - cnt += 1 - gr = getattr(cur_gr, 'parent_group', None) - cur_gr = cur_gr.parent_group - if gr is None: - break - if cnt == parents_recursion_limit: - # this will prevent accidental infinite loops - log.error(('more than %s parents found for group %s, stopping ' - 'recursive parent fetching' % (parents_recursion_limit, self))) - break - - groups.insert(0, gr) + group = self.parent_group + while group is not None: + groups.append(group) + group = group.parent_group + assert group not in groups, group # avoid recursion on bad db content + groups.reverse() return groups @property @@ -1582,9 +1622,7 @@ class RepoGroup(Base, BaseModel): @property def repositories(self): - return Repository.query()\ - .filter(Repository.group == self)\ - .order_by(Repository.repo_name) + return Repository.query(sorted=True).filter_by(group=self) @property def repositories_recursive_count(self): @@ -1649,18 +1687,18 @@ class RepoGroup(Base, BaseModel): group_description=group.group_description, parent_group=group.parent_group.group_name if group.parent_group else None, repositories=[x.repo_name for x in group.repositories], - owner=group.user.username + owner=group.owner.username ) return data -class Permission(Base, BaseModel): +class Permission(Base, BaseDbModel): __tablename__ = 'permissions' __table_args__ = ( Index('p_perm_name_idx', 'permission_name'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + _table_args_default_dict, ) + PERMS = [ ('hg.admin', _('Kallithea Administrator')), @@ -1702,7 +1740,7 @@ class Permission(Base, BaseModel): ('hg.extern_activate.auto', _('Automatic activation of external account')), ] - #definition of system default permissions for DEFAULT user + # definition of system default permissions for DEFAULT user DEFAULT_USER_PERMISSIONS = [ 'repository.read', 'group.read', @@ -1746,9 +1784,8 @@ class Permission(Base, BaseModel): 'hg.create.repository': 1 } - permission_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - permission_name = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) - permission_longname = Column(String(255, convert_unicode=False), nullable=True, unique=None, default=None) + permission_id = Column(Integer(), primary_key=True) + permission_name = Column(String(255), nullable=False) def __unicode__(self): return u"<%s('%s:%s')>" % ( @@ -1756,48 +1793,52 @@ class Permission(Base, BaseModel): ) @classmethod + def guess_instance(cls, value): + return super(Permission, cls).guess_instance(value, Permission.get_by_key) + + @classmethod def get_by_key(cls, key): return cls.query().filter(cls.permission_name == key).scalar() @classmethod def get_default_perms(cls, default_user_id): - q = Session().query(UserRepoToPerm, Repository, cls)\ - .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\ - .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoToPerm, Repository, cls) \ + .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id)) \ + .join((cls, UserRepoToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_group_perms(cls, default_user_id): - q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\ - .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\ - .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserRepoGroupToPerm, RepoGroup, cls) \ + .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id)) \ + .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserRepoGroupToPerm.user_id == default_user_id) return q.all() @classmethod def get_default_user_group_perms(cls, default_user_id): - q = Session().query(UserUserGroupToPerm, UserGroup, cls)\ - .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id))\ - .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id))\ + q = Session().query(UserUserGroupToPerm, UserGroup, cls) \ + .join((UserGroup, UserUserGroupToPerm.user_group_id == UserGroup.users_group_id)) \ + .join((cls, UserUserGroupToPerm.permission_id == cls.permission_id)) \ .filter(UserUserGroupToPerm.user_id == default_user_id) return q.all() -class UserRepoToPerm(Base, BaseModel): +class UserRepoToPerm(Base, BaseDbModel): __tablename__ = 'repo_to_perm' __table_args__ = ( UniqueConstraint('user_id', 'repository_id', 'permission_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) - repo_to_perm_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) - permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) - repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None) + + repo_to_perm_id = Column(Integer(), primary_key=True) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) + permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False) + repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False) user = relationship('User') repository = relationship('Repository') @@ -1816,17 +1857,17 @@ class UserRepoToPerm(Base, BaseModel): return u'<%s => %s >' % (self.user, self.repository) -class UserUserGroupToPerm(Base, BaseModel): +class UserUserGroupToPerm(Base, BaseDbModel): __tablename__ = 'user_user_group_to_perm' __table_args__ = ( UniqueConstraint('user_id', 'user_group_id', 'permission_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) - user_user_group_to_perm_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) - permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) - user_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) + + user_user_group_to_perm_id = Column(Integer(), primary_key=True) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) + permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False) + user_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False) user = relationship('User') user_group = relationship('UserGroup') @@ -1845,16 +1886,16 @@ class UserUserGroupToPerm(Base, BaseMode return u'<%s => %s >' % (self.user, self.user_group) -class UserToPerm(Base, BaseModel): +class UserToPerm(Base, BaseDbModel): __tablename__ = 'user_to_perm' __table_args__ = ( UniqueConstraint('user_id', 'permission_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) - user_to_perm_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) - permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) + + user_to_perm_id = Column(Integer(), primary_key=True) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) + permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False) user = relationship('User') permission = relationship('Permission') @@ -1863,17 +1904,17 @@ class UserToPerm(Base, BaseModel): return u'<%s => %s >' % (self.user, self.permission) -class UserGroupRepoToPerm(Base, BaseModel): +class UserGroupRepoToPerm(Base, BaseDbModel): __tablename__ = 'users_group_repo_to_perm' __table_args__ = ( UniqueConstraint('repository_id', 'users_group_id', 'permission_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) - users_group_to_perm_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - users_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) - permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) - repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None) + + users_group_to_perm_id = Column(Integer(), primary_key=True) + users_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False) + permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False) + repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False) users_group = relationship('UserGroup') permission = relationship('Permission') @@ -1892,17 +1933,17 @@ class UserGroupRepoToPerm(Base, BaseMode return u' %s >' % (self.users_group, self.repository) -class UserGroupUserGroupToPerm(Base, BaseModel): +class UserGroupUserGroupToPerm(Base, BaseDbModel): __tablename__ = 'user_group_user_group_to_perm' __table_args__ = ( UniqueConstraint('target_user_group_id', 'user_group_id', 'permission_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) - user_group_user_group_to_perm_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - target_user_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) - permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) - user_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) + + user_group_user_group_to_perm_id = Column(Integer(), primary_key=True) + target_user_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False) + permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False) + user_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False) target_user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.target_user_group_id==UserGroup.users_group_id') user_group = relationship('UserGroup', primaryjoin='UserGroupUserGroupToPerm.user_group_id==UserGroup.users_group_id') @@ -1921,33 +1962,32 @@ class UserGroupUserGroupToPerm(Base, Bas return u' %s >' % (self.target_user_group, self.user_group) -class UserGroupToPerm(Base, BaseModel): +class UserGroupToPerm(Base, BaseDbModel): __tablename__ = 'users_group_to_perm' __table_args__ = ( UniqueConstraint('users_group_id', 'permission_id',), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) - users_group_to_perm_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - users_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) - permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) + + users_group_to_perm_id = Column(Integer(), primary_key=True) + users_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False) + permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False) users_group = relationship('UserGroup') permission = relationship('Permission') -class UserRepoGroupToPerm(Base, BaseModel): +class UserRepoGroupToPerm(Base, BaseDbModel): __tablename__ = 'user_repo_group_to_perm' __table_args__ = ( UniqueConstraint('user_id', 'group_id', 'permission_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) - group_to_perm_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) - group_id = Column(Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None) - permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) + group_to_perm_id = Column(Integer(), primary_key=True) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) + group_id = Column(Integer(), ForeignKey('groups.group_id'), nullable=False) + permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False) user = relationship('User') group = relationship('RepoGroup') @@ -1963,18 +2003,17 @@ class UserRepoGroupToPerm(Base, BaseMode return n -class UserGroupRepoGroupToPerm(Base, BaseModel): +class UserGroupRepoGroupToPerm(Base, BaseDbModel): __tablename__ = 'users_group_repo_group_to_perm' __table_args__ = ( UniqueConstraint('users_group_id', 'group_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) - users_group_repo_group_to_perm_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - users_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None) - group_id = Column(Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None) - permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None) + users_group_repo_group_to_perm_id = Column(Integer(), primary_key=True) + users_group_id = Column(Integer(), ForeignKey('users_groups.users_group_id'), nullable=False) + group_id = Column(Integer(), ForeignKey('groups.group_id'), nullable=False) + permission_id = Column(Integer(), ForeignKey('permissions.permission_id'), nullable=False) users_group = relationship('UserGroup') permission = relationship('Permission') @@ -1990,65 +2029,62 @@ class UserGroupRepoGroupToPerm(Base, Bas return n -class Statistics(Base, BaseModel): +class Statistics(Base, BaseDbModel): __tablename__ = 'statistics' __table_args__ = ( - UniqueConstraint('repository_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) - stat_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None) + + stat_id = Column(Integer(), primary_key=True) + repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True) stat_on_revision = Column(Integer(), nullable=False) - commit_activity = Column(LargeBinary(1000000), nullable=False)#JSON data - commit_activity_combined = Column(LargeBinary(), nullable=False)#JSON data - languages = Column(LargeBinary(1000000), nullable=False)#JSON data + commit_activity = Column(LargeBinary(1000000), nullable=False) # JSON data + commit_activity_combined = Column(LargeBinary(), nullable=False) # JSON data + languages = Column(LargeBinary(1000000), nullable=False) # JSON data repository = relationship('Repository', single_parent=True) -class UserFollowing(Base, BaseModel): +class UserFollowing(Base, BaseDbModel): __tablename__ = 'user_followings' __table_args__ = ( - UniqueConstraint('user_id', 'follows_repository_id'), - UniqueConstraint('user_id', 'follows_user_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + UniqueConstraint('user_id', 'follows_repository_id', name='uq_user_followings_user_repo'), + UniqueConstraint('user_id', 'follows_user_id', name='uq_user_followings_user_user'), + _table_args_default_dict, ) - user_following_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None) - follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None) - follows_user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None) - follows_from = Column(DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now) + user_following_id = Column(Integer(), primary_key=True) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) + follows_repository_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=True) + follows_user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=True) + follows_from = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id') follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id') - follows_repository = relationship('Repository', order_by='Repository.repo_name') + follows_repository = relationship('Repository', order_by=lambda: func.lower(Repository.repo_name)) @classmethod def get_repo_followers(cls, repo_id): - return cls.query().filter(cls.follows_repo_id == repo_id) - - -class CacheInvalidation(Base, BaseModel): + return cls.query().filter(cls.follows_repository_id == repo_id) + + +class CacheInvalidation(Base, BaseDbModel): __tablename__ = 'cache_invalidation' __table_args__ = ( - UniqueConstraint('cache_key'), Index('key_idx', 'cache_key'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + _table_args_default_dict, ) + # cache_id, not used - cache_id = Column(Integer(), nullable=False, unique=True, primary_key=True) + cache_id = Column(Integer(), primary_key=True) # cache_key as created by _get_cache_key - cache_key = Column(String(255, convert_unicode=False)) + cache_key = Column(Unicode(255), nullable=False, unique=True) # cache_args is a repo_name - cache_args = Column(String(255, convert_unicode=False)) + cache_args = Column(Unicode(255), nullable=False) # instance sets cache_active True when it is caching, other instances set # cache_active to False to indicate that this cache is invalid - cache_active = Column(Boolean(), nullable=True, unique=None, default=False) + cache_active = Column(Boolean(), nullable=False, default=False) def __init__(self, cache_key, repo_name=''): self.cache_key = cache_key @@ -2102,7 +2138,7 @@ class CacheInvalidation(Base, BaseModel) return "%s%s" % (prefix, key) @classmethod - def set_invalidate(cls, repo_name, delete=False): + def set_invalidate(cls, repo_name): """ Mark all caches of a repo as invalid in the database. """ @@ -2113,11 +2149,7 @@ class CacheInvalidation(Base, BaseModel) for inv_obj in inv_objs: log.debug('marking %s key for invalidation based on repo_name=%s', inv_obj, safe_str(repo_name)) - if delete: - Session().delete(inv_obj) - else: - inv_obj.cache_active = False - Session().add(inv_obj) + Session().delete(inv_obj) Session().commit() @classmethod @@ -2136,11 +2168,11 @@ class CacheInvalidation(Base, BaseModel) inv_obj = cls.query().filter(cls.cache_key == cache_key).scalar() if inv_obj is None: - inv_obj = CacheInvalidation(cache_key, repo_name) + inv_obj = cls(cache_key, repo_name) + Session().add(inv_obj) elif inv_obj.cache_active: return True inv_obj.cache_active = True - Session().add(inv_obj) try: Session().commit() except sqlalchemy.exc.IntegrityError: @@ -2162,22 +2194,22 @@ class CacheInvalidation(Base, BaseModel) return set(inv_obj.cache_key for inv_obj in cls.query().filter(cls.cache_active).all()) -class ChangesetComment(Base, BaseModel): +class ChangesetComment(Base, BaseDbModel): __tablename__ = 'changeset_comments' __table_args__ = ( Index('cc_revision_idx', 'revision'), Index('cc_pull_request_id_idx', 'pull_request_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + _table_args_default_dict, ) - comment_id = Column(Integer(), nullable=False, unique=True, primary_key=True) + + comment_id = Column(Integer(), primary_key=True) repo_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False) - revision = Column(String(40)) - pull_request_id = Column(Integer(), ForeignKey('pull_requests.pull_request_id')) - line_no = Column(Unicode(10)) - f_path = Column(Unicode(1000)) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) - text = Column(UnicodeText(25000), nullable=False) + revision = Column(String(40), nullable=True) + pull_request_id = Column(Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True) + line_no = Column(Unicode(10), nullable=True) + f_path = Column(Unicode(1000), nullable=True) + author_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False) + text = Column(UnicodeText(), nullable=False) created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) modified_at = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) @@ -2190,23 +2222,6 @@ class ChangesetComment(Base, BaseModel): cascade="all, delete-orphan", lazy='joined') pull_request = relationship('PullRequest') - @classmethod - def get_users(cls, revision=None, pull_request_id=None): - """ - Returns user associated with this ChangesetComment. ie those - who actually commented - - :param cls: - :param revision: - """ - q = Session().query(User)\ - .join(ChangesetComment.author) - if revision is not None: - q = q.filter(cls.revision == revision) - elif pull_request_id is not None: - q = q.filter(cls.pull_request_id == pull_request_id) - return q.all() - def url(self): anchor = "comment-%s" % self.comment_id import kallithea.lib.helpers as h @@ -2215,7 +2230,18 @@ class ChangesetComment(Base, BaseModel): elif self.pull_request_id is not None: return self.pull_request.url(anchor=anchor) -class ChangesetStatus(Base, BaseModel): + def __json__(self): + return dict( + comment_id=self.comment_id, + username=self.author.username, + text=self.text, + ) + + def deletable(self): + return self.created_on > datetime.datetime.now() - datetime.timedelta(minutes=5) + + +class ChangesetStatus(Base, BaseDbModel): __tablename__ = 'changeset_statuses' __table_args__ = ( Index('cs_revision_idx', 'revision'), @@ -2223,28 +2249,30 @@ class ChangesetStatus(Base, BaseModel): Index('cs_pull_request_id_idx', 'pull_request_id'), Index('cs_changeset_comment_id_idx', 'changeset_comment_id'), Index('cs_pull_request_id_user_id_version_idx', 'pull_request_id', 'user_id', 'version'), + Index('cs_repo_id_pull_request_id_idx', 'repo_id', 'pull_request_id'), UniqueConstraint('repo_id', 'revision', 'version'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) + STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed' STATUS_APPROVED = 'approved' - STATUS_REJECTED = 'rejected' + STATUS_REJECTED = 'rejected' # is shown as "Not approved" - TODO: change database content / scheme STATUS_UNDER_REVIEW = 'under_review' STATUSES = [ (STATUS_NOT_REVIEWED, _("Not reviewed")), # (no icon) and default + (STATUS_UNDER_REVIEW, _("Under review")), + (STATUS_REJECTED, _("Not approved")), (STATUS_APPROVED, _("Approved")), - (STATUS_REJECTED, _("Rejected")), - (STATUS_UNDER_REVIEW, _("Under review")), ] - - changeset_status_id = Column(Integer(), nullable=False, unique=True, primary_key=True) + STATUSES_DICT = dict(STATUSES) + + changeset_status_id = Column(Integer(), primary_key=True) repo_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=None) - revision = Column(String(40), nullable=False) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) + revision = Column(String(40), nullable=True) status = Column(String(128), nullable=False, default=DEFAULT) - changeset_comment_id = Column(Integer(), ForeignKey('changeset_comments.comment_id'), nullable=False) + comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'), nullable=False) modified_at = Column(DateTime(), nullable=False, default=datetime.datetime.now) version = Column(Integer(), nullable=False, default=0) pull_request_id = Column(Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True) @@ -2262,34 +2290,40 @@ class ChangesetStatus(Base, BaseModel): @classmethod def get_status_lbl(cls, value): - return dict(cls.STATUSES).get(value) + return cls.STATUSES_DICT.get(value) @property def status_lbl(self): return ChangesetStatus.get_status_lbl(self.status) - -class PullRequest(Base, BaseModel): + def __json__(self): + return dict( + status=self.status, + modified_at=self.modified_at.replace(microsecond=0), + reviewer=self.author.username, + ) + + +class PullRequest(Base, BaseDbModel): __tablename__ = 'pull_requests' __table_args__ = ( Index('pr_org_repo_id_idx', 'org_repo_id'), Index('pr_other_repo_id_idx', 'other_repo_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + _table_args_default_dict, ) # values for .status STATUS_NEW = u'new' STATUS_CLOSED = u'closed' - pull_request_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - title = Column(Unicode(255), nullable=True) - description = Column(UnicodeText(10240)) + pull_request_id = Column(Integer(), primary_key=True) + title = Column(Unicode(255), nullable=False) + description = Column(UnicodeText(), nullable=False) status = Column(Unicode(255), nullable=False, default=STATUS_NEW) # only for closedness, not approve/reject/etc created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) updated_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False, unique=None) - _revisions = Column('revisions', UnicodeText(20500)) # 500 revisions max + owner_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False) + _revisions = Column('revisions', UnicodeText(), nullable=False) org_repo_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False) org_ref = Column(Unicode(255), nullable=False) other_repo_id = Column(Integer(), ForeignKey('repositories.repo_id'), nullable=False) @@ -2312,24 +2346,55 @@ class PullRequest(Base, BaseModel): return self.other_ref.split(':') owner = relationship('User') - reviewers = relationship('PullRequestReviewers', + reviewers = relationship('PullRequestReviewer', cascade="all, delete-orphan") org_repo = relationship('Repository', primaryjoin='PullRequest.org_repo_id==Repository.repo_id') other_repo = relationship('Repository', primaryjoin='PullRequest.other_repo_id==Repository.repo_id') - statuses = relationship('ChangesetStatus') - comments = relationship('ChangesetComment', + statuses = relationship('ChangesetStatus', order_by='ChangesetStatus.changeset_status_id') + comments = relationship('ChangesetComment', order_by='ChangesetComment.comment_id', cascade="all, delete-orphan") + @classmethod + def query(cls, reviewer_id=None, include_closed=True, sorted=False): + """Add PullRequest-specific helpers for common query constructs. + + reviewer_id: only PRs with the specified user added as reviewer. + + include_closed: if False, do not include closed PRs. + + sorted: if True, apply the default ordering (newest first). + """ + q = super(PullRequest, cls).query() + + if reviewer_id is not None: + q = q.join(PullRequestReviewer).filter(PullRequestReviewer.user_id == reviewer_id) + + if not include_closed: + q = q.filter(PullRequest.status != PullRequest.STATUS_CLOSED) + + if sorted: + q = q.order_by(PullRequest.created_on.desc()) + + return q + + def get_reviewer_users(self): + """Like .reviewers, but actually returning the users""" + return User.query() \ + .join(PullRequestReviewer) \ + .filter(PullRequestReviewer.pull_request == self) \ + .order_by(PullRequestReviewer.pull_request_reviewers_id) \ + .all() + def is_closed(self): return self.status == self.STATUS_CLOSED def user_review_status(self, user_id): """Return the user's latest status votes on PR""" # note: no filtering on repo - that would be redundant - status = ChangesetStatus.query()\ - .filter(ChangesetStatus.pull_request == self)\ - .filter(ChangesetStatus.user_id == user_id)\ - .order_by(ChangesetStatus.version)\ + status = ChangesetStatus.query() \ + .filter(ChangesetStatus.pull_request == self) \ + .filter(ChangesetStatus.user_id == user_id) \ + .order_by(ChangesetStatus.version) \ .first() return str(status.status) if status else '' @@ -2342,9 +2407,24 @@ class PullRequest(Base, BaseModel): '''Return the id of this pull request, nicely formatted for displaying''' return self.make_nice_id(self.pull_request_id) + def get_api_data(self): + return self.__json__() + def __json__(self): return dict( - revisions=self.revisions + pull_request_id=self.pull_request_id, + url=self.url(), + reviewers=self.reviewers, + revisions=self.revisions, + owner=self.owner.username, + title=self.title, + description=self.description, + org_repo_url=self.org_repo.clone_url(), + org_ref_parts=self.org_ref_parts, + other_ref_parts=self.other_ref_parts, + status=self.status, + comments=self.comments, + statuses=self.statuses, ) def url(self, **kwargs): @@ -2362,119 +2442,54 @@ class PullRequest(Base, BaseModel): return h.url('pullrequest_show', repo_name=self.other_repo.repo_name, pull_request_id=self.pull_request_id, **kwargs) -class PullRequestReviewers(Base, BaseModel): + +class PullRequestReviewer(Base, BaseDbModel): __tablename__ = 'pull_request_reviewers' __table_args__ = ( - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, + Index('pull_request_reviewers_user_id_idx', 'user_id'), + _table_args_default_dict, ) def __init__(self, user=None, pull_request=None): self.user = user self.pull_request = pull_request - pull_requests_reviewers_id = Column(Integer(), nullable=False, unique=True, primary_key=True) + pull_request_reviewers_id = Column('pull_requests_reviewers_id', Integer(), primary_key=True) pull_request_id = Column(Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=False) - user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=True) + user_id = Column(Integer(), ForeignKey('users.user_id'), nullable=False) user = relationship('User') pull_request = relationship('PullRequest') - -class Notification(Base, BaseModel): + def __json__(self): + return dict( + username=self.user.username if self.user else None, + ) + + +class Notification(object): __tablename__ = 'notifications' - __table_args__ = ( - Index('notification_type_idx', 'type'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, - ) - - TYPE_CHANGESET_COMMENT = u'cs_comment' - TYPE_MESSAGE = u'message' - TYPE_MENTION = u'mention' - TYPE_REGISTRATION = u'registration' - TYPE_PULL_REQUEST = u'pull_request' - TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment' - - notification_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - subject = Column(Unicode(512), nullable=True) - body = Column(UnicodeText(50000), nullable=True) - created_by = Column(Integer(), ForeignKey('users.user_id'), nullable=True) - created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) - type_ = Column('type', Unicode(255)) - - created_by_user = relationship('User') - notifications_to_users = relationship('UserNotification', cascade="all, delete-orphan") - - @property - def recipients(self): - return [x.user for x in UserNotification.query() - .filter(UserNotification.notification == self) - .order_by(UserNotification.user_id.asc()).all()] - - @classmethod - def create(cls, created_by, subject, body, recipients, type_=None): - if type_ is None: - type_ = Notification.TYPE_MESSAGE - - notification = cls() - notification.created_by_user = created_by - notification.subject = subject - notification.body = body - notification.type_ = type_ - notification.created_on = datetime.datetime.now() - - for u in recipients: - assoc = UserNotification() - assoc.notification = notification - assoc.user_id = u.user_id - Session().add(assoc) - Session().add(notification) - Session().flush() # assign notificaiton.notification_id - return notification - - @property - def description(self): - from kallithea.model.notification import NotificationModel - return NotificationModel().make_description(self) - - -class UserNotification(Base, BaseModel): + +class UserNotification(object): __tablename__ = 'user_to_notification' - __table_args__ = ( - UniqueConstraint('user_id', 'notification_id'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} - ) - user_id = Column(Integer(), ForeignKey('users.user_id'), primary_key=True) - notification_id = Column(Integer(), ForeignKey('notifications.notification_id'), primary_key=True) - read = Column(Boolean, default=False) - sent_on = Column(DateTime(timezone=False), nullable=True, unique=None) - - user = relationship('User') - notification = relationship('Notification') - - def mark_as_read(self): - self.read = True - Session().add(self) - - -class Gist(Base, BaseModel): + + +class Gist(Base, BaseDbModel): __tablename__ = 'gists' __table_args__ = ( Index('g_gist_access_id_idx', 'gist_access_id'), Index('g_created_on_idx', 'created_on'), - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True} + _table_args_default_dict, ) + GIST_PUBLIC = u'public' GIST_PRIVATE = u'private' DEFAULT_FILENAME = u'gistfile1.txt' - gist_id = Column(Integer(), nullable=False, unique=True, primary_key=True) - gist_access_id = Column(Unicode(250)) - gist_description = Column(UnicodeText(1024)) - gist_owner = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=True) + gist_id = Column(Integer(), primary_key=True) + gist_access_id = Column(Unicode(250), nullable=False) + gist_description = Column(UnicodeText(), nullable=False) + owner_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False) gist_expires = Column(Float(53), nullable=False) gist_type = Column(Unicode(128), nullable=False) created_on = Column(DateTime(timezone=False), nullable=False, default=datetime.datetime.now) @@ -2482,10 +2497,18 @@ class Gist(Base, BaseModel): owner = relationship('User') + @hybrid_property + def is_expired(self): + return (self.gist_expires != -1) & (time.time() > self.gist_expires) + def __repr__(self): return '' % (self.gist_type, self.gist_access_id) @classmethod + def guess_instance(cls, value): + return super(Gist, cls).guess_instance(value, Gist.get_by_access_id) + + @classmethod def get_or_404(cls, id_): res = cls.query().filter(cls.gist_access_id == id_).scalar() if res is None: @@ -2513,7 +2536,7 @@ class Gist(Base, BaseModel): :param cls: """ from kallithea.model.gist import GIST_STORE_LOC - q = Session().query(Ui)\ + q = Session().query(Ui) \ .filter(Ui.ui_key == URL_SEP) q = q.options(FromCache("sql_cache_short", "repository_repo_path")) return os.path.join(q.one().ui_value, GIST_STORE_LOC) @@ -2547,14 +2570,3 @@ class Gist(Base, BaseModel): base_path = self.base_path() return get_repo(os.path.join(*map(safe_str, [base_path, self.gist_access_id]))) - - -class DbMigrateVersion(Base, BaseModel): - __tablename__ = 'db_migrate_version' - __table_args__ = ( - {'extend_existing': True, 'mysql_engine': 'InnoDB', - 'mysql_charset': 'utf8', 'sqlite_autoincrement': True}, - ) - repository_id = Column(String(250), nullable=False, unique=True, primary_key=True) - repository_path = Column(Text) - version = Column(Integer) diff --git a/kallithea/model/forms.py b/kallithea/model/forms.py --- a/kallithea/model/forms.py +++ b/kallithea/model/forms.py @@ -38,7 +38,7 @@ import logging import formencode from formencode import All -from pylons.i18n.translation import _ +from tg.i18n import ugettext as _ from kallithea import BACKENDS from kallithea.model import validators as v @@ -46,30 +46,32 @@ from kallithea.model import validators a log = logging.getLogger(__name__) -class LoginForm(formencode.Schema): - allow_extra_fields = True - filter_extra_fields = True - username = v.UnicodeString( - strip=True, - min=1, - not_empty=True, - messages={ - 'empty': _('Please enter a login'), - 'tooShort': _('Enter a value %(min)i characters long or more')} - ) +def LoginForm(): + class _LoginForm(formencode.Schema): + allow_extra_fields = True + filter_extra_fields = True + username = v.UnicodeString( + strip=True, + min=1, + not_empty=True, + messages={ + 'empty': _('Please enter a login'), + 'tooShort': _('Enter a value %(min)i characters long or more')} + ) - password = v.UnicodeString( - strip=False, - min=3, - not_empty=True, - messages={ - 'empty': _('Please enter a password'), - 'tooShort': _('Enter %(min)i characters or more')} - ) + password = v.UnicodeString( + strip=False, + min=3, + not_empty=True, + messages={ + 'empty': _('Please enter a password'), + 'tooShort': _('Enter %(min)i characters or more')} + ) - remember = v.StringBoolean(if_missing=False) + remember = v.StringBoolean(if_missing=False) - chained_validators = [v.ValidAuth()] + chained_validators = [v.ValidAuth()] + return _LoginForm def PasswordChangeForm(username): @@ -86,7 +88,9 @@ def PasswordChangeForm(username): return _PasswordChangeForm -def UserForm(edit=False, old_data={}): +def UserForm(edit=False, old_data=None): + old_data = old_data or {} + class _UserForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = True @@ -125,7 +129,10 @@ def UserForm(edit=False, old_data={}): return _UserForm -def UserGroupForm(edit=False, old_data={}, available_members=[]): +def UserGroupForm(edit=False, old_data=None, available_members=None): + old_data = old_data or {} + available_members = available_members or [] + class _UserGroupForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = True @@ -148,9 +155,12 @@ def UserGroupForm(edit=False, old_data={ return _UserGroupForm -def RepoGroupForm(edit=False, old_data={}, repo_groups=[], +def RepoGroupForm(edit=False, old_data=None, repo_groups=None, can_create_in_root=False): + old_data = old_data or {} + repo_groups = repo_groups or [] repo_group_ids = [rg[0] for rg in repo_groups] + class _RepoGroupForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = False @@ -163,11 +173,11 @@ def RepoGroupForm(edit=False, old_data={ group_copy_permissions = v.StringBoolean(if_missing=False) if edit: - #FIXME: do a special check that we cannot move a group to one of - #its children + # FIXME: do a special check that we cannot move a group to one of + # its children pass - group_parent_id = All(v.CanCreateGroup(can_create_in_root), + parent_group_id = All(v.CanCreateGroup(can_create_in_root), v.OneOf(repo_group_ids, hideList=False, testValueList=True, if_missing=None, not_empty=True), @@ -178,7 +188,7 @@ def RepoGroupForm(edit=False, old_data={ return _RepoGroupForm -def RegisterForm(edit=False, old_data={}): +def RegisterForm(edit=False, old_data=None): class _RegisterForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = True @@ -212,6 +222,7 @@ def PasswordResetRequestForm(): email = v.Email(not_empty=True) return _PasswordResetRequestForm + def PasswordResetConfirmationForm(): class _PasswordResetConfirmationForm(formencode.Schema): allow_extra_fields = True @@ -227,9 +238,14 @@ def PasswordResetConfirmationForm(): 'password_confirm')] return _PasswordResetConfirmationForm -def RepoForm(edit=False, old_data={}, supported_backends=BACKENDS.keys(), - repo_groups=[], landing_revs=[]): + +def RepoForm(edit=False, old_data=None, supported_backends=BACKENDS.keys(), + repo_groups=None, landing_revs=None): + old_data = old_data or {} + repo_groups = repo_groups or [] + landing_revs = landing_revs or [] repo_group_ids = [rg[0] for rg in repo_groups] + class _RepoForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = False @@ -251,8 +267,7 @@ def RepoForm(edit=False, old_data={}, su repo_enable_locking = v.StringBoolean(if_missing=False) if edit: - #this is repo owner - user = All(v.UnicodeString(not_empty=True), v.ValidRepoUser()) + owner = All(v.UnicodeString(not_empty=True), v.ValidRepoUser()) # Not a real field - just for reference for validation: # clone_uri_hidden = v.UnicodeString(if_missing='') @@ -302,9 +317,13 @@ def RepoFieldForm(): return _RepoFieldForm -def RepoForkForm(edit=False, old_data={}, supported_backends=BACKENDS.keys(), - repo_groups=[], landing_revs=[]): +def RepoForkForm(edit=False, old_data=None, supported_backends=BACKENDS.keys(), + repo_groups=None, landing_revs=None): + old_data = old_data or {} + repo_groups = repo_groups or [] + landing_revs = landing_revs or [] repo_group_ids = [rg[0] for rg in repo_groups] + class _RepoForkForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = False @@ -344,7 +363,7 @@ def ApplicationVisualisationForm(): filter_extra_fields = False show_public_icon = v.StringBoolean(if_missing=False) show_private_icon = v.StringBoolean(if_missing=False) - stylify_metatags = v.StringBoolean(if_missing=False) + stylify_metalabels = v.StringBoolean(if_missing=False) repository_fields = v.StringBoolean(if_missing=False) lightweight_journal = v.StringBoolean(if_missing=False) @@ -362,7 +381,6 @@ def ApplicationUiSettingsForm(): class _ApplicationUiSettingsForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = False - web_push_ssl = v.StringBoolean(if_missing=False) paths_root_path = All( v.ValidPath(), v.UnicodeString(strip=True, min=1, not_empty=True) @@ -421,7 +439,7 @@ def CustomDefaultPermissionsForm(): return _CustomDefaultPermissionsForm -def DefaultsForm(edit=False, old_data={}, supported_backends=BACKENDS.keys()): +def DefaultsForm(edit=False, old_data=None, supported_backends=BACKENDS.keys()): class _DefaultsForm(formencode.Schema): allow_extra_fields = True filter_extra_fields = True @@ -455,7 +473,7 @@ def AuthSettingsForm(current_active_modu validator = sv["validator"] if isinstance(validator, LazyFormencode): validator = validator() - #init all lazy validators from formencode.All + # init all lazy validators from formencode.All if isinstance(validator, All): init_validators = [] for validator in validator.validators: @@ -515,7 +533,6 @@ def PullRequestForm(repo_id): org_ref = v.UnicodeString(strip=True, required=True) other_repo = v.UnicodeString(strip=True, required=True) other_ref = v.UnicodeString(strip=True, required=True) - review_members = v.Set() pullrequest_title = v.UnicodeString(strip=True, required=True) pullrequest_desc = v.UnicodeString(strip=True, required=False) @@ -530,6 +547,7 @@ def PullRequestPostForm(): pullrequest_title = v.UnicodeString(strip=True, required=True) pullrequest_desc = v.UnicodeString(strip=True, required=False) + org_review_members = v.Set() review_members = v.Set() updaterev = v.UnicodeString(strip=True, required=False, if_missing=None) owner = All(v.UnicodeString(strip=True, required=True), diff --git a/kallithea/model/gist.py b/kallithea/model/gist.py --- a/kallithea/model/gist.py +++ b/kallithea/model/gist.py @@ -26,16 +26,16 @@ Original author and date, and relevant c """ import os +import random import time import logging import traceback import shutil -from kallithea.lib.utils2 import safe_unicode, unique_id, safe_int, \ +from kallithea.lib.utils2 import safe_unicode, safe_int, \ time_to_datetime, AttributeDict from kallithea.lib.compat import json -from kallithea.model import BaseModel -from kallithea.model.db import Gist +from kallithea.model.db import Gist, Session, User from kallithea.model.repo import RepoModel from kallithea.model.scm import ScmModel @@ -45,16 +45,15 @@ GIST_STORE_LOC = '.rc_gist_store' GIST_METADATA_FILE = '.rc_gist_metadata' -class GistModel(BaseModel): - cls = Gist +def make_gist_id(): + """Generate a random, URL safe, almost certainly unique gist identifier.""" + rnd = random.SystemRandom() # use cryptographically secure system PRNG + alphabet = '23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjklmnpqrstuvwxyz' + length = 20 + return u''.join(rnd.choice(alphabet) for _ in xrange(length)) - def _get_gist(self, gist): - """ - Helper method to get gist by ID, or gist_access_id as a fallback - :param gist: GistID, gist_access_id, or Gist instance - """ - return self._get_instance(Gist, gist, callback=Gist.get_by_access_id) +class GistModel(object): def __delete_gist(self, gist): """ @@ -86,7 +85,7 @@ class GistModel(BaseModel): f.write(json.dumps(metadata)) def get_gist(self, gist): - return self._get_gist(gist) + return Gist.guess_instance(gist) def get_gist_files(self, gist_access_id, revision=None): """ @@ -108,27 +107,26 @@ class GistModel(BaseModel): :param gist_type: type of gist private/public :param lifetime: in minutes, -1 == forever """ - owner = self._get_user(owner) - gist_id = safe_unicode(unique_id(20)) + owner = User.guess_instance(owner) + gist_id = make_gist_id() lifetime = safe_int(lifetime, -1) gist_expires = time.time() + (lifetime * 60) if lifetime != -1 else -1 log.debug('set GIST expiration date to: %s', time_to_datetime(gist_expires) if gist_expires != -1 else 'forever') - #create the Database version + # create the Database version gist = Gist() gist.gist_description = description gist.gist_access_id = gist_id - gist.gist_owner = owner.user_id + gist.owner_id = owner.user_id gist.gist_expires = gist_expires gist.gist_type = safe_unicode(gist_type) - self.sa.add(gist) - self.sa.flush() + Session().add(gist) + Session().flush() # make database assign gist.gist_id if gist_type == Gist.GIST_PUBLIC: # use DB ID for easy to use GIST ID gist_id = safe_unicode(gist.gist_id) gist.gist_access_id = gist_id - self.sa.add(gist) gist_repo_path = os.path.join(GIST_STORE_LOC, gist_id) log.debug('Creating new %s GIST repo in %s', gist_type, gist_repo_path) @@ -141,7 +139,7 @@ class GistModel(BaseModel): raise Exception('Filename cannot be inside a directory') content = gist_mapping[filename]['content'] - #TODO: expand support for setting explicit lexers + # TODO: expand support for setting explicit lexers # if lexer is None: # try: # guess_lexer = pygments.lexers.guess_lexer_for_filename @@ -155,7 +153,7 @@ class GistModel(BaseModel): message += 's: ' if len(processed_mapping) > 1 else ': ' message += ', '.join([x for x in processed_mapping]) - #fake Kallithea Repository object + # fake Kallithea Repository object fake_repo = AttributeDict(dict( repo_name=gist_repo_path, scm_instance_no_cache=lambda: repo, @@ -172,9 +170,9 @@ class GistModel(BaseModel): return gist def delete(self, gist, fs_remove=True): - gist = self._get_gist(gist) + gist = Gist.guess_instance(gist) try: - self.sa.delete(gist) + Session().delete(gist) if fs_remove: self.__delete_gist(gist) else: @@ -185,7 +183,7 @@ class GistModel(BaseModel): def update(self, gist, description, owner, gist_mapping, gist_type, lifetime): - gist = self._get_gist(gist) + gist = Gist.guess_instance(gist) gist_repo = gist.scm_instance lifetime = safe_int(lifetime, -1) @@ -194,7 +192,7 @@ class GistModel(BaseModel): else: gist_expires = time.time() + (lifetime * 60) if lifetime != -1 else -1 - #calculate operation type based on given data + # calculate operation type based on given data gist_mapping_op = {} for k, v in gist_mapping.items(): # add, mod, del @@ -212,14 +210,12 @@ class GistModel(BaseModel): gist.gist_expires = gist_expires gist.owner = owner gist.gist_type = gist_type - self.sa.add(gist) - self.sa.flush() message = 'updated file' message += 's: ' if len(gist_mapping) > 1 else ': ' message += ', '.join([x for x in gist_mapping]) - #fake Kallithea Repository object + # fake Kallithea Repository object fake_repo = AttributeDict(dict( repo_name=gist_repo.path, scm_instance_no_cache=lambda: gist_repo, diff --git a/kallithea/model/meta.py b/kallithea/model/meta.py --- a/kallithea/model/meta.py +++ b/kallithea/model/meta.py @@ -38,5 +38,20 @@ Session = scoped_session(session_factory # Engine is injected when model.__init__.init_model() sets meta.Base.metadata.bind Base = declarative_base() -#to use cache use this in query -#.options(FromCache("sqlalchemy_cache_type", "cachekey")) +# to use cache use this in query: +# .options(FromCache("sqlalchemy_cache_type", "cachekey")) + + +# Define naming conventions for foreign keys, primary keys, indexes, +# check constraints, and unique constraints, respectively. +Base.metadata.naming_convention = { + 'fk': 'fk_%(table_name)s_%(column_0_name)s', + 'pk': 'pk_%(table_name)s', + 'ix': 'ix_%(column_0_label)s', + 'ck': 'ck_%(table_name)s_%(column_0_name)s', + 'uq': 'uq_%(table_name)s_%(column_0_name)s', +} +# For custom CheckConstraints (not those autogenerated e.g. for Boolean +# types), a name should be given explicitly, since "column_0" is here a +# rather vague notion. A custom name is also necesarry if the generated +# name is very long, since MySQL limits identifiers to 64 characters. diff --git a/kallithea/model/notification.py b/kallithea/model/notification.py --- a/kallithea/model/notification.py +++ b/kallithea/model/notification.py @@ -26,40 +26,35 @@ Original author and date, and relevant c :license: GPLv3, see LICENSE.md for more details. """ +import datetime import logging import traceback -from pylons import tmpl_context as c -from pylons.i18n.translation import _ +from tg import tmpl_context as c, app_globals +from tg.i18n import ugettext as _ from sqlalchemy.orm import joinedload, subqueryload import kallithea from kallithea.lib import helpers as h from kallithea.lib.utils2 import safe_unicode -from kallithea.model import BaseModel -from kallithea.model.db import Notification, User, UserNotification +from kallithea.model.db import User from kallithea.model.meta import Session log = logging.getLogger(__name__) -class NotificationModel(BaseModel): - - cls = Notification +class NotificationModel(object): - def __get_notification(self, notification): - if isinstance(notification, Notification): - return notification - elif isinstance(notification, (int, long)): - return Notification.get(notification) - else: - if notification is not None: - raise Exception('notification must be int, long or Instance' - ' of Notification got %s' % type(notification)) + TYPE_CHANGESET_COMMENT = u'cs_comment' + TYPE_MESSAGE = u'message' + TYPE_MENTION = u'mention' # not used + TYPE_REGISTRATION = u'registration' + TYPE_PULL_REQUEST = u'pull_request' + TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment' def create(self, created_by, subject, body, recipients=None, - type_=Notification.TYPE_MESSAGE, with_email=True, - email_kwargs={}): + type_=TYPE_MESSAGE, with_email=True, + email_kwargs=None, repo_name=None): """ Creates notification of given type @@ -74,23 +69,22 @@ class NotificationModel(BaseModel): :param with_email: send email with this notification :param email_kwargs: additional dict to pass as args to email template """ - from kallithea.lib.celerylib import tasks, run_task - + from kallithea.lib.celerylib import tasks + email_kwargs = email_kwargs or {} if recipients and not getattr(recipients, '__iter__', False): raise Exception('recipients must be a list or iterable') - created_by_obj = self._get_user(created_by) + created_by_obj = User.guess_instance(created_by) - recipients_objs = [] + recipients_objs = set() if recipients: for u in recipients: - obj = self._get_user(u) + obj = User.guess_instance(u) if obj is not None: - recipients_objs.append(obj) + recipients_objs.add(obj) else: # TODO: inform user that requested operation couldn't be completed log.error('cannot email unknown user %r', u) - recipients_objs = set(recipients_objs) log.debug('sending notifications %s to %s', type_, recipients_objs ) @@ -102,195 +96,63 @@ class NotificationModel(BaseModel): ) #else: silently skip notification mails? - # TODO: inform user who are notified - notif = Notification.create( - created_by=created_by_obj, subject=subject, - body=body, recipients=recipients_objs, type_=type_ - ) - if not with_email: - return notif - - #don't send email to person who created this comment - rec_objs = set(recipients_objs).difference(set([created_by_obj])) + return headers = {} headers['X-Kallithea-Notification-Type'] = type_ if 'threading' in email_kwargs: headers['References'] = ' '.join('<%s>' % x for x in email_kwargs['threading']) + # this is passed into template + created_on = h.fmt_date(datetime.datetime.now()) + html_kwargs = { + 'subject': subject, + 'body': h.render_w_mentions(body, repo_name), + 'when': created_on, + 'user': created_by_obj.username, + } + + txt_kwargs = { + 'subject': subject, + 'body': body, + 'when': created_on, + 'user': created_by_obj.username, + } + + html_kwargs.update(email_kwargs) + txt_kwargs.update(email_kwargs) + email_subject = EmailNotificationModel() \ + .get_email_description(type_, **txt_kwargs) + email_txt_body = EmailNotificationModel() \ + .get_email_tmpl(type_, 'txt', **txt_kwargs) + email_html_body = EmailNotificationModel() \ + .get_email_tmpl(type_, 'html', **html_kwargs) + + # don't send email to person who created this comment + rec_objs = set(recipients_objs).difference(set([created_by_obj])) + # send email with notification to all other participants for rec in rec_objs: - ## this is passed into template - html_kwargs = { - 'subject': subject, - 'body': h.rst_w_mentions(body), - 'when': h.fmt_date(notif.created_on), - 'user': notif.created_by_user.username, - } - - txt_kwargs = { - 'subject': subject, - 'body': body, - 'when': h.fmt_date(notif.created_on), - 'user': notif.created_by_user.username, - } - - html_kwargs.update(email_kwargs) - txt_kwargs.update(email_kwargs) - email_subject = EmailNotificationModel()\ - .get_email_description(type_, **txt_kwargs) - email_txt_body = EmailNotificationModel()\ - .get_email_tmpl(type_, 'txt', **txt_kwargs) - email_html_body = EmailNotificationModel()\ - .get_email_tmpl(type_, 'html', **html_kwargs) - - run_task(tasks.send_email, [rec.email], email_subject, email_txt_body, + tasks.send_email([rec.email], email_subject, email_txt_body, email_html_body, headers, author=created_by_obj) - return notif - def delete(self, user, notification): - # we don't want to remove actual notification just the assignment - try: - notification = self.__get_notification(notification) - user = self._get_user(user) - if notification and user: - obj = UserNotification.query()\ - .filter(UserNotification.user == user)\ - .filter(UserNotification.notification - == notification)\ - .one() - Session().delete(obj) - return True - except Exception: - log.error(traceback.format_exc()) - raise - - def get_for_user(self, user, filter_=None): - """ - Get notifications for given user, filter them if filter dict is given - - :param user: - :param filter: - """ - user = self._get_user(user) - - q = UserNotification.query()\ - .filter(UserNotification.user == user)\ - .join((Notification, UserNotification.notification_id == - Notification.notification_id))\ - .options(joinedload('notification'))\ - .options(subqueryload('notification.created_by_user'))\ - .order_by(Notification.created_on.desc()) - - if filter_: - q = q.filter(Notification.type_.in_(filter_)) - - return q.all() - - def mark_read(self, user, notification): - try: - notification = self.__get_notification(notification) - user = self._get_user(user) - if notification and user: - obj = UserNotification.query()\ - .filter(UserNotification.user == user)\ - .filter(UserNotification.notification - == notification)\ - .one() - obj.read = True - Session().add(obj) - return True - except Exception: - log.error(traceback.format_exc()) - raise - - def mark_all_read_for_user(self, user, filter_=None): - user = self._get_user(user) - q = UserNotification.query()\ - .filter(UserNotification.user == user)\ - .filter(UserNotification.read == False)\ - .join((Notification, UserNotification.notification_id == - Notification.notification_id)) - if filter_: - q = q.filter(Notification.type_.in_(filter_)) +class EmailNotificationModel(object): - # this is a little inefficient but sqlalchemy doesn't support - # update on joined tables :( - for obj in q.all(): - obj.read = True - Session().add(obj) - - def get_unread_cnt_for_user(self, user): - user = self._get_user(user) - return UserNotification.query()\ - .filter(UserNotification.read == False)\ - .filter(UserNotification.user == user).count() - - def get_unread_for_user(self, user): - user = self._get_user(user) - return [x.notification for x in UserNotification.query()\ - .filter(UserNotification.read == False)\ - .filter(UserNotification.user == user).all()] - - def get_user_notification(self, user, notification): - user = self._get_user(user) - notification = self.__get_notification(notification) - - return UserNotification.query()\ - .filter(UserNotification.notification == notification)\ - .filter(UserNotification.user == user).scalar() - - def make_description(self, notification, show_age=True): - """ - Creates a human readable description based on properties - of notification object - """ - #alias - _n = notification - - if show_age: - return { - _n.TYPE_CHANGESET_COMMENT: _('%(user)s commented on changeset %(age)s'), - _n.TYPE_MESSAGE: _('%(user)s sent message %(age)s'), - _n.TYPE_MENTION: _('%(user)s mentioned you %(age)s'), - _n.TYPE_REGISTRATION: _('%(user)s registered in Kallithea %(age)s'), - _n.TYPE_PULL_REQUEST: _('%(user)s opened new pull request %(age)s'), - _n.TYPE_PULL_REQUEST_COMMENT: _('%(user)s commented on pull request %(age)s'), - }[notification.type_] % dict( - user=notification.created_by_user.username, - age=h.age(notification.created_on), - ) - else: - return { - _n.TYPE_CHANGESET_COMMENT: _('%(user)s commented on changeset at %(when)s'), - _n.TYPE_MESSAGE: _('%(user)s sent message at %(when)s'), - _n.TYPE_MENTION: _('%(user)s mentioned you at %(when)s'), - _n.TYPE_REGISTRATION: _('%(user)s registered in Kallithea at %(when)s'), - _n.TYPE_PULL_REQUEST: _('%(user)s opened new pull request at %(when)s'), - _n.TYPE_PULL_REQUEST_COMMENT: _('%(user)s commented on pull request at %(when)s'), - }[notification.type_] % dict( - user=notification.created_by_user.username, - when=h.fmt_date(notification.created_on), - ) - - -class EmailNotificationModel(BaseModel): - - TYPE_CHANGESET_COMMENT = Notification.TYPE_CHANGESET_COMMENT - TYPE_MESSAGE = Notification.TYPE_MESSAGE # only used for testing - # Notification.TYPE_MENTION is not used + TYPE_CHANGESET_COMMENT = NotificationModel.TYPE_CHANGESET_COMMENT + TYPE_MESSAGE = NotificationModel.TYPE_MESSAGE # only used for testing + # NotificationModel.TYPE_MENTION is not used TYPE_PASSWORD_RESET = 'password_link' - TYPE_REGISTRATION = Notification.TYPE_REGISTRATION - TYPE_PULL_REQUEST = Notification.TYPE_PULL_REQUEST - TYPE_PULL_REQUEST_COMMENT = Notification.TYPE_PULL_REQUEST_COMMENT + TYPE_REGISTRATION = NotificationModel.TYPE_REGISTRATION + TYPE_PULL_REQUEST = NotificationModel.TYPE_PULL_REQUEST + TYPE_PULL_REQUEST_COMMENT = NotificationModel.TYPE_PULL_REQUEST_COMMENT TYPE_DEFAULT = 'default' def __init__(self): super(EmailNotificationModel, self).__init__() - self._template_root = kallithea.CONFIG['pylons.paths']['templates'][0] - self._tmpl_lookup = kallithea.CONFIG['pylons.app_globals'].mako_lookup + self._template_root = kallithea.CONFIG['paths']['templates'][0] + self._tmpl_lookup = app_globals.mako_lookup self.email_types = { self.TYPE_CHANGESET_COMMENT: 'changeset_comment', self.TYPE_PASSWORD_RESET: 'password_reset', @@ -300,13 +162,13 @@ class EmailNotificationModel(BaseModel): self.TYPE_PULL_REQUEST_COMMENT: 'pull_request_comment', } self._subj_map = { - self.TYPE_CHANGESET_COMMENT: _('[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s'), + self.TYPE_CHANGESET_COMMENT: _('[Comment] %(repo_name)s changeset %(short_id)s "%(message_short)s" on %(branch)s'), self.TYPE_MESSAGE: 'Test Message', # self.TYPE_PASSWORD_RESET self.TYPE_REGISTRATION: _('New user %(new_username)s registered'), # self.TYPE_DEFAULT - self.TYPE_PULL_REQUEST: _('[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s'), - self.TYPE_PULL_REQUEST_COMMENT: _('[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s'), + self.TYPE_PULL_REQUEST: _('[Review] %(repo_name)s PR %(pr_nice_id)s "%(pr_title_short)s" from %(pr_source_branch)s by %(pr_owner_username)s'), + self.TYPE_PULL_REQUEST_COMMENT: _('[Comment] %(repo_name)s PR %(pr_nice_id)s "%(pr_title_short)s" from %(pr_source_branch)s by %(pr_owner_username)s'), } def get_email_description(self, type_, **kwargs): @@ -339,5 +201,25 @@ class EmailNotificationModel(BaseModel): 'h': h, 'c': c} _kwargs.update(kwargs) + if content_type == 'html': + _kwargs.update({ + "color_text": "#202020", + "color_emph": "#395fa0", + "color_link": "#395fa0", + "color_border": "#ddd", + "color_background_grey": "#f9f9f9", + "color_button": "#395fa0", + "monospace_style": "font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace", + "sans_style": "font-family:Helvetica,Arial,sans-serif", + }) + _kwargs.update({ + "default_style": "%(sans_style)s;font-weight:200;font-size:14px;line-height:17px;color:%(color_text)s" % _kwargs, + "comment_style": "%(monospace_style)s;white-space:pre-wrap" % _kwargs, + "data_style": "border:%(color_border)s 1px solid;background:%(color_background_grey)s" % _kwargs, + "emph_style": "font-weight:600;color:%(color_emph)s" % _kwargs, + "link_style": "color:%(color_link)s;text-decoration:none" % _kwargs, + "link_text_style": "color:%(color_text)s;text-decoration:none;border:%(color_border)s 1px solid;background:%(color_background_grey)s" % _kwargs, + }) + log.debug('rendering tmpl %s with kwargs %s', base, _kwargs) return email_template.render_unicode(**_kwargs) diff --git a/kallithea/model/permission.py b/kallithea/model/permission.py --- a/kallithea/model/permission.py +++ b/kallithea/model/permission.py @@ -31,21 +31,18 @@ import traceback from sqlalchemy.exc import DatabaseError -from kallithea.model import BaseModel -from kallithea.model.db import User, Permission, UserToPerm, UserRepoToPerm,\ - UserRepoGroupToPerm, UserUserGroupToPerm +from kallithea.model.db import Permission, Session, User, \ + UserToPerm, UserRepoToPerm, UserRepoGroupToPerm, UserUserGroupToPerm from kallithea.lib.utils2 import str2bool log = logging.getLogger(__name__) -class PermissionModel(BaseModel): +class PermissionModel(object): """ Permissions model for Kallithea """ - cls = Permission - def create_permissions(self): """ Create permissions for whole system @@ -54,8 +51,7 @@ class PermissionModel(BaseModel): if not Permission.get_by_key(p[0]): new_perm = Permission() new_perm.permission_name = p[0] - new_perm.permission_longname = p[0] #translation err with p[1] - self.sa.add(new_perm) + Session().add(new_perm) def create_default_permissions(self, user, force=False): """ @@ -65,7 +61,7 @@ class PermissionModel(BaseModel): :param user: """ - user = self._get_user(user) + user = User.guess_instance(user) def _make_perm(perm): new_perm = UserToPerm() @@ -84,8 +80,8 @@ class PermissionModel(BaseModel): if force: for perm in perms: - self.sa.delete(perm) - self.sa.commit() + Session().delete(perm) + Session().commit() defined_perms_groups = [] # For every default permission that needs to be created, we check if # its group is already defined. If it's not, we create default permission. @@ -95,16 +91,15 @@ class PermissionModel(BaseModel): log.debug('GR:%s not found, creating permission %s', gr, perm_name) new_perm = _make_perm(perm_name) - self.sa.add(new_perm) + Session().add(new_perm) def update(self, form_result): perm_user = User.get_by_username(username=form_result['perm_user_name']) try: # stage 1 set anonymous access - if perm_user.username == User.DEFAULT_USER: + if perm_user.is_default_user: perm_user.active = str2bool(form_result['anonymous']) - self.sa.add(perm_user) # stage 2 reset defaults and set them from form data def _make_new(usr, perm_name): @@ -116,61 +111,58 @@ class PermissionModel(BaseModel): # clear current entries, to make this function idempotent # it will fix even if we define more permissions or permissions # are somehow missing - u2p = self.sa.query(UserToPerm)\ - .filter(UserToPerm.user == perm_user)\ + u2p = UserToPerm.query() \ + .filter(UserToPerm.user == perm_user) \ .all() for p in u2p: - self.sa.delete(p) - #create fresh set of permissions + Session().delete(p) + # create fresh set of permissions for def_perm_key in ['default_repo_perm', 'default_group_perm', 'default_user_group_perm', 'default_repo_create', 'create_on_write', # special case for create repos on write access to group - #'default_repo_group_create', #not implemented yet + #'default_repo_group_create', # not implemented yet 'default_user_group_create', 'default_fork', 'default_register', 'default_extern_activate']: p = _make_new(perm_user, form_result[def_perm_key]) - self.sa.add(p) + Session().add(p) - #stage 3 update all default permissions for repos if checked + # stage 3 update all default permissions for repos if checked if form_result['overwrite_default_repo']: _def_name = form_result['default_repo_perm'].split('repository.')[-1] _def = Permission.get_by_key('repository.' + _def_name) # repos - for r2p in self.sa.query(UserRepoToPerm)\ - .filter(UserRepoToPerm.user == perm_user)\ + for r2p in UserRepoToPerm.query() \ + .filter(UserRepoToPerm.user == perm_user) \ .all(): - #don't reset PRIVATE repositories + # don't reset PRIVATE repositories if not r2p.repository.private: r2p.permission = _def - self.sa.add(r2p) if form_result['overwrite_default_group']: _def_name = form_result['default_group_perm'].split('group.')[-1] # groups _def = Permission.get_by_key('group.' + _def_name) - for g2p in self.sa.query(UserRepoGroupToPerm)\ - .filter(UserRepoGroupToPerm.user == perm_user)\ + for g2p in UserRepoGroupToPerm.query() \ + .filter(UserRepoGroupToPerm.user == perm_user) \ .all(): g2p.permission = _def - self.sa.add(g2p) if form_result['overwrite_default_user_group']: _def_name = form_result['default_user_group_perm'].split('usergroup.')[-1] # groups _def = Permission.get_by_key('usergroup.' + _def_name) - for g2p in self.sa.query(UserUserGroupToPerm)\ - .filter(UserUserGroupToPerm.user == perm_user)\ + for g2p in UserUserGroupToPerm.query() \ + .filter(UserUserGroupToPerm.user == perm_user) \ .all(): g2p.permission = _def - self.sa.add(g2p) - self.sa.commit() + Session().commit() except (DatabaseError,): log.error(traceback.format_exc()) - self.sa.rollback() + Session().rollback() raise diff --git a/kallithea/model/pull_request.py b/kallithea/model/pull_request.py --- a/kallithea/model/pull_request.py +++ b/kallithea/model/pull_request.py @@ -27,107 +27,46 @@ Original author and date, and relevant c import logging import datetime +import re -from pylons.i18n.translation import _ +from tg import request +from tg.i18n import ugettext as _ + +from sqlalchemy.orm import joinedload from kallithea.model.meta import Session from kallithea.lib import helpers as h -from kallithea.lib.exceptions import UserInvalidException -from kallithea.model import BaseModel -from kallithea.model.db import PullRequest, PullRequestReviewers, Notification,\ +from kallithea.model.db import PullRequest, PullRequestReviewer, \ ChangesetStatus, User from kallithea.model.notification import NotificationModel -from kallithea.lib.utils2 import extract_mentioned_users, safe_unicode +from kallithea.lib.utils2 import extract_mentioned_users, safe_str, safe_unicode log = logging.getLogger(__name__) -class PullRequestModel(BaseModel): - - cls = PullRequest - - def __get_pull_request(self, pull_request): - return self._get_instance(PullRequest, pull_request) - - def get_pullrequest_cnt_for_user(self, user): - return PullRequest.query()\ - .join(PullRequestReviewers)\ - .filter(PullRequestReviewers.user_id == user)\ - .filter(PullRequest.status != PullRequest.STATUS_CLOSED)\ - .count() +def _assert_valid_reviewers(seq): + """Sanity check: elements are actual User objects, and not the default user.""" + assert not any(user.is_default_user for user in seq) - def get_all(self, repo_name, from_=False, closed=False): - """Get all PRs for repo. - Default is all PRs to the repo, PRs from the repo if from_. - Closed PRs are only included if closed is true.""" - repo = self._get_repo(repo_name) - q = PullRequest.query() - if from_: - q = q.filter(PullRequest.org_repo == repo) - else: - q = q.filter(PullRequest.other_repo == repo) - if not closed: - q = q.filter(PullRequest.status != PullRequest.STATUS_CLOSED) - return q.order_by(PullRequest.created_on.desc()).all() - def create(self, created_by, org_repo, org_ref, other_repo, other_ref, - revisions, reviewers, title, description=None): - from kallithea.model.changeset_status import ChangesetStatusModel - - created_by_user = self._get_user(created_by) - org_repo = self._get_repo(org_repo) - other_repo = self._get_repo(other_repo) +class PullRequestModel(object): - new = PullRequest() - new.org_repo = org_repo - new.org_ref = org_ref - new.other_repo = other_repo - new.other_ref = other_ref - new.revisions = revisions - new.title = title - new.description = description - new.owner = created_by_user - Session().add(new) - Session().flush() + def add_reviewers(self, user, pr, reviewers, mention_recipients=None): + """Add reviewer and send notification to them. + """ + reviewers = set(reviewers) + _assert_valid_reviewers(reviewers) + if mention_recipients is not None: + mention_recipients = set(mention_recipients) - reviewers + _assert_valid_reviewers(mention_recipients) - #reset state to under-review - from kallithea.model.comment import ChangesetCommentsModel - comment = ChangesetCommentsModel().create( - text=u'', - repo=org_repo, - user=new.owner, - pull_request=new, - send_email=False, - status_change=ChangesetStatus.STATUS_UNDER_REVIEW, - ) - ChangesetStatusModel().set_status( - org_repo, - ChangesetStatus.STATUS_UNDER_REVIEW, - new.owner, - comment, - pull_request=new - ) + # members + for reviewer in reviewers: + prr = PullRequestReviewer(reviewer, pr) + Session().add(prr) - mention_recipients = set(User.get_by_username(username, case_insensitive=True) - for username in extract_mentioned_users(new.description)) - self.__add_reviewers(created_by_user, new, reviewers, mention_recipients) - - return new - - def __add_reviewers(self, user, pr, reviewers, mention_recipients=None): - #members - for member in set(reviewers): - _usr = self._get_user(member) - if _usr is None: - raise UserInvalidException(member) - reviewer = PullRequestReviewers(_usr, pr) - Session().add(reviewer) - - revision_data = [(x.raw_id, x.message) - for x in map(pr.org_repo.get_changeset, pr.revisions)] - - #notification to reviewers + # notification to reviewers pr_url = pr.url(canonical=True) threading = ['%s-pr-%s@%s' % (pr.other_repo.repo_name, pr.pull_request_id, @@ -142,15 +81,27 @@ class PullRequestModel(BaseModel): ) body = pr.description _org_ref_type, org_ref_name, _org_rev = pr.org_ref.split(':') + _other_ref_type, other_ref_name, _other_rev = pr.other_ref.split(':') + revision_data = [(x.raw_id, x.message) + for x in map(pr.org_repo.get_changeset, pr.revisions)] email_kwargs = { 'pr_title': pr.title, + 'pr_title_short': h.shorter(pr.title, 50), 'pr_user_created': user.full_name_and_username, 'pr_repo_url': h.canonical_url('summary_home', repo_name=pr.other_repo.repo_name), 'pr_url': pr_url, 'pr_revisions': revision_data, 'repo_name': pr.other_repo.repo_name, + 'org_repo_name': pr.org_repo.repo_name, 'pr_nice_id': pr.nice_id(), - 'ref': org_ref_name, + 'pr_target_repo': h.canonical_url('summary_home', + repo_name=pr.other_repo.repo_name), + 'pr_target_branch': other_ref_name, + 'pr_source_repo': h.canonical_url('summary_home', + repo_name=pr.org_repo.repo_name), + 'pr_source_branch': org_ref_name, + 'pr_owner': pr.owner, + 'pr_owner_username': pr.owner.username, 'pr_username': user.username, 'threading': threading, 'is_mention': False, @@ -158,59 +109,288 @@ class PullRequestModel(BaseModel): if reviewers: NotificationModel().create(created_by=user, subject=subject, body=body, recipients=reviewers, - type_=Notification.TYPE_PULL_REQUEST, + type_=NotificationModel.TYPE_PULL_REQUEST, email_kwargs=email_kwargs) if mention_recipients: - mention_recipients.discard(None) - mention_recipients.difference_update(reviewers) - if mention_recipients: email_kwargs['is_mention'] = True subject = _('[Mention]') + ' ' + subject + # FIXME: this subject is wrong and unused! NotificationModel().create(created_by=user, subject=subject, body=body, recipients=mention_recipients, - type_=Notification.TYPE_PULL_REQUEST, + type_=NotificationModel.TYPE_PULL_REQUEST, email_kwargs=email_kwargs) def mention_from_description(self, user, pr, old_description=''): - mention_recipients = set(User.get_by_username(username, case_insensitive=True) - for username in extract_mentioned_users(pr.description)) - mention_recipients.difference_update(User.get_by_username(username, case_insensitive=True) - for username in extract_mentioned_users(old_description)) + mention_recipients = (extract_mentioned_users(pr.description) - + extract_mentioned_users(old_description)) log.debug("Mentioning %s", mention_recipients) - self.__add_reviewers(user, pr, [], mention_recipients) - - def update_reviewers(self, user, pull_request, reviewers_ids): - reviewers_ids = set(reviewers_ids) - pull_request = self.__get_pull_request(pull_request) - current_reviewers = PullRequestReviewers.query()\ - .filter(PullRequestReviewers.pull_request== - pull_request)\ - .all() - current_reviewers_ids = set([x.user.user_id for x in current_reviewers]) + self.add_reviewers(user, pr, set(), mention_recipients) - to_add = reviewers_ids.difference(current_reviewers_ids) - to_remove = current_reviewers_ids.difference(reviewers_ids) - - log.debug("Adding %s reviewers", to_add) - self.__add_reviewers(user, pull_request, to_add) + def remove_reviewers(self, user, pull_request, reviewers): + """Remove specified users from being reviewers of the PR.""" + if not reviewers: + return # avoid SQLAlchemy warning about empty sequence for IN-predicate - log.debug("Removing %s reviewers", to_remove) - for uid in to_remove: - reviewer = PullRequestReviewers.query()\ - .filter(PullRequestReviewers.user_id==uid, - PullRequestReviewers.pull_request==pull_request)\ - .scalar() - if reviewer: - Session().delete(reviewer) + PullRequestReviewer.query() \ + .filter_by(pull_request=pull_request) \ + .filter(PullRequestReviewer.user_id.in_(r.user_id for r in reviewers)) \ + .delete(synchronize_session='fetch') # the default of 'evaluate' is not available def delete(self, pull_request): - pull_request = self.__get_pull_request(pull_request) + pull_request = PullRequest.guess_instance(pull_request) Session().delete(pull_request) + if pull_request.org_repo.scm_instance.alias == 'git': + # remove a ref under refs/pull/ so that commits can be garbage-collected + try: + del pull_request.org_repo.scm_instance._repo["refs/pull/%d/head" % pull_request.pull_request_id] + except KeyError: + pass def close_pull_request(self, pull_request): - pull_request = self.__get_pull_request(pull_request) + pull_request = PullRequest.guess_instance(pull_request) pull_request.status = PullRequest.STATUS_CLOSED pull_request.updated_on = datetime.datetime.now() - Session().add(pull_request) + + +class CreatePullRequestAction(object): + + class ValidationError(Exception): + pass + + class Empty(ValidationError): + pass + + class AmbiguousAncestor(ValidationError): + pass + + class Unauthorized(ValidationError): + pass + + @staticmethod + def is_user_authorized(org_repo, other_repo): + """Performs authorization check with only the minimum amount of + information needed for such a check, rather than a full command + object. + """ + if (h.HasRepoPermissionLevel('read')(org_repo.repo_name) and + h.HasRepoPermissionLevel('read')(other_repo.repo_name)): + return True + + return False + + def __init__(self, org_repo, other_repo, org_ref, other_ref, title, description, owner, reviewers): + from kallithea.controllers.compare import CompareController + reviewers = set(reviewers) + _assert_valid_reviewers(reviewers) + + (org_ref_type, + org_ref_name, + org_rev) = org_ref.split(':') + org_display = h.short_ref(org_ref_type, org_ref_name) + if org_ref_type == 'rev': + cs = org_repo.scm_instance.get_changeset(org_rev) + org_ref = 'branch:%s:%s' % (cs.branch, cs.raw_id) + + (other_ref_type, + other_ref_name, + other_rev) = other_ref.split(':') + if other_ref_type == 'rev': + cs = other_repo.scm_instance.get_changeset(other_rev) + other_ref_name = cs.raw_id[:12] + other_ref = '%s:%s:%s' % (other_ref_type, other_ref_name, cs.raw_id) + other_display = h.short_ref(other_ref_type, other_ref_name) + + cs_ranges, _cs_ranges_not, ancestor_revs = \ + CompareController._get_changesets(org_repo.scm_instance.alias, + other_repo.scm_instance, other_rev, # org and other "swapped" + org_repo.scm_instance, org_rev, + ) + if not cs_ranges: + raise self.Empty(_('Cannot create empty pull request')) + + if not ancestor_revs: + ancestor_rev = org_repo.scm_instance.EMPTY_CHANGESET + elif len(ancestor_revs) == 1: + ancestor_rev = ancestor_revs[0] + else: + raise self.AmbiguousAncestor( + _('Cannot create pull request - criss cross merge detected, please merge a later %s revision to %s') + % (other_ref_name, org_ref_name)) + + self.revisions = [cs_.raw_id for cs_ in cs_ranges] + + # hack: ancestor_rev is not an other_rev but we want to show the + # requested destination and have the exact ancestor + other_ref = '%s:%s:%s' % (other_ref_type, other_ref_name, ancestor_rev) + + if not title: + if org_repo == other_repo: + title = '%s to %s' % (org_display, other_display) + else: + title = '%s#%s to %s#%s' % (org_repo.repo_name, org_display, + other_repo.repo_name, other_display) + description = description or _('No description') + + self.org_repo = org_repo + self.other_repo = other_repo + self.org_ref = org_ref + self.org_rev = org_rev + self.other_ref = other_ref + self.title = title + self.description = description + self.owner = owner + self.reviewers = reviewers + + if not CreatePullRequestAction.is_user_authorized(self.org_repo, self.other_repo): + raise self.Unauthorized(_('You are not authorized to create the pull request')) + + def execute(self): + created_by = User.get(request.authuser.user_id) + + pr = PullRequest() + pr.org_repo = self.org_repo + pr.org_ref = self.org_ref + pr.other_repo = self.other_repo + pr.other_ref = self.other_ref + pr.revisions = self.revisions + pr.title = self.title + pr.description = self.description + pr.owner = self.owner + Session().add(pr) + Session().flush() # make database assign pull_request_id + + if self.org_repo.scm_instance.alias == 'git': + # create a ref under refs/pull/ so that commits don't get garbage-collected + self.org_repo.scm_instance._repo["refs/pull/%d/head" % pr.pull_request_id] = safe_str(self.org_rev) + + # reset state to under-review + from kallithea.model.changeset_status import ChangesetStatusModel + from kallithea.model.comment import ChangesetCommentsModel + comment = ChangesetCommentsModel().create( + text=u'', + repo=self.org_repo, + author=created_by, + pull_request=pr, + send_email=False, + status_change=ChangesetStatus.STATUS_UNDER_REVIEW, + ) + ChangesetStatusModel().set_status( + self.org_repo, + ChangesetStatus.STATUS_UNDER_REVIEW, + created_by, + comment, + pull_request=pr, + ) + + mention_recipients = extract_mentioned_users(self.description) + PullRequestModel().add_reviewers(created_by, pr, self.reviewers, mention_recipients) + + return pr + + +class CreatePullRequestIterationAction(object): + @staticmethod + def is_user_authorized(old_pull_request): + """Performs authorization check with only the minimum amount of + information needed for such a check, rather than a full command + object. + """ + if h.HasPermissionAny('hg.admin')(): + return True + + # Authorized to edit the old PR? + if request.authuser.user_id != old_pull_request.owner_id: + return False + + # Authorized to create a new PR? + if not CreatePullRequestAction.is_user_authorized(old_pull_request.org_repo, old_pull_request.other_repo): + return False + + return True + + def __init__(self, old_pull_request, new_org_rev, new_other_rev, title, description, owner, reviewers): + self.old_pull_request = old_pull_request + + org_repo = old_pull_request.org_repo + org_ref_type, org_ref_name, org_rev = old_pull_request.org_ref.split(':') + + other_repo = old_pull_request.other_repo + other_ref_type, other_ref_name, other_rev = old_pull_request.other_ref.split(':') # other_rev is ancestor + #assert other_ref_type == 'branch', other_ref_type # TODO: what if not? + + new_org_ref = '%s:%s:%s' % (org_ref_type, org_ref_name, new_org_rev) + new_other_ref = '%s:%s:%s' % (other_ref_type, other_ref_name, new_other_rev) + + self.create_action = CreatePullRequestAction(org_repo, other_repo, new_org_ref, new_other_ref, None, None, owner, reviewers) + + # Generate complete title/description + + old_revisions = set(old_pull_request.revisions) + revisions = self.create_action.revisions + new_revisions = [r for r in revisions if r not in old_revisions] + lost = old_revisions.difference(revisions) + + infos = ['This is a new iteration of %s "%s".' % + (h.canonical_url('pullrequest_show', repo_name=old_pull_request.other_repo.repo_name, + pull_request_id=old_pull_request.pull_request_id), + old_pull_request.title)] + + if lost: + infos.append(_('Missing changesets since the previous iteration:')) + for r in old_pull_request.revisions: + if r in lost: + rev_desc = org_repo.get_changeset(r).message.split('\n')[0] + infos.append(' %s %s' % (h.short_id(r), rev_desc)) + + if new_revisions: + infos.append(_('New changesets on %s %s since the previous iteration:') % (org_ref_type, org_ref_name)) + for r in reversed(revisions): + if r in new_revisions: + rev_desc = org_repo.get_changeset(r).message.split('\n')[0] + infos.append(' %s %s' % (h.short_id(r), h.shorter(rev_desc, 80))) + + if self.create_action.other_ref == old_pull_request.other_ref: + infos.append(_("Ancestor didn't change - diff since previous iteration:")) + infos.append(h.canonical_url('compare_url', + repo_name=org_repo.repo_name, # other_repo is always same as repo_name + org_ref_type='rev', org_ref_name=h.short_id(org_rev), # use old org_rev as base + other_ref_type='rev', other_ref_name=h.short_id(new_org_rev), + )) # note: linear diff, merge or not doesn't matter + else: + infos.append(_('This iteration is based on another %s revision and there is no simple diff.') % other_ref_name) + else: + infos.append(_('No changes found on %s %s since previous iteration.') % (org_ref_type, org_ref_name)) + # TODO: fail? + + try: + title, old_v = re.match(r'(.*)\(v(\d+)\)\s*$', title).groups() + v = int(old_v) + 1 + except (AttributeError, ValueError): + v = 2 + self.create_action.title = '%s (v%s)' % (title.strip(), v) + + # using a mail-like separator, insert new iteration info in description with latest first + descriptions = description.replace('\r\n', '\n').split('\n-- \n', 1) + description = descriptions[0].strip() + '\n\n-- \n' + '\n'.join(infos) + if len(descriptions) > 1: + description += '\n\n' + descriptions[1].strip() + self.create_action.description = description + + if not CreatePullRequestIterationAction.is_user_authorized(self.old_pull_request): + raise CreatePullRequestAction.Unauthorized(_('You are not authorized to create the pull request')) + + def execute(self): + pull_request = self.create_action.execute() + + # Close old iteration + from kallithea.model.comment import ChangesetCommentsModel + ChangesetCommentsModel().create( + text=_('Closed, next iteration: %s .') % pull_request.url(canonical=True), + repo=self.old_pull_request.other_repo_id, + author=request.authuser.user_id, + pull_request=self.old_pull_request.pull_request_id, + closing_pr=True) + PullRequestModel().close_pull_request(self.old_pull_request.pull_request_id) + return pull_request diff --git a/kallithea/model/repo.py b/kallithea/model/repo.py --- a/kallithea/model/repo.py +++ b/kallithea/model/repo.py @@ -33,40 +33,29 @@ import traceback from datetime import datetime from sqlalchemy.orm import subqueryload -import kallithea.lib.utils +import kallithea.lib.utils2 from kallithea.lib.utils import make_ui, is_valid_repo_uri from kallithea.lib.vcs.backends import get_backend -from kallithea.lib.compat import json from kallithea.lib.utils2 import LazyProperty, safe_str, safe_unicode, \ remove_prefix, obfuscate_url_pw, get_current_authuser from kallithea.lib.caching_query import FromCache from kallithea.lib.hooks import log_delete_repository -from kallithea.model import BaseModel from kallithea.model.db import Repository, UserRepoToPerm, UserGroupRepoToPerm, \ - UserRepoGroupToPerm, UserGroupRepoGroupToPerm, User, Permission, \ + UserRepoGroupToPerm, UserGroupRepoGroupToPerm, User, Permission, Session, \ Statistics, UserGroup, Ui, RepoGroup, RepositoryField from kallithea.lib import helpers as h -from kallithea.lib.auth import HasRepoPermissionAny, HasUserGroupPermissionAny +from kallithea.lib.auth import HasRepoPermissionLevel, HasUserGroupPermissionLevel from kallithea.lib.exceptions import AttachedForksError from kallithea.model.scm import UserGroupList log = logging.getLogger(__name__) -class RepoModel(BaseModel): - - cls = Repository - URL_SEPARATOR = Repository.url_sep() +class RepoModel(object): - def _get_user_group(self, users_group): - return self._get_instance(UserGroup, users_group, - callback=UserGroup.get_by_group_name) - - def _get_repo_group(self, repo_group): - return self._get_instance(RepoGroup, repo_group, - callback=RepoGroup.get_by_group_name) + URL_SEPARATOR = Repository.url_sep() def _create_default_perms(self, repository, private): # create default permission @@ -84,6 +73,7 @@ class RepoModel(BaseModel): repo_to_perm.repository = repository repo_to_perm.user_id = def_user.user_id + Session().add(repo_to_perm) return repo_to_perm @@ -93,11 +83,11 @@ class RepoModel(BaseModel): Gets the repositories root path from database """ - q = self.sa.query(Ui).filter(Ui.ui_key == '/').one() + q = Ui.query().filter(Ui.ui_key == '/').one() return q.ui_value def get(self, repo_id, cache=False): - repo = self.sa.query(Repository) \ + repo = Repository.query() \ .filter(Repository.repo_id == repo_id) if cache: @@ -106,10 +96,10 @@ class RepoModel(BaseModel): return repo.scalar() def get_repo(self, repository): - return self._get_repo(repository) + return Repository.guess_instance(repository) def get_by_repo_name(self, repo_name, cache=False): - repo = self.sa.query(Repository) \ + repo = Repository.query() \ .filter(Repository.repo_name == repo_name) if cache: @@ -124,74 +114,41 @@ class RepoModel(BaseModel): :param user: """ from kallithea.lib.auth import AuthUser - user = self._get_user(user) - repos = AuthUser(user_id=user.user_id).permissions['repositories'] + user = User.guess_instance(user) + repos = AuthUser(dbuser=user).permissions['repositories'] access_check = lambda r: r[1] in ['repository.read', 'repository.write', 'repository.admin'] repos = [x[0] for x in filter(access_check, repos.items())] return Repository.query().filter(Repository.repo_name.in_(repos)) - def get_users_js(self): - users = self.sa.query(User).filter(User.active == True).all() - return json.dumps([ - { - 'id': u.user_id, - 'fname': h.escape(u.name), - 'lname': h.escape(u.lastname), - 'nname': u.username, - 'gravatar_lnk': h.gravatar_url(u.email, size=28), - 'gravatar_size': 14, - } for u in users] - ) - - def get_user_groups_js(self): - user_groups = self.sa.query(UserGroup) \ - .filter(UserGroup.users_group_active == True) \ - .options(subqueryload(UserGroup.members)) \ - .all() - user_groups = UserGroupList(user_groups, perm_set=['usergroup.read', - 'usergroup.write', - 'usergroup.admin']) - return json.dumps([ - { - 'id': gr.users_group_id, - 'grname': gr.users_group_name, - 'grmembers': len(gr.members), - } for gr in user_groups] - ) - @classmethod def _render_datatable(cls, tmpl, *args, **kwargs): import kallithea - from pylons import tmpl_context as c - from pylons.i18n.translation import _ + from tg import tmpl_context as c, request, app_globals + from tg.i18n import ugettext as _ - _tmpl_lookup = kallithea.CONFIG['pylons.app_globals'].mako_lookup + _tmpl_lookup = app_globals.mako_lookup template = _tmpl_lookup.get_template('data_table/_dt_elements.html') tmpl = template.get_def(tmpl) - kwargs.update(dict(_=_, h=h, c=c)) + kwargs.update(dict(_=_, h=h, c=c, request=request)) return tmpl.render(*args, **kwargs) - @classmethod - def update_repoinfo(cls, repositories=None): - if repositories is None: - repositories = Repository.getAll() - for repo in repositories: - repo.update_changeset_cache() - - def get_repos_as_dict(self, repos_list=None, admin=False, perm_check=True, - super_user_actions=False): + def get_repos_as_dict(self, repos_list, repo_groups_list=None, + admin=False, + short_name=False): + """Return repository list for use by DataTable. + repos_list: list of repositories - but will be filtered for read permission. + repo_groups_list: added at top of list without permission check. + admin: return data for action column. + """ _render = self._render_datatable - from pylons import tmpl_context as c - - def quick_menu(repo_name): - return _render('quick_menu', repo_name) + from tg import tmpl_context as c def repo_lnk(name, rtype, rstate, private, fork_of): return _render('repo_name', name, rtype, rstate, private, fork_of, - short_name=not admin, admin=False) + short_name=short_name) def last_change(last_change): return _render("last_change", last_change) @@ -208,53 +165,54 @@ class RepoModel(BaseModel): cs_cache.get('message')) def desc(desc): - return h.urlify_text(desc, truncate=60, stylize=c.visual.stylify_metatags) + return h.urlify_text(desc, truncate=80, stylize=c.visual.stylify_metalabels) def state(repo_state): return _render("repo_state", repo_state) def repo_actions(repo_name): - return _render('repo_actions', repo_name, super_user_actions) + return _render('repo_actions', repo_name) - def owner_actions(user_id, username): - return _render('user_name', user_id, username) + def owner_actions(owner_id, username): + return _render('user_name', owner_id, username) repos_data = [] + + for gr in repo_groups_list or []: + repos_data.append(dict( + raw_name='\0' + gr.name, # sort before repositories + just_name=gr.name, + name=_render('group_name_html', group_name=gr.group_name, name=gr.name), + desc=gr.group_description)) + for repo in repos_list: - if perm_check: - # check permission at this level - if not HasRepoPermissionAny( - 'repository.read', 'repository.write', - 'repository.admin' - )(repo.repo_name, 'get_repos_as_dict check'): - continue + if not HasRepoPermissionLevel('read')(repo.repo_name, 'get_repos_as_dict check'): + continue cs_cache = repo.changeset_cache row = { - "menu": quick_menu(repo.repo_name), - "raw_name": repo.repo_name.lower(), + "raw_name": repo.repo_name, + "just_name": repo.just_name, "name": repo_lnk(repo.repo_name, repo.repo_type, repo.repo_state, repo.private, repo.fork), + "last_change_iso": repo.last_db_change.isoformat(), "last_change": last_change(repo.last_db_change), "last_changeset": last_rev(repo.repo_name, cs_cache), "last_rev_raw": cs_cache.get('revision'), "desc": desc(repo.description), - "owner": h.person(repo.user), + "owner": h.person(repo.owner), "state": state(repo.repo_state), "rss": rss_lnk(repo.repo_name), "atom": atom_lnk(repo.repo_name), - } if admin: row.update({ "action": repo_actions(repo.repo_name), - "owner": owner_actions(repo.user.user_id, - h.person(repo.user)) + "owner": owner_actions(repo.owner_id, + h.person(repo.owner)) }) repos_data.append(row) return { - "totalRecords": len(repos_list), - "startIndex": 0, "sort": "name", "dir": "asc", "records": repos_data @@ -274,10 +232,8 @@ class RepoModel(BaseModel): return None defaults = repo_info.get_dict() - group, repo_name, repo_name_full = repo_info.groups_and_repo - defaults['repo_name'] = repo_name - defaults['repo_group'] = getattr(group[-1] if group else None, - 'group_id', None) + defaults['repo_name'] = repo_info.just_name + defaults['repo_group'] = repo_info.group_id for strip, k in [(0, 'repo_type'), (1, 'repo_enable_downloads'), (1, 'repo_description'), (1, 'repo_enable_locking'), @@ -295,12 +251,12 @@ class RepoModel(BaseModel): defaults['clone_uri_hidden'] = repo_info.clone_uri_hidden # fill owner - if repo_info.user: - defaults.update({'user': repo_info.user.username}) + if repo_info.owner: + defaults.update({'owner': repo_info.owner.username}) else: replacement_user = User.query().filter(User.admin == True).first().username - defaults.update({'user': replacement_user}) + defaults.update({'owner': replacement_user}) # fill repository users for p in repo_info.repo_to_perm: @@ -316,12 +272,13 @@ class RepoModel(BaseModel): def update(self, repo, **kwargs): try: - cur_repo = self._get_repo(repo) + cur_repo = Repository.guess_instance(repo) org_repo_name = cur_repo.repo_name - if 'user' in kwargs: - cur_repo.user = User.get_by_username(kwargs['user']) + if 'owner' in kwargs: + cur_repo.owner = User.get_by_username(kwargs['owner']) if 'repo_group' in kwargs: + assert kwargs['repo_group'] != u'-1', kwargs # RepoForm should have converted to None cur_repo.group = RepoGroup.get(kwargs['repo_group']) cur_repo.repo_name = cur_repo.get_new_name(cur_repo.just_name) log.debug('Updating repo %s with params:%s', cur_repo, kwargs) @@ -344,25 +301,23 @@ class RepoModel(BaseModel): if 'repo_name' in kwargs: repo_name = kwargs['repo_name'] - if kallithea.lib.utils.repo_name_slug(repo_name) != repo_name: + if kallithea.lib.utils2.repo_name_slug(repo_name) != repo_name: raise Exception('invalid repo name %s' % repo_name) cur_repo.repo_name = cur_repo.get_new_name(repo_name) - #if private flag is set, reset default permission to NONE + # if private flag is set, reset default permission to NONE if kwargs.get('repo_private'): EMPTY_PERM = 'repository.none' RepoModel().grant_user_permission( repo=cur_repo, user='default', perm=EMPTY_PERM ) - #handle extra fields + # handle extra fields for field in filter(lambda k: k.startswith(RepositoryField.PREFIX), kwargs): k = RepositoryField.un_prefix_key(field) ex_field = RepositoryField.get_by_key_name(key=k, repo=cur_repo) if ex_field: ex_field.field_value = kwargs[field] - self.sa.add(ex_field) - self.sa.add(cur_repo) if org_repo_name != cur_repo.repo_name: # rename repository @@ -386,9 +341,9 @@ class RepoModel(BaseModel): """ from kallithea.model.scm import ScmModel - owner = self._get_user(owner) - fork_of = self._get_repo(fork_of) - repo_group = self._get_repo_group(repo_group) + owner = User.guess_instance(owner) + fork_of = Repository.guess_instance(fork_of) + repo_group = RepoGroup.guess_instance(repo_group) try: repo_name = safe_unicode(repo_name) description = safe_unicode(description) @@ -397,7 +352,7 @@ class RepoModel(BaseModel): # with name and path of group repo_name_full = repo_name repo_name = repo_name.split(self.URL_SEPARATOR)[-1] - if kallithea.lib.utils.repo_name_slug(repo_name) != repo_name: + if kallithea.lib.utils2.repo_name_slug(repo_name) != repo_name: raise Exception('invalid repo name %s' % repo_name) new_repo = Repository() @@ -405,7 +360,7 @@ class RepoModel(BaseModel): new_repo.enable_statistics = False new_repo.repo_name = repo_name_full new_repo.repo_type = repo_type - new_repo.user = owner + new_repo.owner = owner new_repo.group = repo_group new_repo.description = description or repo_name new_repo.private = private @@ -426,7 +381,7 @@ class RepoModel(BaseModel): parent_repo = fork_of new_repo.fork = parent_repo - self.sa.add(new_repo) + Session().add(new_repo) if fork_of and copy_fork_permissions: repo = fork_of @@ -461,15 +416,13 @@ class RepoModel(BaseModel): UserGroupRepoToPerm.create(perm.users_group, new_repo, perm_obj) else: - perm_obj = self._create_default_perms(new_repo, private) - self.sa.add(perm_obj) + self._create_default_perms(new_repo, private) # now automatically start following this repository as owner - ScmModel(self.sa).toggle_following_repo(new_repo.repo_id, - owner.user_id) + ScmModel().toggle_following_repo(new_repo.repo_id, owner.user_id) # we need to flush here, in order to check if database won't # throw any exceptions, create filesystem dirs at the very end - self.sa.flush() + Session().flush() return new_repo except Exception: log.error(traceback.format_exc()) @@ -482,8 +435,8 @@ class RepoModel(BaseModel): :param form_data: :param cur_user: """ - from kallithea.lib.celerylib import tasks, run_task - return run_task(tasks.create_repo, form_data, cur_user) + from kallithea.lib.celerylib import tasks + return tasks.create_repo(form_data, cur_user) def _update_permissions(self, repo, perms_new=None, perms_updates=None, check_perms=True): @@ -500,11 +453,8 @@ class RepoModel(BaseModel): repo=repo, user=member, perm=perm ) else: - #check if we have permissions to alter this usergroup - req_perms = ( - 'usergroup.read', 'usergroup.write', 'usergroup.admin') - if not check_perms or HasUserGroupPermissionAny(*req_perms)( - member): + # check if we have permissions to alter this usergroup's access + if not check_perms or HasUserGroupPermissionLevel('read')(member): self.grant_user_group_permission( repo=repo, group_name=member, perm=perm ) @@ -515,11 +465,8 @@ class RepoModel(BaseModel): repo=repo, user=member, perm=perm ) else: - #check if we have permissions to alter this usergroup - req_perms = ( - 'usergroup.read', 'usergroup.write', 'usergroup.admin') - if not check_perms or HasUserGroupPermissionAny(*req_perms)( - member): + # check if we have permissions to alter this usergroup's access + if not check_perms or HasUserGroupPermissionLevel('read')(member): self.grant_user_group_permission( repo=repo, group_name=member, perm=perm ) @@ -531,8 +478,8 @@ class RepoModel(BaseModel): :param form_data: :param cur_user: """ - from kallithea.lib.celerylib import tasks, run_task - return run_task(tasks.create_repo_fork, form_data, cur_user) + from kallithea.lib.celerylib import tasks + return tasks.create_repo_fork(form_data, cur_user) def delete(self, repo, forks=None, fs_remove=True, cur_user=None): """ @@ -546,12 +493,11 @@ class RepoModel(BaseModel): """ if not cur_user: cur_user = getattr(get_current_authuser(), 'username', None) - repo = self._get_repo(repo) + repo = Repository.guess_instance(repo) if repo is not None: if forks == 'detach': for r in repo.forks: r.fork = None - self.sa.add(r) elif forks == 'delete': for r in repo.forks: self.delete(r, forks='delete') @@ -560,7 +506,7 @@ class RepoModel(BaseModel): old_repo_dict = repo.get_dict() try: - self.sa.delete(repo) + Session().delete(repo) if fs_remove: self._delete_filesystem_repo(repo) else: @@ -580,22 +526,22 @@ class RepoModel(BaseModel): :param user: Instance of User, user_id or username :param perm: Instance of Permission, or permission_name """ - user = self._get_user(user) - repo = self._get_repo(repo) - permission = self._get_perm(perm) + user = User.guess_instance(user) + repo = Repository.guess_instance(repo) + permission = Permission.guess_instance(perm) # check if we have that permission already - obj = self.sa.query(UserRepoToPerm) \ + obj = UserRepoToPerm.query() \ .filter(UserRepoToPerm.user == user) \ .filter(UserRepoToPerm.repository == repo) \ .scalar() if obj is None: # create new ! obj = UserRepoToPerm() + Session().add(obj) obj.repository = repo obj.user = user obj.permission = permission - self.sa.add(obj) log.debug('Granted perm %s to %s on %s', perm, user, repo) return obj @@ -607,15 +553,15 @@ class RepoModel(BaseModel): :param user: Instance of User, user_id or username """ - user = self._get_user(user) - repo = self._get_repo(repo) + user = User.guess_instance(user) + repo = Repository.guess_instance(repo) - obj = self.sa.query(UserRepoToPerm) \ + obj = UserRepoToPerm.query() \ .filter(UserRepoToPerm.repository == repo) \ .filter(UserRepoToPerm.user == user) \ .scalar() if obj is not None: - self.sa.delete(obj) + Session().delete(obj) log.debug('Revoked perm on %s on %s', repo, user) def grant_user_group_permission(self, repo, group_name, perm): @@ -628,12 +574,12 @@ class RepoModel(BaseModel): or user group name :param perm: Instance of Permission, or permission_name """ - repo = self._get_repo(repo) - group_name = self._get_user_group(group_name) - permission = self._get_perm(perm) + repo = Repository.guess_instance(repo) + group_name = UserGroup.guess_instance(group_name) + permission = Permission.guess_instance(perm) # check if we have that permission already - obj = self.sa.query(UserGroupRepoToPerm) \ + obj = UserGroupRepoToPerm.query() \ .filter(UserGroupRepoToPerm.users_group == group_name) \ .filter(UserGroupRepoToPerm.repository == repo) \ .scalar() @@ -641,11 +587,11 @@ class RepoModel(BaseModel): if obj is None: # create new obj = UserGroupRepoToPerm() + Session().add(obj) obj.repository = repo obj.users_group = group_name obj.permission = permission - self.sa.add(obj) log.debug('Granted perm %s to %s on %s', perm, group_name, repo) return obj @@ -657,15 +603,15 @@ class RepoModel(BaseModel): :param group_name: Instance of UserGroup, users_group_id, or user group name """ - repo = self._get_repo(repo) - group_name = self._get_user_group(group_name) + repo = Repository.guess_instance(repo) + group_name = UserGroup.guess_instance(group_name) - obj = self.sa.query(UserGroupRepoToPerm) \ + obj = UserGroupRepoToPerm.query() \ .filter(UserGroupRepoToPerm.repository == repo) \ .filter(UserGroupRepoToPerm.users_group == group_name) \ .scalar() if obj is not None: - self.sa.delete(obj) + Session().delete(obj) log.debug('Revoked perm to %s on %s', repo, group_name) def delete_stats(self, repo_name): @@ -674,12 +620,12 @@ class RepoModel(BaseModel): :param repo_name: """ - repo = self._get_repo(repo_name) + repo = Repository.guess_instance(repo_name) try: - obj = self.sa.query(Statistics) \ + obj = Statistics.query() \ .filter(Statistics.repository == repo).scalar() if obj is not None: - self.sa.delete(obj) + Session().delete(obj) except Exception: log.error(traceback.format_exc()) raise @@ -778,4 +724,7 @@ class RepoModel(BaseModel): if repo.group: args = repo.group.full_path_splitted + [_d] _d = os.path.join(*args) - shutil.move(rm_path, safe_str(os.path.join(self.repos_path, _d))) + if os.path.exists(rm_path): + shutil.move(rm_path, safe_str(os.path.join(self.repos_path, _d))) + else: + log.error("Can't find repo to delete in %r", rm_path) diff --git a/kallithea/model/repo_group.py b/kallithea/model/repo_group.py --- a/kallithea/model/repo_group.py +++ b/kallithea/model/repo_group.py @@ -32,27 +32,16 @@ import traceback import shutil import datetime -import kallithea.lib.utils +import kallithea.lib.utils2 from kallithea.lib.utils2 import LazyProperty -from kallithea.model import BaseModel -from kallithea.model.db import RepoGroup, Ui, UserRepoGroupToPerm, \ +from kallithea.model.db import RepoGroup, Session, Ui, UserRepoGroupToPerm, \ User, Permission, UserGroupRepoGroupToPerm, UserGroup, Repository log = logging.getLogger(__name__) -class RepoGroupModel(BaseModel): - - cls = RepoGroup - - def _get_user_group(self, users_group): - return self._get_instance(UserGroup, users_group, - callback=UserGroup.get_by_group_name) - - def _get_repo_group(self, repo_group): - return self._get_instance(RepoGroup, repo_group, - callback=RepoGroup.get_by_group_name) +class RepoGroupModel(object): @LazyProperty def repos_path(self): @@ -60,7 +49,7 @@ class RepoGroupModel(BaseModel): Gets the repositories root path from database """ - q = Ui.get_by_key('/') + q = Ui.get_by_key('paths', '/') return q.ui_value def _create_default_perms(self, new_group): @@ -77,6 +66,7 @@ class RepoGroupModel(BaseModel): repo_group_to_perm.group = new_group repo_group_to_perm.user_id = def_user.user_id + Session().add(repo_group_to_perm) return repo_group_to_perm def _create_group(self, group_name): @@ -136,7 +126,7 @@ class RepoGroupModel(BaseModel): if force_delete: shutil.rmtree(rm_path) else: - #archive that group` + # archive that group _now = datetime.datetime.now() _ms = str(_now.microsecond).rjust(6, '0') _d = 'rm__%s_GROUP_%s' % (_now.strftime('%Y%m%d_%H%M%S_' + _ms), @@ -146,22 +136,22 @@ class RepoGroupModel(BaseModel): def create(self, group_name, group_description, owner, parent=None, just_db=False, copy_permissions=False): try: - if kallithea.lib.utils.repo_name_slug(group_name) != group_name: + if kallithea.lib.utils2.repo_name_slug(group_name) != group_name: raise Exception('invalid repo group name %s' % group_name) - user = self._get_user(owner) - parent_group = self._get_repo_group(parent) + owner = User.guess_instance(owner) + parent_group = RepoGroup.guess_instance(parent) new_repo_group = RepoGroup() - new_repo_group.user = user + new_repo_group.owner = owner new_repo_group.group_description = group_description or group_name new_repo_group.parent_group = parent_group new_repo_group.group_name = new_repo_group.get_new_name(group_name) - self.sa.add(new_repo_group) + Session().add(new_repo_group) # create an ADMIN permission for owner except if we're super admin, # later owner should go into the owner field of groups - if not user.is_admin: + if not owner.is_admin: self.grant_user_permission(repo_group=new_repo_group, user=owner, perm='group.admin') @@ -177,19 +167,18 @@ class RepoGroupModel(BaseModel): # don't copy over the permission for user who is creating # this group, if he is not super admin he get's admin # permission set above - if perm.user != user or user.is_admin: + if perm.user != owner or owner.is_admin: UserRepoGroupToPerm.create(perm.user, new_repo_group, perm.permission) for perm in group_perms: UserGroupRepoGroupToPerm.create(perm.users_group, new_repo_group, perm.permission) else: - perm_obj = self._create_default_perms(new_repo_group) - self.sa.add(perm_obj) + self._create_default_perms(new_repo_group) if not just_db: # we need to flush here, in order to check if database won't # throw any exceptions, create filesystem dirs at the very end - self.sa.flush() + Session().flush() self._create_group(new_repo_group.group_name) return new_repo_group @@ -201,7 +190,7 @@ class RepoGroupModel(BaseModel): perms_updates=None, recursive=None, check_perms=True): from kallithea.model.repo import RepoModel - from kallithea.lib.auth import HasUserGroupPermissionAny + from kallithea.lib.auth import HasUserGroupPermissionLevel if not perms_new: perms_new = [] @@ -212,9 +201,11 @@ class RepoGroupModel(BaseModel): if isinstance(obj, RepoGroup): self.grant_user_permission(repo_group=obj, user=user, perm=perm) elif isinstance(obj, Repository): + user = User.guess_instance(user) + # private repos will not allow to change the default permissions # using recursive mode - if obj.private and user == User.DEFAULT_USER: + if obj.private and user.is_default_user: return # we set group permission but we have to switch to repo @@ -246,7 +237,7 @@ class RepoGroupModel(BaseModel): # iterated obj is an instance of a repos group or repository in # that group, recursive option can be: none, repos, groups, all if recursive == 'all': - obj = obj + pass elif recursive == 'repos': # skip groups, other than this one if isinstance(obj, RepoGroup) and not obj == repo_group: @@ -267,18 +258,16 @@ class RepoGroupModel(BaseModel): _set_perm_user(obj, user=member, perm=perm) ## set for user group else: - #check if we have permissions to alter this usergroup - req_perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin') - if not check_perms or HasUserGroupPermissionAny(*req_perms)(member): + # check if we have permissions to alter this usergroup's access + if not check_perms or HasUserGroupPermissionLevel('read')(member): _set_perm_group(obj, users_group=member, perm=perm) # set new permissions for member, perm, member_type in perms_new: if member_type == 'user': _set_perm_user(obj, user=member, perm=perm) else: - #check if we have permissions to alter this usergroup - req_perms = ('usergroup.read', 'usergroup.write', 'usergroup.admin') - if not check_perms or HasUserGroupPermissionAny(*req_perms)(member): + # check if we have permissions to alter this usergroup's access + if not check_perms or HasUserGroupPermissionLevel('read')(member): _set_perm_group(obj, users_group=member, perm=perm) updates.append(obj) # if it's not recursive call for all,repos,groups @@ -288,24 +277,29 @@ class RepoGroupModel(BaseModel): return updates - def update(self, repo_group, form_data): - + def update(self, repo_group, repo_group_args): try: - repo_group = self._get_repo_group(repo_group) + repo_group = RepoGroup.guess_instance(repo_group) old_path = repo_group.full_path # change properties - repo_group.group_description = form_data['group_description'] - repo_group.group_parent_id = form_data['group_parent_id'] - repo_group.enable_locking = form_data['enable_locking'] + if 'group_description' in repo_group_args: + repo_group.group_description = repo_group_args['group_description'] + if 'parent_group_id' in repo_group_args: + repo_group.parent_group_id = repo_group_args['parent_group_id'] + if 'enable_locking' in repo_group_args: + repo_group.enable_locking = repo_group_args['enable_locking'] - repo_group.parent_group = RepoGroup.get(form_data['group_parent_id']) - group_name = form_data['group_name'] - if kallithea.lib.utils.repo_name_slug(group_name) != group_name: - raise Exception('invalid repo group name %s' % group_name) - repo_group.group_name = repo_group.get_new_name(group_name) + if 'parent_group_id' in repo_group_args: + assert repo_group_args['parent_group_id'] != u'-1', repo_group_args # RepoGroupForm should have converted to None + repo_group.parent_group = RepoGroup.get(repo_group_args['parent_group_id']) + if 'group_name' in repo_group_args: + group_name = repo_group_args['group_name'] + if kallithea.lib.utils2.repo_name_slug(group_name) != group_name: + raise Exception('invalid repo group name %s' % group_name) + repo_group.group_name = repo_group.get_new_name(group_name) new_path = repo_group.full_path - self.sa.add(repo_group) + Session().add(repo_group) # iterate over all members of this groups and do fixes # set locking if given @@ -314,7 +308,7 @@ class RepoGroupModel(BaseModel): # if obj is a Repo fix it's name # this can be potentially heavy operation for obj in repo_group.recursive_groups_and_repos(): - #set the value from it's parent + # set the value from it's parent obj.enable_locking = repo_group.enable_locking if isinstance(obj, RepoGroup): new_name = obj.get_new_name(obj.name) @@ -328,7 +322,6 @@ class RepoGroupModel(BaseModel): log.debug('Fixing repo %s to new name %s' \ % (obj.repo_name, new_name)) obj.repo_name = new_name - self.sa.add(obj) self._rename_group(old_path, new_path) @@ -338,9 +331,9 @@ class RepoGroupModel(BaseModel): raise def delete(self, repo_group, force_delete=False): - repo_group = self._get_repo_group(repo_group) + repo_group = RepoGroup.guess_instance(repo_group) try: - self.sa.delete(repo_group) + Session().delete(repo_group) self._delete_group(repo_group, force_delete) except Exception: log.error('Error removing repo_group %s', repo_group) @@ -348,14 +341,14 @@ class RepoGroupModel(BaseModel): def add_permission(self, repo_group, obj, obj_type, perm, recursive): from kallithea.model.repo import RepoModel - repo_group = self._get_repo_group(repo_group) - perm = self._get_perm(perm) + repo_group = RepoGroup.guess_instance(repo_group) + perm = Permission.guess_instance(perm) for el in repo_group.recursive_groups_and_repos(): # iterated obj is an instance of a repos group or repository in # that group, recursive option can be: none, repos, groups, all if recursive == 'all': - el = el + pass elif recursive == 'repos': # skip groups, other than this one if isinstance(el, RepoGroup) and not el == repo_group: @@ -404,13 +397,13 @@ class RepoGroupModel(BaseModel): :param recursive: recurse to all children of group """ from kallithea.model.repo import RepoModel - repo_group = self._get_repo_group(repo_group) + repo_group = RepoGroup.guess_instance(repo_group) for el in repo_group.recursive_groups_and_repos(): # iterated obj is an instance of a repos group or repository in # that group, recursive option can be: none, repos, groups, all if recursive == 'all': - el = el + pass elif recursive == 'repos': # skip groups, other than this one if isinstance(el, RepoGroup) and not el == repo_group: @@ -457,22 +450,22 @@ class RepoGroupModel(BaseModel): :param perm: Instance of Permission, or permission_name """ - repo_group = self._get_repo_group(repo_group) - user = self._get_user(user) - permission = self._get_perm(perm) + repo_group = RepoGroup.guess_instance(repo_group) + user = User.guess_instance(user) + permission = Permission.guess_instance(perm) # check if we have that permission already - obj = self.sa.query(UserRepoGroupToPerm)\ - .filter(UserRepoGroupToPerm.user == user)\ - .filter(UserRepoGroupToPerm.group == repo_group)\ + obj = UserRepoGroupToPerm.query() \ + .filter(UserRepoGroupToPerm.user == user) \ + .filter(UserRepoGroupToPerm.group == repo_group) \ .scalar() if obj is None: # create new ! obj = UserRepoGroupToPerm() + Session().add(obj) obj.group = repo_group obj.user = user obj.permission = permission - self.sa.add(obj) log.debug('Granted perm %s to %s on %s', perm, user, repo_group) return obj @@ -485,15 +478,15 @@ class RepoGroupModel(BaseModel): :param user: Instance of User, user_id or username """ - repo_group = self._get_repo_group(repo_group) - user = self._get_user(user) + repo_group = RepoGroup.guess_instance(repo_group) + user = User.guess_instance(user) - obj = self.sa.query(UserRepoGroupToPerm)\ - .filter(UserRepoGroupToPerm.user == user)\ - .filter(UserRepoGroupToPerm.group == repo_group)\ + obj = UserRepoGroupToPerm.query() \ + .filter(UserRepoGroupToPerm.user == user) \ + .filter(UserRepoGroupToPerm.group == repo_group) \ .scalar() if obj is not None: - self.sa.delete(obj) + Session().delete(obj) log.debug('Revoked perm on %s on %s', repo_group, user) def grant_user_group_permission(self, repo_group, group_name, perm): @@ -507,24 +500,24 @@ class RepoGroupModel(BaseModel): or user group name :param perm: Instance of Permission, or permission_name """ - repo_group = self._get_repo_group(repo_group) - group_name = self._get_user_group(group_name) - permission = self._get_perm(perm) + repo_group = RepoGroup.guess_instance(repo_group) + group_name = UserGroup.guess_instance(group_name) + permission = Permission.guess_instance(perm) # check if we have that permission already - obj = self.sa.query(UserGroupRepoGroupToPerm)\ - .filter(UserGroupRepoGroupToPerm.group == repo_group)\ - .filter(UserGroupRepoGroupToPerm.users_group == group_name)\ + obj = UserGroupRepoGroupToPerm.query() \ + .filter(UserGroupRepoGroupToPerm.group == repo_group) \ + .filter(UserGroupRepoGroupToPerm.users_group == group_name) \ .scalar() if obj is None: # create new obj = UserGroupRepoGroupToPerm() + Session().add(obj) obj.group = repo_group obj.users_group = group_name obj.permission = permission - self.sa.add(obj) log.debug('Granted perm %s to %s on %s', perm, group_name, repo_group) return obj @@ -537,13 +530,13 @@ class RepoGroupModel(BaseModel): :param group_name: Instance of UserGroup, users_group_id, or user group name """ - repo_group = self._get_repo_group(repo_group) - group_name = self._get_user_group(group_name) + repo_group = RepoGroup.guess_instance(repo_group) + group_name = UserGroup.guess_instance(group_name) - obj = self.sa.query(UserGroupRepoGroupToPerm)\ - .filter(UserGroupRepoGroupToPerm.group == repo_group)\ - .filter(UserGroupRepoGroupToPerm.users_group == group_name)\ + obj = UserGroupRepoGroupToPerm.query() \ + .filter(UserGroupRepoGroupToPerm.group == repo_group) \ + .filter(UserGroupRepoGroupToPerm.users_group == group_name) \ .scalar() if obj is not None: - self.sa.delete(obj) + Session().delete(obj) log.debug('Revoked perm to %s on %s', repo_group, group_name) diff --git a/kallithea/model/repo_permission.py b/kallithea/model/repo_permission.py --- a/kallithea/model/repo_permission.py +++ b/kallithea/model/repo_permission.py @@ -24,20 +24,17 @@ Original author and date, and relevant c """ import logging -from kallithea.model import BaseModel -from kallithea.model.db import UserRepoToPerm, UserGroupRepoToPerm, \ - Permission +from kallithea.model.db import User, UserRepoToPerm, UserGroupRepoToPerm, \ + Permission, Repository, Session log = logging.getLogger(__name__) -class RepositoryPermissionModel(BaseModel): - - cls = UserRepoToPerm +class RepositoryPermissionModel(object): def get_user_permission(self, repository, user): - repository = self._get_repo(repository) - user = self._get_user(user) + repository = Repository.guess_instance(repository) + user = User.guess_instance(user) return UserRepoToPerm.query() \ .filter(UserRepoToPerm.user == user) \ @@ -48,19 +45,19 @@ class RepositoryPermissionModel(BaseMode permission = Permission.get_by_key(permission) current = self.get_user_permission(repository, user) if current: - if not current.permission is permission: + if current.permission is not permission: current.permission = permission else: p = UserRepoToPerm() p.user = user p.repository = repository p.permission = permission - self.sa.add(p) + Session().add(p) def delete_user_permission(self, repository, user): current = self.get_user_permission(repository, user) if current: - self.sa.delete(current) + Session().delete(current) def get_users_group_permission(self, repository, users_group): return UserGroupRepoToPerm.query() \ @@ -73,19 +70,19 @@ class RepositoryPermissionModel(BaseMode permission = Permission.get_by_key(permission) current = self.get_users_group_permission(repository, users_group) if current: - if not current.permission is permission: + if current.permission is not permission: current.permission = permission else: p = UserGroupRepoToPerm() p.users_group = users_group p.repository = repository p.permission = permission - self.sa.add(p) + Session().add(p) def delete_users_group_permission(self, repository, users_group): current = self.get_users_group_permission(repository, users_group) if current: - self.sa.delete(current) + Session().delete(current) def update_or_delete_user_permission(self, repository, user, permission): if permission: diff --git a/kallithea/model/scm.py b/kallithea/model/scm.py --- a/kallithea/model/scm.py +++ b/kallithea/model/scm.py @@ -26,16 +26,17 @@ Original author and date, and relevant c """ import os +import sys +import posixpath import re import time import traceback import logging import cStringIO import pkg_resources -from os.path import join as jn from sqlalchemy import func -from pylons.i18n.translation import _ +from tg.i18n import ugettext as _ import kallithea from kallithea.lib.vcs import get_backend @@ -46,14 +47,13 @@ from kallithea.lib.vcs.backends.base imp from kallithea import BACKENDS from kallithea.lib import helpers as h -from kallithea.lib.utils2 import safe_str, safe_unicode, get_server_url,\ +from kallithea.lib.utils2 import safe_str, safe_unicode, get_server_url, \ _set_extras -from kallithea.lib.auth import HasRepoPermissionAny, HasRepoGroupPermissionAny,\ - HasUserGroupPermissionAny, HasPermissionAny, HasPermissionAll +from kallithea.lib.auth import HasRepoPermissionLevel, HasRepoGroupPermissionLevel, \ + HasUserGroupPermissionLevel, HasPermissionAny, HasPermissionAny from kallithea.lib.utils import get_filesystem_repos, make_ui, \ action_logger -from kallithea.model import BaseModel -from kallithea.model.db import Repository, Ui, CacheInvalidation, \ +from kallithea.model.db import Repository, Session, Ui, CacheInvalidation, \ UserFollowing, UserLog, User, RepoGroup, PullRequest from kallithea.lib.hooks import log_push_action from kallithea.lib.exceptions import NonRelativePathError, IMCCommitError @@ -77,92 +77,6 @@ class RepoTemp(object): return "<%s('id:%s')>" % (self.__class__.__name__, self.repo_id) -class CachedRepoList(object): - """ - Cached repo list. Uses super-fast in-memory cache after initialization. - """ - - def __init__(self, db_repo_list, repos_path, order_by=None, perm_set=None): - self.db_repo_list = db_repo_list - self.repos_path = repos_path - self.order_by = order_by - self.reversed = (order_by or '').startswith('-') - if not perm_set: - perm_set = ['repository.read', 'repository.write', - 'repository.admin'] - self.perm_set = perm_set - - def __len__(self): - return len(self.db_repo_list) - - def __repr__(self): - return '<%s (%s)>' % (self.__class__.__name__, self.__len__()) - - def __iter__(self): - # pre-propagated valid_cache_keys to save executing select statements - # for each repo - valid_cache_keys = CacheInvalidation.get_valid_cache_keys() - - for dbr in self.db_repo_list: - scmr = dbr.scm_instance_cached(valid_cache_keys) - # check permission at this level - if not HasRepoPermissionAny( - *self.perm_set)(dbr.repo_name, 'get repo check'): - continue - - try: - last_change = scmr.last_change - tip = h.get_changeset_safe(scmr, 'tip') - except Exception: - log.error( - '%s this repository is present in database but it ' - 'cannot be created as an scm instance, org_exc:%s' - % (dbr.repo_name, traceback.format_exc()) - ) - continue - - tmp_d = {} - tmp_d['name'] = dbr.repo_name - tmp_d['name_sort'] = tmp_d['name'].lower() - tmp_d['raw_name'] = tmp_d['name'].lower() - tmp_d['description'] = dbr.description - tmp_d['description_sort'] = tmp_d['description'].lower() - tmp_d['last_change'] = last_change - tmp_d['last_change_sort'] = time.mktime(last_change.timetuple()) - tmp_d['tip'] = tip.raw_id - tmp_d['tip_sort'] = tip.revision - tmp_d['rev'] = tip.revision - tmp_d['contact'] = dbr.user.full_contact - tmp_d['contact_sort'] = tmp_d['contact'] - tmp_d['owner_sort'] = tmp_d['contact'] - tmp_d['repo_archives'] = list(scmr._get_archives()) - tmp_d['last_msg'] = tip.message - tmp_d['author'] = tip.author - tmp_d['dbrepo'] = dbr.get_dict() - tmp_d['dbrepo_fork'] = dbr.fork.get_dict() if dbr.fork else {} - yield tmp_d - - -class SimpleCachedRepoList(CachedRepoList): - """ - Lighter version of CachedRepoList without the scm initialisation - """ - - def __iter__(self): - for dbr in self.db_repo_list: - # check permission at this level - if not HasRepoPermissionAny( - *self.perm_set)(dbr.repo_name, 'get repo check'): - continue - - tmp_d = { - 'name': dbr.repo_name, - 'dbrepo': dbr.get_dict(), - 'dbrepo_fork': dbr.fork.get_dict() if dbr.fork else {} - } - yield tmp_d - - class _PermCheckIterator(object): def __init__(self, obj_list, obj_attr, perm_set, perm_checker, extra_kwargs=None): """ @@ -199,41 +113,32 @@ class _PermCheckIterator(object): class RepoList(_PermCheckIterator): - def __init__(self, db_repo_list, perm_set=None, extra_kwargs=None): - if not perm_set: - perm_set = ['repository.read', 'repository.write', 'repository.admin'] - + def __init__(self, db_repo_list, perm_level, extra_kwargs=None): super(RepoList, self).__init__(obj_list=db_repo_list, - obj_attr='repo_name', perm_set=perm_set, - perm_checker=HasRepoPermissionAny, + obj_attr='repo_name', perm_set=[perm_level], + perm_checker=HasRepoPermissionLevel, extra_kwargs=extra_kwargs) class RepoGroupList(_PermCheckIterator): - def __init__(self, db_repo_group_list, perm_set=None, extra_kwargs=None): - if not perm_set: - perm_set = ['group.read', 'group.write', 'group.admin'] - + def __init__(self, db_repo_group_list, perm_level, extra_kwargs=None): super(RepoGroupList, self).__init__(obj_list=db_repo_group_list, - obj_attr='group_name', perm_set=perm_set, - perm_checker=HasRepoGroupPermissionAny, + obj_attr='group_name', perm_set=[perm_level], + perm_checker=HasRepoGroupPermissionLevel, extra_kwargs=extra_kwargs) class UserGroupList(_PermCheckIterator): - def __init__(self, db_user_group_list, perm_set=None, extra_kwargs=None): - if not perm_set: - perm_set = ['usergroup.read', 'usergroup.write', 'usergroup.admin'] - + def __init__(self, db_user_group_list, perm_level, extra_kwargs=None): super(UserGroupList, self).__init__(obj_list=db_user_group_list, - obj_attr='users_group_name', perm_set=perm_set, - perm_checker=HasUserGroupPermissionAny, + obj_attr='users_group_name', perm_set=[perm_level], + perm_checker=HasUserGroupPermissionLevel, extra_kwargs=extra_kwargs) -class ScmModel(BaseModel): +class ScmModel(object): """ Generic Scm Model """ @@ -256,7 +161,7 @@ class ScmModel(BaseModel): Gets the repositories root path from database """ - q = self.sa.query(Ui).filter(Ui.ui_key == '/').one() + q = Ui.query().filter(Ui.ui_key == '/').one() return q.ui_value @@ -299,58 +204,39 @@ class ScmModel(BaseModel): log.debug('found %s paths with repositories', len(repos)) return repos - def get_repos(self, all_repos=None, sort_key=None, simple=False): - """ - Get all repos from db and for each repo create its - backend instance and fill that backed with information from database + def get_repos(self, repos): + """Return the repos the user has access to""" + return RepoList(repos, perm_level='read') - :param all_repos: list of repository names as strings - give specific repositories list, good for filtering - - :param sort_key: initial sorting of repos - :param simple: use SimpleCachedList - one without the SCM info + def get_repo_groups(self, groups=None): + """Return the repo groups the user has access to + If no groups are specified, use top level groups. """ - if all_repos is None: - all_repos = self.sa.query(Repository)\ - .filter(Repository.group_id == None)\ - .order_by(func.lower(Repository.repo_name)).all() - if simple: - repo_iter = SimpleCachedRepoList(all_repos, - repos_path=self.repos_path, - order_by=sort_key) - else: - repo_iter = CachedRepoList(all_repos, - repos_path=self.repos_path, - order_by=sort_key) + if groups is None: + groups = RepoGroup.query() \ + .filter(RepoGroup.parent_group_id == None).all() + return RepoGroupList(groups, perm_level='read') - return repo_iter - - def get_repo_groups(self, all_groups=None): - if all_groups is None: - all_groups = RepoGroup.query()\ - .filter(RepoGroup.group_parent_id == None).all() - return [x for x in RepoGroupList(all_groups)] - - def mark_for_invalidation(self, repo_name, delete=False): + def mark_for_invalidation(self, repo_name): """ Mark caches of this repo invalid in the database. :param repo_name: the repo for which caches should be marked invalid """ - CacheInvalidation.set_invalidate(repo_name, delete=delete) + CacheInvalidation.set_invalidate(repo_name) repo = Repository.get_by_repo_name(repo_name) if repo is not None: repo.update_changeset_cache() def toggle_following_repo(self, follow_repo_id, user_id): - f = self.sa.query(UserFollowing)\ - .filter(UserFollowing.follows_repo_id == follow_repo_id)\ + f = UserFollowing.query() \ + .filter(UserFollowing.follows_repository_id == follow_repo_id) \ .filter(UserFollowing.user_id == user_id).scalar() if f is not None: try: - self.sa.delete(f) + Session().delete(f) action_logger(UserTemp(user_id), 'stopped_following_repo', RepoTemp(follow_repo_id)) @@ -362,8 +248,8 @@ class ScmModel(BaseModel): try: f = UserFollowing() f.user_id = user_id - f.follows_repo_id = follow_repo_id - self.sa.add(f) + f.follows_repository_id = follow_repo_id + Session().add(f) action_logger(UserTemp(user_id), 'started_following_repo', @@ -373,13 +259,13 @@ class ScmModel(BaseModel): raise def toggle_following_user(self, follow_user_id, user_id): - f = self.sa.query(UserFollowing)\ - .filter(UserFollowing.follows_user_id == follow_user_id)\ + f = UserFollowing.query() \ + .filter(UserFollowing.follows_user_id == follow_user_id) \ .filter(UserFollowing.user_id == user_id).scalar() if f is not None: try: - self.sa.delete(f) + Session().delete(f) return except Exception: log.error(traceback.format_exc()) @@ -389,17 +275,17 @@ class ScmModel(BaseModel): f = UserFollowing() f.user_id = user_id f.follows_user_id = follow_user_id - self.sa.add(f) + Session().add(f) except Exception: log.error(traceback.format_exc()) raise def is_following_repo(self, repo_name, user_id, cache=False): - r = self.sa.query(Repository)\ + r = Repository.query() \ .filter(Repository.repo_name == repo_name).scalar() - f = self.sa.query(UserFollowing)\ - .filter(UserFollowing.follows_repository == r)\ + f = UserFollowing.query() \ + .filter(UserFollowing.follows_repository == r) \ .filter(UserFollowing.user_id == user_id).scalar() return f is not None @@ -407,27 +293,27 @@ class ScmModel(BaseModel): def is_following_user(self, username, user_id, cache=False): u = User.get_by_username(username) - f = self.sa.query(UserFollowing)\ - .filter(UserFollowing.follows_user == u)\ + f = UserFollowing.query() \ + .filter(UserFollowing.follows_user == u) \ .filter(UserFollowing.user_id == user_id).scalar() return f is not None def get_followers(self, repo): - repo = self._get_repo(repo) + repo = Repository.guess_instance(repo) - return self.sa.query(UserFollowing)\ + return UserFollowing.query() \ .filter(UserFollowing.follows_repository == repo).count() def get_forks(self, repo): - repo = self._get_repo(repo) - return self.sa.query(Repository)\ + repo = Repository.guess_instance(repo) + return Repository.query() \ .filter(Repository.fork == repo).count() def get_pull_requests(self, repo): - repo = self._get_repo(repo) - return self.sa.query(PullRequest)\ - .filter(PullRequest.other_repo == repo)\ + repo = Repository.guess_instance(repo) + return PullRequest.query() \ + .filter(PullRequest.other_repo == repo) \ .filter(PullRequest.status != PullRequest.STATUS_CLOSED).count() def mark_as_fork(self, repo, fork, user): @@ -440,7 +326,6 @@ class ScmModel(BaseModel): raise RepositoryError("Cannot set repository as fork of repository with other type") repo.fork = fork - self.sa.add(repo) return repo def _handle_rc_scm_extras(self, username, repo_name, repo_alias, @@ -448,7 +333,7 @@ class ScmModel(BaseModel): from kallithea import CONFIG from kallithea.lib.base import _get_ip_addr try: - from pylons import request + from tg import request environ = request.environ except TypeError: # we might use this outside of request context, let's fake the @@ -478,7 +363,7 @@ class ScmModel(BaseModel): :param repo_name: name of repo :param revisions: list of revisions that we pushed """ - self._handle_rc_scm_extras(username, repo_name, repo_alias=repo.alias) + self._handle_rc_scm_extras(username, repo_name, repo_alias=repo.alias, action=action) _scm_repo = repo._repo # trigger push hook if repo.alias == 'hg': @@ -503,12 +388,13 @@ class ScmModel(BaseModel): raise Exception('Invalid scm_type, must be one of hg,git got %s' % (scm_type,)) - def pull_changes(self, repo, username): + def pull_changes(self, repo, username, clone_uri=None): """ - Pull from "clone URL". + Pull from "clone URL" or fork origin. """ dbrepo = self.__get_repo(repo) - clone_uri = dbrepo.clone_uri + if clone_uri is None: + clone_uri = dbrepo.clone_uri or dbrepo.fork and dbrepo.fork.repo_full_path if not clone_uri: raise Exception("This repository doesn't have a clone uri") @@ -542,7 +428,7 @@ class ScmModel(BaseModel): :param repo: a db_repo.scm_instance """ - user = self._get_user(user) + user = User.guess_instance(user) IMC = self._get_IMC_module(repo.alias) # decoding here will force that we have proper encoded values @@ -575,7 +461,7 @@ class ScmModel(BaseModel): if f_path.startswith('/') or f_path.startswith('.') or '../' in f_path: raise NonRelativePathError('%s is not an relative path' % f_path) if f_path: - f_path = os.path.normpath(f_path) + f_path = posixpath.normpath(f_path) return f_path def get_nodes(self, repo_name, revision, root_path='/', flat=True): @@ -623,13 +509,13 @@ class ScmModel(BaseModel): :returns: new committed changeset """ - user = self._get_user(user) + user = User.guess_instance(user) scm_instance = repo.scm_instance_no_cache() processed_nodes = [] for f_path in nodes: + content = nodes[f_path]['content'] f_path = self._sanitize_path(f_path) - content = nodes[f_path]['content'] f_path = safe_str(f_path) # decoding here will force that we have proper encoded values # in any other case this will throw exceptions and deny commit @@ -681,7 +567,7 @@ class ScmModel(BaseModel): """ Commits specified nodes to repo. Again. """ - user = self._get_user(user) + user = User.guess_instance(user) scm_instance = repo.scm_instance_no_cache() message = safe_unicode(message) @@ -715,7 +601,7 @@ class ScmModel(BaseModel): imc.remove(filenode) elif op == 'mod': if filename != old_filename: - #TODO: handle renames, needs vcs lib changes + # TODO: handle renames, needs vcs lib changes imc.remove(filenode) imc.add(FileNode(filename, content=content)) else: @@ -751,7 +637,7 @@ class ScmModel(BaseModel): :returns: new committed changeset after deletion """ - user = self._get_user(user) + user = User.guess_instance(user) scm_instance = repo.scm_instance_no_cache() processed_nodes = [] @@ -796,7 +682,7 @@ class ScmModel(BaseModel): return tip def get_unread_journal(self): - return self.sa.query(UserLog).count() + return UserLog.query().count() def get_repo_landing_revs(self, repo=None): """ @@ -842,21 +728,23 @@ class ScmModel(BaseModel): :param force_create: Create even if same name hook exists """ - loc = jn(repo.path, 'hooks') + loc = os.path.join(repo.path, 'hooks') if not repo.bare: - loc = jn(repo.path, '.git', 'hooks') + loc = os.path.join(repo.path, '.git', 'hooks') if not os.path.isdir(loc): os.makedirs(loc) - tmpl_post = pkg_resources.resource_string( - 'kallithea', jn('config', 'post_receive_tmpl.py') + tmpl_post = "#!/usr/bin/env %s\n" % sys.executable or 'python2' + tmpl_post += pkg_resources.resource_string( + 'kallithea', os.path.join('config', 'post_receive_tmpl.py') ) - tmpl_pre = pkg_resources.resource_string( - 'kallithea', jn('config', 'pre_receive_tmpl.py') + tmpl_pre = "#!/usr/bin/env %s\n" % sys.executable or 'python2' + tmpl_pre += pkg_resources.resource_string( + 'kallithea', os.path.join('config', 'pre_receive_tmpl.py') ) for h_type, tmpl in [('pre', tmpl_pre), ('post', tmpl_post)]: - _hook_file = jn(loc, '%s-receive' % h_type) + _hook_file = os.path.join(loc, '%s-receive' % h_type) has_hook = False log.debug('Installing git hook in repo %s', repo) if os.path.exists(_hook_file): @@ -889,17 +777,18 @@ class ScmModel(BaseModel): else: log.debug('skipping writing hook file') -def AvailableRepoGroupChoices(top_perms, repo_group_perms, extras=()): + +def AvailableRepoGroupChoices(top_perms, repo_group_perm_level, extras=()): """Return group_id,string tuples with choices for all the repo groups where the user has the necessary permissions. Top level is -1. """ groups = RepoGroup.query().all() - if HasPermissionAll('hg.admin')('available repo groups'): + if HasPermissionAny('hg.admin')('available repo groups'): groups.append(None) else: - groups = list(RepoGroupList(groups, perm_set=repo_group_perms)) + groups = list(RepoGroupList(groups, perm_level=repo_group_perm_level)) if top_perms and HasPermissionAny(*top_perms)('available repo groups'): groups.append(None) for extra in extras: diff --git a/kallithea/model/user.py b/kallithea/model/user.py --- a/kallithea/model/user.py +++ b/kallithea/model/user.py @@ -32,16 +32,14 @@ import logging import time import traceback -from pylons import config -from pylons.i18n.translation import _ +from tg import config +from tg.i18n import ugettext as _ from sqlalchemy.exc import DatabaseError -from kallithea import EXTERN_TYPE_INTERNAL -from kallithea.lib.utils2 import safe_unicode, generate_api_key, get_current_authuser +from kallithea.lib.utils2 import safe_str, generate_api_key, get_current_authuser from kallithea.lib.caching_query import FromCache -from kallithea.model import BaseModel -from kallithea.model.db import User, UserToPerm, Notification, \ +from kallithea.model.db import Permission, User, UserToPerm, \ UserEmailMap, UserIpMap from kallithea.lib.exceptions import DefaultUserException, \ UserOwnsReposException @@ -51,20 +49,18 @@ from kallithea.model.meta import Session log = logging.getLogger(__name__) -class UserModel(BaseModel): +class UserModel(object): password_reset_token_lifetime = 86400 # 24 hours - cls = User - def get(self, user_id, cache=False): - user = self.sa.query(User) + user = User.query() if cache: user = user.options(FromCache("sql_cache_short", "get_user_%s" % user_id)) return user.get(user_id) def get_user(self, user): - return self._get_user(user) + return User.guess_instance(user) def create(self, form_data, cur_user=None): if not cur_user: @@ -95,13 +91,14 @@ class UserModel(BaseModel): setattr(new_user, k, v) new_user.api_key = generate_api_key() - self.sa.add(new_user) + Session().add(new_user) + Session().flush() # make database assign new_user.user_id log_create_user(new_user.get_dict(), cur_user) return new_user - def create_or_update(self, username, password, email, firstname='', - lastname='', active=True, admin=False, + def create_or_update(self, username, password, email, firstname=u'', + lastname=u'', active=True, admin=False, extern_type=None, extern_name=None, cur_user=None): """ Creates a new instance if not found, or updates current one @@ -148,9 +145,9 @@ class UserModel(BaseModel): new_user.admin = admin new_user.email = email new_user.active = active - new_user.extern_name = safe_unicode(extern_name) \ + new_user.extern_name = safe_str(extern_name) \ if extern_name else None - new_user.extern_type = safe_unicode(extern_type) \ + new_user.extern_type = safe_str(extern_type) \ if extern_type else None new_user.name = firstname new_user.lastname = lastname @@ -165,12 +162,15 @@ class UserModel(BaseModel): reason = 'new password' if edit else 'new user' log.debug('Updating password reason=>%s', reason) new_user.password = get_crypt_password(password) \ - if password else None + if password else '' - self.sa.add(new_user) + if user is None: + Session().add(new_user) + Session().flush() # make database assign new_user.user_id if not edit: log_create_user(new_user.get_dict(), cur_user) + return new_user except (DatabaseError,): log.error(traceback.format_exc()) @@ -181,13 +181,10 @@ class UserModel(BaseModel): import kallithea.lib.helpers as h form_data['admin'] = False - form_data['extern_name'] = EXTERN_TYPE_INTERNAL - form_data['extern_type'] = EXTERN_TYPE_INTERNAL + form_data['extern_type'] = User.DEFAULT_AUTH_TYPE + form_data['extern_name'] = '' new_user = self.create(form_data) - self.sa.add(new_user) - self.sa.flush() - # notification to admins subject = _('New user registration') body = ( @@ -200,17 +197,19 @@ class UserModel(BaseModel): edit_url = h.canonical_url('edit_user', id=new_user.user_id) email_kwargs = { 'registered_user_url': edit_url, - 'new_username': new_user.username} + 'new_username': new_user.username, + 'new_email': new_user.email, + 'new_full_name': new_user.full_name} NotificationModel().create(created_by=new_user, subject=subject, body=body, recipients=None, - type_=Notification.TYPE_REGISTRATION, + type_=NotificationModel.TYPE_REGISTRATION, email_kwargs=email_kwargs) - def update(self, user_id, form_data, skip_attrs=[]): + def update(self, user_id, form_data, skip_attrs=None): from kallithea.lib.auth import get_crypt_password - + skip_attrs = skip_attrs or [] user = self.get(user_id, cache=False) - if user.username == User.DEFAULT_USER: + if user.is_default_user: raise DefaultUserException( _("You can't edit this user since it's " "crucial for entire application")) @@ -226,13 +225,12 @@ class UserModel(BaseModel): if k == 'firstname': k = 'name' setattr(user, k, v) - self.sa.add(user) def update_user(self, user, **kwargs): from kallithea.lib.auth import get_crypt_password - user = self._get_user(user) - if user.username == User.DEFAULT_USER: + user = User.guess_instance(user) + if user.is_default_user: raise DefaultUserException( _("You can't edit this user since it's" " crucial for entire application") @@ -243,15 +241,14 @@ class UserModel(BaseModel): v = get_crypt_password(v) setattr(user, k, v) - self.sa.add(user) return user def delete(self, user, cur_user=None): if cur_user is None: cur_user = getattr(get_current_authuser(), 'username', None) - user = self._get_user(user) + user = User.guess_instance(user) - if user.username == User.DEFAULT_USER: + if user.is_default_user: raise DefaultUserException( _("You can't remove this user since it is" " crucial for the entire application")) @@ -273,11 +270,16 @@ class UserModel(BaseModel): _('User "%s" still owns %s user groups and cannot be ' 'removed. Switch owners or remove those user groups: %s') % (user.username, len(usergroups), ', '.join(usergroups))) - self.sa.delete(user) + Session().delete(user) from kallithea.lib.hooks import log_delete_user log_delete_user(user.get_dict(), cur_user) + def can_change_password(self, user): + from kallithea.lib import auth_modules + managed_fields = auth_modules.get_managed_fields(user) + return 'password' not in managed_fields + def get_reset_password_token(self, user, timestamp, session_id): """ The token is a 40-digit hexstring, calculated as a HMAC-SHA1. @@ -324,7 +326,7 @@ class UserModel(BaseModel): allowing users to copy-paste or manually enter the token from the email. """ - from kallithea.lib.celerylib import tasks, run_task + from kallithea.lib.celerylib import tasks from kallithea.model.notification import EmailNotificationModel import kallithea.lib.helpers as h @@ -332,18 +334,21 @@ class UserModel(BaseModel): user = User.get_by_email(user_email) timestamp = int(time.time()) if user is not None: - log.debug('password reset user %s found', user) - token = self.get_reset_password_token(user, - timestamp, - h.authentication_token()) - # URL must be fully qualified; but since the token is locked to - # the current browser session, we must provide a URL with the - # current scheme and hostname, rather than the canonical_url. - link = h.url('reset_password_confirmation', qualified=True, - email=user_email, - timestamp=timestamp, - token=token) - + if self.can_change_password(user): + log.debug('password reset user %s found', user) + token = self.get_reset_password_token(user, + timestamp, + h.authentication_token()) + # URL must be fully qualified; but since the token is locked to + # the current browser session, we must provide a URL with the + # current scheme and hostname, rather than the canonical_url. + link = h.url('reset_password_confirmation', qualified=True, + email=user_email, + timestamp=timestamp, + token=token) + else: + log.debug('password reset user %s found but was managed', user) + token = link = None reg_type = EmailNotificationModel.TYPE_PASSWORD_RESET body = EmailNotificationModel().get_email_tmpl( reg_type, 'txt', @@ -356,8 +361,7 @@ class UserModel(BaseModel): reset_token=token, reset_url=link) log.debug('sending email') - run_task(tasks.send_email, [user_email], - _("Password reset link"), body, html_body) + tasks.send_email([user_email], _("Password reset link"), body, html_body) log.info('send new password mail to %s', user_email) else: log.debug("password reset email %s not found", user_email) @@ -367,7 +371,7 @@ class UserModel(BaseModel): timestamp=timestamp) def verify_reset_password_token(self, email, timestamp, token): - from kallithea.lib.celerylib import tasks, run_task + from kallithea.lib.celerylib import tasks from kallithea.lib import auth import kallithea.lib.helpers as h user = User.get_by_email(email) @@ -393,18 +397,19 @@ class UserModel(BaseModel): return expected_token == token def reset_password(self, user_email, new_passwd): - from kallithea.lib.celerylib import tasks, run_task + from kallithea.lib.celerylib import tasks from kallithea.lib import auth user = User.get_by_email(user_email) if user is not None: + if not self.can_change_password(user): + raise Exception('trying to change password for external user') user.password = auth.get_crypt_password(new_passwd) - Session().add(user) Session().commit() log.info('change password for %s', user_email) if new_passwd is None: raise Exception('unable to set new password') - run_task(tasks.send_email, [user_email], + tasks.send_email([user_email], _('Password reset notification'), _('The password to your account %s has been changed using password reset form.') % (user.username,)) log.info('send password reset mail to %s', user_email) @@ -412,10 +417,10 @@ class UserModel(BaseModel): return True def has_perm(self, user, perm): - perm = self._get_perm(perm) - user = self._get_user(user) + perm = Permission.guess_instance(perm) + user = User.guess_instance(user) - return UserToPerm.query().filter(UserToPerm.user == user)\ + return UserToPerm.query().filter(UserToPerm.user == user) \ .filter(UserToPerm.permission == perm).scalar() is not None def grant_perm(self, user, perm): @@ -425,19 +430,19 @@ class UserModel(BaseModel): :param user: :param perm: """ - user = self._get_user(user) - perm = self._get_perm(perm) + user = User.guess_instance(user) + perm = Permission.guess_instance(perm) # if this permission is already granted skip it - _perm = UserToPerm.query()\ - .filter(UserToPerm.user == user)\ - .filter(UserToPerm.permission == perm)\ + _perm = UserToPerm.query() \ + .filter(UserToPerm.user == user) \ + .filter(UserToPerm.permission == perm) \ .scalar() if _perm: return new = UserToPerm() new.user = user new.permission = perm - self.sa.add(new) + Session().add(new) return new def revoke_perm(self, user, perm): @@ -447,8 +452,8 @@ class UserModel(BaseModel): :param user: :param perm: """ - user = self._get_user(user) - perm = self._get_perm(perm) + user = User.guess_instance(user) + perm = Permission.guess_instance(perm) UserToPerm.query().filter( UserToPerm.user == user, @@ -465,12 +470,12 @@ class UserModel(BaseModel): from kallithea.model import forms form = forms.UserExtraEmailForm()() data = form.to_python(dict(email=email)) - user = self._get_user(user) + user = User.guess_instance(user) obj = UserEmailMap() obj.user = user obj.email = data['email'] - self.sa.add(obj) + Session().add(obj) return obj def delete_extra_email(self, user, email_id): @@ -480,10 +485,10 @@ class UserModel(BaseModel): :param user: :param email_id: """ - user = self._get_user(user) + user = User.guess_instance(user) obj = UserEmailMap.query().get(email_id) if obj is not None: - self.sa.delete(obj) + Session().delete(obj) def add_extra_ip(self, user, ip): """ @@ -495,12 +500,12 @@ class UserModel(BaseModel): from kallithea.model import forms form = forms.UserExtraIpForm()() data = form.to_python(dict(ip=ip)) - user = self._get_user(user) + user = User.guess_instance(user) obj = UserIpMap() obj.user = user obj.ip_addr = data['ip'] - self.sa.add(obj) + Session().add(obj) return obj def delete_extra_ip(self, user, ip_id): @@ -510,7 +515,7 @@ class UserModel(BaseModel): :param user: :param ip_id: """ - user = self._get_user(user) + user = User.guess_instance(user) obj = UserIpMap.query().get(ip_id) if obj: - self.sa.delete(obj) + Session().delete(obj) diff --git a/kallithea/model/user_group.py b/kallithea/model/user_group.py --- a/kallithea/model/user_group.py +++ b/kallithea/model/user_group.py @@ -27,23 +27,16 @@ Original author and date, and relevant c import logging import traceback -from kallithea.model import BaseModel -from kallithea.model.db import UserGroupMember, UserGroup,\ - UserGroupRepoToPerm, Permission, UserGroupToPerm, User, UserUserGroupToPerm,\ +from kallithea.model.db import Session, UserGroupMember, UserGroup, \ + UserGroupRepoToPerm, Permission, UserGroupToPerm, User, UserUserGroupToPerm, \ UserGroupUserGroupToPerm -from kallithea.lib.exceptions import UserGroupsAssignedException,\ +from kallithea.lib.exceptions import UserGroupsAssignedException, \ RepoGroupAssignmentError log = logging.getLogger(__name__) -class UserGroupModel(BaseModel): - - cls = UserGroup - - def _get_user_group(self, user_group): - return self._get_instance(UserGroup, user_group, - callback=UserGroup.get_by_group_name) +class UserGroupModel(object): def _create_default_perms(self, user_group): # create default permission @@ -59,11 +52,12 @@ class UserGroupModel(BaseModel): user_group_to_perm.user_group = user_group user_group_to_perm.user_id = def_user.user_id + Session().add(user_group_to_perm) return user_group_to_perm def _update_permissions(self, user_group, perms_new=None, perms_updates=None): - from kallithea.lib.auth import HasUserGroupPermissionAny + from kallithea.lib.auth import HasUserGroupPermissionLevel if not perms_new: perms_new = [] if not perms_updates: @@ -77,9 +71,8 @@ class UserGroupModel(BaseModel): user_group=user_group, user=member, perm=perm ) else: - #check if we have permissions to alter this usergroup - if HasUserGroupPermissionAny('usergroup.read', 'usergroup.write', - 'usergroup.admin')(member): + # check if we have permissions to alter this usergroup's access + if HasUserGroupPermissionLevel('read')(member): self.grant_user_group_permission( target_user_group=user_group, user_group=member, perm=perm ) @@ -90,9 +83,8 @@ class UserGroupModel(BaseModel): user_group=user_group, user=member, perm=perm ) else: - #check if we have permissions to alter this usergroup - if HasUserGroupPermissionAny('usergroup.read', 'usergroup.write', - 'usergroup.admin')(member): + # check if we have permissions to alter this usergroup's access + if HasUserGroupPermissionLevel('read')(member): self.grant_user_group_permission( target_user_group=user_group, user_group=member, perm=perm ) @@ -101,7 +93,7 @@ class UserGroupModel(BaseModel): return UserGroup.get(user_group_id) def get_group(self, user_group): - return self._get_user_group(user_group) + return UserGroup.guess_instance(user_group) def get_by_name(self, name, cache=False, case_insensitive=False): return UserGroup.get_by_group_name(name, cache, case_insensitive) @@ -109,15 +101,14 @@ class UserGroupModel(BaseModel): def create(self, name, description, owner, active=True, group_data=None): try: new_user_group = UserGroup() - new_user_group.user = self._get_user(owner) + new_user_group.owner = User.guess_instance(owner) new_user_group.users_group_name = name new_user_group.user_group_description = description new_user_group.users_group_active = active if group_data: new_user_group.group_data = group_data - self.sa.add(new_user_group) - perm_obj = self._create_default_perms(new_user_group) - self.sa.add(perm_obj) + Session().add(new_user_group) + self._create_default_perms(new_user_group) self.grant_user_permission(user_group=new_user_group, user=owner, perm='usergroup.admin') @@ -130,22 +121,23 @@ class UserGroupModel(BaseModel): def update(self, user_group, form_data): try: - user_group = self._get_user_group(user_group) + user_group = UserGroup.guess_instance(user_group) for k, v in form_data.items(): if k == 'users_group_members': - user_group.members = [] - self.sa.flush() members_list = [] if v: v = [v] if isinstance(v, basestring) else v for u_id in set(v): member = UserGroupMember(user_group.users_group_id, u_id) members_list.append(member) - setattr(user_group, 'members', members_list) + Session().add(member) + user_group.members = members_list setattr(user_group, k, v) - self.sa.add(user_group) + # Flush to make db assign users_group_member_id to newly + # created UserGroupMembers. + Session().flush() except Exception: log.error(traceback.format_exc()) raise @@ -159,24 +151,24 @@ class UserGroupModel(BaseModel): :param user_group: :param force: """ - user_group = self._get_user_group(user_group) + user_group = UserGroup.guess_instance(user_group) try: # check if this group is not assigned to repo - assigned_groups = UserGroupRepoToPerm.query()\ + assigned_groups = UserGroupRepoToPerm.query() \ .filter(UserGroupRepoToPerm.users_group == user_group).all() assigned_groups = [x.repository.repo_name for x in assigned_groups] if assigned_groups and not force: raise UserGroupsAssignedException( 'User Group assigned to %s' % ", ".join(assigned_groups)) - self.sa.delete(user_group) + Session().delete(user_group) except Exception: log.error(traceback.format_exc()) raise def add_user_to_group(self, user_group, user): - user_group = self._get_user_group(user_group) - user = self._get_user(user) + user_group = UserGroup.guess_instance(user_group) + user = User.guess_instance(user) for m in user_group.members: u = m.user @@ -192,26 +184,26 @@ class UserGroupModel(BaseModel): user_group.members.append(user_group_member) user.group_member.append(user_group_member) - self.sa.add(user_group_member) + Session().add(user_group_member) return user_group_member except Exception: log.error(traceback.format_exc()) raise def remove_user_from_group(self, user_group, user): - user_group = self._get_user_group(user_group) - user = self._get_user(user) + user_group = UserGroup.guess_instance(user_group) + user = User.guess_instance(user) user_group_member = None for m in user_group.members: - if m.user.user_id == user.user_id: + if m.user_id == user.user_id: # Found this user's membership row user_group_member = m break if user_group_member: try: - self.sa.delete(user_group_member) + Session().delete(user_group_member) return True except Exception: log.error(traceback.format_exc()) @@ -221,21 +213,21 @@ class UserGroupModel(BaseModel): return False def has_perm(self, user_group, perm): - user_group = self._get_user_group(user_group) - perm = self._get_perm(perm) + user_group = UserGroup.guess_instance(user_group) + perm = Permission.guess_instance(perm) - return UserGroupToPerm.query()\ - .filter(UserGroupToPerm.users_group == user_group)\ + return UserGroupToPerm.query() \ + .filter(UserGroupToPerm.users_group == user_group) \ .filter(UserGroupToPerm.permission == perm).scalar() is not None def grant_perm(self, user_group, perm): - user_group = self._get_user_group(user_group) - perm = self._get_perm(perm) + user_group = UserGroup.guess_instance(user_group) + perm = Permission.guess_instance(perm) # if this permission is already granted skip it - _perm = UserGroupToPerm.query()\ - .filter(UserGroupToPerm.users_group == user_group)\ - .filter(UserGroupToPerm.permission == perm)\ + _perm = UserGroupToPerm.query() \ + .filter(UserGroupToPerm.users_group == user_group) \ + .filter(UserGroupToPerm.permission == perm) \ .scalar() if _perm: return @@ -243,18 +235,18 @@ class UserGroupModel(BaseModel): new = UserGroupToPerm() new.users_group = user_group new.permission = perm - self.sa.add(new) + Session().add(new) return new def revoke_perm(self, user_group, perm): - user_group = self._get_user_group(user_group) - perm = self._get_perm(perm) + user_group = UserGroup.guess_instance(user_group) + perm = Permission.guess_instance(perm) - obj = UserGroupToPerm.query()\ - .filter(UserGroupToPerm.users_group == user_group)\ + obj = UserGroupToPerm.query() \ + .filter(UserGroupToPerm.users_group == user_group) \ .filter(UserGroupToPerm.permission == perm).scalar() if obj is not None: - self.sa.delete(obj) + Session().delete(obj) def grant_user_permission(self, user_group, user, perm): """ @@ -267,22 +259,22 @@ class UserGroupModel(BaseModel): :param perm: Instance of Permission, or permission_name """ - user_group = self._get_user_group(user_group) - user = self._get_user(user) - permission = self._get_perm(perm) + user_group = UserGroup.guess_instance(user_group) + user = User.guess_instance(user) + permission = Permission.guess_instance(perm) # check if we have that permission already - obj = self.sa.query(UserUserGroupToPerm)\ - .filter(UserUserGroupToPerm.user == user)\ - .filter(UserUserGroupToPerm.user_group == user_group)\ + obj = UserUserGroupToPerm.query() \ + .filter(UserUserGroupToPerm.user == user) \ + .filter(UserUserGroupToPerm.user_group == user_group) \ .scalar() if obj is None: # create new ! obj = UserUserGroupToPerm() + Session().add(obj) obj.user_group = user_group obj.user = user obj.permission = permission - self.sa.add(obj) log.debug('Granted perm %s to %s on %s', perm, user, user_group) return obj @@ -295,15 +287,15 @@ class UserGroupModel(BaseModel): :param user: Instance of User, user_id or username """ - user_group = self._get_user_group(user_group) - user = self._get_user(user) + user_group = UserGroup.guess_instance(user_group) + user = User.guess_instance(user) - obj = self.sa.query(UserUserGroupToPerm)\ - .filter(UserUserGroupToPerm.user == user)\ - .filter(UserUserGroupToPerm.user_group == user_group)\ + obj = UserUserGroupToPerm.query() \ + .filter(UserUserGroupToPerm.user == user) \ + .filter(UserUserGroupToPerm.user_group == user_group) \ .scalar() if obj is not None: - self.sa.delete(obj) + Session().delete(obj) log.debug('Revoked perm on %s on %s', user_group, user) def grant_user_group_permission(self, target_user_group, user_group, perm): @@ -314,26 +306,26 @@ class UserGroupModel(BaseModel): :param user_group: :param perm: """ - target_user_group = self._get_user_group(target_user_group) - user_group = self._get_user_group(user_group) - permission = self._get_perm(perm) + target_user_group = UserGroup.guess_instance(target_user_group) + user_group = UserGroup.guess_instance(user_group) + permission = Permission.guess_instance(perm) # forbid assigning same user group to itself if target_user_group == user_group: raise RepoGroupAssignmentError('target repo:%s cannot be ' 'assigned to itself' % target_user_group) # check if we have that permission already - obj = self.sa.query(UserGroupUserGroupToPerm)\ - .filter(UserGroupUserGroupToPerm.target_user_group == target_user_group)\ - .filter(UserGroupUserGroupToPerm.user_group == user_group)\ + obj = UserGroupUserGroupToPerm.query() \ + .filter(UserGroupUserGroupToPerm.target_user_group == target_user_group) \ + .filter(UserGroupUserGroupToPerm.user_group == user_group) \ .scalar() if obj is None: # create new ! obj = UserGroupUserGroupToPerm() + Session().add(obj) obj.user_group = user_group obj.target_user_group = target_user_group obj.permission = permission - self.sa.add(obj) log.debug('Granted perm %s to %s on %s', perm, target_user_group, user_group) return obj @@ -344,19 +336,19 @@ class UserGroupModel(BaseModel): :param target_user_group: :param user_group: """ - target_user_group = self._get_user_group(target_user_group) - user_group = self._get_user_group(user_group) + target_user_group = UserGroup.guess_instance(target_user_group) + user_group = UserGroup.guess_instance(user_group) - obj = self.sa.query(UserGroupUserGroupToPerm)\ - .filter(UserGroupUserGroupToPerm.target_user_group == target_user_group)\ - .filter(UserGroupUserGroupToPerm.user_group == user_group)\ + obj = UserGroupUserGroupToPerm.query() \ + .filter(UserGroupUserGroupToPerm.target_user_group == target_user_group) \ + .filter(UserGroupUserGroupToPerm.user_group == user_group) \ .scalar() if obj is not None: - self.sa.delete(obj) + Session().delete(obj) log.debug('Revoked perm on %s on %s', target_user_group, user_group) def enforce_groups(self, user, groups, extern_type=None): - user = self._get_user(user) + user = User.guess_instance(user) log.debug('Enforcing groups %s on user %s', user, groups) current_groups = user.group_member # find the external created groups @@ -375,7 +367,7 @@ class UserGroupModel(BaseModel): for gr in set(groups): existing_group = UserGroup.get_by_group_name(gr) if not existing_group: - desc = 'Automatically created from plugin:%s' % extern_type + desc = u'Automatically created from plugin:%s' % extern_type # we use first admin account to set the owner of the group existing_group = UserGroupModel().create(gr, desc, owner, group_data={'extern_type': extern_type}) diff --git a/kallithea/model/validators.py b/kallithea/model/validators.py --- a/kallithea/model/validators.py +++ b/kallithea/model/validators.py @@ -20,7 +20,8 @@ import re import formencode import logging from collections import defaultdict -from pylons.i18n.translation import _ +from tg.i18n import ugettext as _ +from sqlalchemy import func from webhelpers.pylonslib.secure_form import authentication_token import sqlalchemy @@ -30,12 +31,12 @@ from formencode.validators import ( ) from kallithea.lib.compat import OrderedSet from kallithea.lib import ipaddr -from kallithea.lib.utils import repo_name_slug, is_valid_repo_uri -from kallithea.lib.utils2 import str2bool, aslist +from kallithea.lib.utils import is_valid_repo_uri +from kallithea.lib.utils2 import str2bool, aslist, repo_name_slug from kallithea.model.db import RepoGroup, Repository, UserGroup, User from kallithea.lib.exceptions import LdapImportError from kallithea.config.routing import ADMIN_PREFIX -from kallithea.lib.auth import HasRepoGroupPermissionAny, HasPermissionAny +from kallithea.lib.auth import HasRepoGroupPermissionLevel, HasPermissionAny # silence warnings and pylint UnicodeString, OneOf, Int, Number, Regex, Email, Bool, StringBoolean, Set, \ @@ -44,30 +45,6 @@ UnicodeString, OneOf, Int, Number, Regex log = logging.getLogger(__name__) -class StateObj(object): - """ - this is needed to translate the messages using _() in validators - """ - _ = staticmethod(_) - - -def M(self, key, state=None, **kwargs): - """ - returns string from self.message based on given key, - passed kw params are used to substitute %(named)s params inside - translated strings - - :param msg: - :param state: - """ - if state is None: - state = StateObj() - else: - state._ = staticmethod(_) - #inject validator into state object - return self.message(key, state, **kwargs) - - def UniqueListFromString(): class _UniqueListFromString(formencode.FancyValidator): """ @@ -89,7 +66,9 @@ def UniqueListFromString(): return _UniqueListFromString -def ValidUsername(edit=False, old_data={}): +def ValidUsername(edit=False, old_data=None): + old_data = old_data or {} + class _validator(formencode.validators.FancyValidator): messages = { 'username_exists': _('Username "%(username)s" already exists'), @@ -103,20 +82,20 @@ def ValidUsername(edit=False, old_data={ def validate_python(self, value, state): if value in ['default', 'new_user']: - msg = M(self, 'system_invalid_username', state, username=value) + msg = self.message('system_invalid_username', state, username=value) raise formencode.Invalid(msg, value, state) - #check if user is unique + # check if user is unique old_un = None if edit: old_un = User.get(old_data.get('user_id')).username if old_un != value or not edit: if User.get_by_username(value, case_insensitive=True): - msg = M(self, 'username_exists', state, username=value) + msg = self.message('username_exists', state, username=value) raise formencode.Invalid(msg, value, state) if re.match(r'^[a-zA-Z0-9\_]{1}[a-zA-Z0-9\-\_\.]*$', value) is None: - msg = M(self, 'invalid_username', state) + msg = self.message('invalid_username', state) raise formencode.Invalid(msg, value, state) return _validator @@ -135,10 +114,10 @@ def ValidRepoUser(): def validate_python(self, value, state): try: - User.query().filter(User.active == True)\ + User.query().filter(User.active == True) \ .filter(User.username == value).one() except sqlalchemy.exc.InvalidRequestError: # NoResultFound/MultipleResultsFound - msg = M(self, 'invalid_username', state, username=value) + msg = self.message('invalid_username', state, username=value) raise formencode.Invalid(msg, value, state, error_dict=dict(username=msg) ) @@ -146,7 +125,9 @@ def ValidRepoUser(): return _validator -def ValidUserGroup(edit=False, old_data={}): +def ValidUserGroup(edit=False, old_data=None): + old_data = old_data or {} + class _validator(formencode.validators.FancyValidator): messages = { 'invalid_group': _('Invalid user group name'), @@ -159,11 +140,11 @@ def ValidUserGroup(edit=False, old_data= def validate_python(self, value, state): if value in ['default']: - msg = M(self, 'invalid_group', state) + msg = self.message('invalid_group', state) raise formencode.Invalid(msg, value, state, error_dict=dict(users_group_name=msg) ) - #check if group is unique + # check if group is unique old_ugname = None if edit: old_id = old_data.get('users_group_id') @@ -173,13 +154,13 @@ def ValidUserGroup(edit=False, old_data= is_existing_group = UserGroup.get_by_group_name(value, case_insensitive=True) if is_existing_group: - msg = M(self, 'group_exist', state, usergroup=value) + msg = self.message('group_exist', state, usergroup=value) raise formencode.Invalid(msg, value, state, error_dict=dict(users_group_name=msg) ) if re.match(r'^[a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+$', value) is None: - msg = M(self, 'invalid_usergroup_name', state) + msg = self.message('invalid_usergroup_name', state) raise formencode.Invalid(msg, value, state, error_dict=dict(users_group_name=msg) ) @@ -187,10 +168,12 @@ def ValidUserGroup(edit=False, old_data= return _validator -def ValidRepoGroup(edit=False, old_data={}): +def ValidRepoGroup(edit=False, old_data=None): + old_data = old_data or {} + class _validator(formencode.validators.FancyValidator): messages = { - 'group_parent_id': _('Cannot assign this group as parent'), + 'parent_group_id': _('Cannot assign this group as parent'), 'group_exists': _('Group "%(group_name)s" already exists'), 'repo_exists': _('Repository with name "%(group_name)s" already exists') @@ -199,20 +182,20 @@ def ValidRepoGroup(edit=False, old_data= def validate_python(self, value, state): # TODO WRITE VALIDATIONS group_name = value.get('group_name') - group_parent_id = value.get('group_parent_id') + parent_group_id = value.get('parent_group_id') # slugify repo group just in case :) slug = repo_name_slug(group_name) # check for parent of self parent_of_self = lambda: ( - old_data['group_id'] == group_parent_id - if group_parent_id else False + old_data['group_id'] == parent_group_id + if parent_group_id else False ) if edit and parent_of_self(): - msg = M(self, 'group_parent_id', state) + msg = self.message('parent_group_id', state) raise formencode.Invalid(msg, value, state, - error_dict=dict(group_parent_id=msg) + error_dict=dict(parent_group_id=msg) ) old_gname = None @@ -222,24 +205,22 @@ def ValidRepoGroup(edit=False, old_data= if old_gname != group_name or not edit: # check group - gr = RepoGroup.query()\ - .filter(RepoGroup.group_name == slug)\ - .filter(RepoGroup.group_parent_id == group_parent_id)\ + gr = RepoGroup.query() \ + .filter(func.lower(RepoGroup.group_name) == func.lower(slug)) \ + .filter(RepoGroup.parent_group_id == parent_group_id) \ .scalar() - if gr is not None: - msg = M(self, 'group_exists', state, group_name=slug) + msg = self.message('group_exists', state, group_name=slug) raise formencode.Invalid(msg, value, state, error_dict=dict(group_name=msg) ) # check for same repo - repo = Repository.query()\ - .filter(Repository.repo_name == slug)\ + repo = Repository.query() \ + .filter(func.lower(Repository.repo_name) == func.lower(slug)) \ .scalar() - if repo is not None: - msg = M(self, 'repo_exists', state, group_name=slug) + msg = self.message('repo_exists', state, group_name=slug) raise formencode.Invalid(msg, value, state, error_dict=dict(group_name=msg) ) @@ -258,7 +239,7 @@ def ValidPassword(): try: (value or '').decode('ascii') except UnicodeError: - msg = M(self, 'invalid_password', state) + msg = self.message('invalid_password', state) raise formencode.Invalid(msg, value, state,) return _validator @@ -272,7 +253,7 @@ def ValidOldPassword(username): def validate_python(self, value, state): from kallithea.lib import auth_modules if auth_modules.authenticate(username, value, '') is None: - msg = M(self, 'invalid_password', state) + msg = self.message('invalid_password', state) raise formencode.Invalid(msg, value, state, error_dict=dict(current_password=msg) ) @@ -287,7 +268,7 @@ def ValidPasswordsMatch(password_field, def validate_python(self, value, state): if value.get(password_field) != value[password_confirmation_field]: - msg = M(self, 'password_mismatch', state) + msg = self.message('password_mismatch', state) raise formencode.Invalid(msg, value, state, error_dict={password_field:msg, password_confirmation_field: msg} ) @@ -309,16 +290,16 @@ def ValidAuth(): # authenticate returns unused dict but has called # plugin._authenticate which has create_or_update'ed the username user in db if auth_modules.authenticate(username, password) is None: - user = User.get_by_username(username) + user = User.get_by_username_or_email(username) if user and not user.active: log.warning('user %s is disabled', username) - msg = M(self, 'invalid_auth', state) + msg = self.message('invalid_auth', state) raise formencode.Invalid(msg, value, state, error_dict=dict(username=' ', password=msg) ) else: log.warning('user %s failed to authenticate', username) - msg = M(self, 'invalid_auth', state) + msg = self.message('invalid_auth', state) raise formencode.Invalid(msg, value, state, error_dict=dict(username=' ', password=msg) ) @@ -333,12 +314,14 @@ def ValidAuthToken(): def validate_python(self, value, state): if value != authentication_token(): - msg = M(self, 'invalid_token', state) + msg = self.message('invalid_token', state) raise formencode.Invalid(msg, value, state) return _validator -def ValidRepoName(edit=False, old_data={}): +def ValidRepoName(edit=False, old_data=None): + old_data = old_data or {} + class _validator(formencode.validators.FancyValidator): messages = { 'invalid_repo_name': @@ -373,14 +356,13 @@ def ValidRepoName(edit=False, old_data={ return value def validate_python(self, value, state): - repo_name = value.get('repo_name') repo_name_full = value.get('repo_name_full') group_path = value.get('group_path') group_name = value.get('group_name') if repo_name in [ADMIN_PREFIX, '']: - msg = M(self, 'invalid_repo_name', state, repo=repo_name) + msg = self.message('invalid_repo_name', state, repo=repo_name) raise formencode.Invalid(msg, value, state, error_dict=dict(repo_name=msg) ) @@ -388,24 +370,24 @@ def ValidRepoName(edit=False, old_data={ rename = old_data.get('repo_name') != repo_name_full create = not edit if rename or create: - + repo = Repository.get_by_repo_name(repo_name_full, case_insensitive=True) + repo_group = RepoGroup.get_by_group_name(repo_name_full, case_insensitive=True) if group_path != '': - if Repository.get_by_repo_name(repo_name_full): - msg = M(self, 'repository_in_group_exists', state, - repo=repo_name, group=group_name) + if repo is not None: + msg = self.message('repository_in_group_exists', state, + repo=repo.repo_name, group=group_name) raise formencode.Invalid(msg, value, state, error_dict=dict(repo_name=msg) ) - elif RepoGroup.get_by_group_name(repo_name_full): - msg = M(self, 'same_group_exists', state, + elif repo_group is not None: + msg = self.message('same_group_exists', state, repo=repo_name) raise formencode.Invalid(msg, value, state, error_dict=dict(repo_name=msg) ) - - elif Repository.get_by_repo_name(repo_name_full): - msg = M(self, 'repository_exists', state, - repo=repo_name) + elif repo is not None: + msg = self.message('repository_exists', state, + repo=repo.repo_name) raise formencode.Invalid(msg, value, state, error_dict=dict(repo_name=msg) ) @@ -448,14 +430,16 @@ def ValidCloneUri(): is_valid_repo_uri(repo_type, url, make_ui('db', clear_session=False)) except Exception: log.exception('URL validation failed') - msg = M(self, 'clone_uri') + msg = self.message('clone_uri', state) raise formencode.Invalid(msg, value, state, error_dict=dict(clone_uri=msg) ) return _validator -def ValidForkType(old_data={}): +def ValidForkType(old_data=None): + old_data = old_data or {} + class _validator(formencode.validators.FancyValidator): messages = { 'invalid_fork_type': _('Fork has to be the same type as parent') @@ -463,7 +447,7 @@ def ValidForkType(old_data={}): def validate_python(self, value, state): if old_data['repo_type'] != value: - msg = M(self, 'invalid_fork_type', state) + msg = self.message('invalid_fork_type', state) raise formencode.Invalid(msg, value, state, error_dict=dict(repo_type=msg) ) @@ -480,7 +464,7 @@ def CanWriteGroup(old_data=None): } def _to_python(self, value, state): - #root location + # root location if value == -1: return None return value @@ -491,9 +475,9 @@ def CanWriteGroup(old_data=None): # create repositories with write permission on group is set to true create_on_write = HasPermissionAny('hg.create.write_on_repogroup.true')() - group_admin = HasRepoGroupPermissionAny('group.admin')(gr_name, + group_admin = HasRepoGroupPermissionLevel('admin')(gr_name, 'can write into group validator') - group_write = HasRepoGroupPermissionAny('group.write')(gr_name, + group_write = HasRepoGroupPermissionLevel('write')(gr_name, 'can write into group validator') forbidden = not (group_admin or (group_write and create_on_write)) can_create_repos = HasPermissionAny('hg.admin', 'hg.create.repository') @@ -506,15 +490,15 @@ def CanWriteGroup(old_data=None): # don't need to check permission if he didn't change the value of # groups in form box if value_changed or new: - #parent group need to be existing + # parent group need to be existing if gr and forbidden: - msg = M(self, 'permission_denied', state) + msg = self.message('permission_denied', state) raise formencode.Invalid(msg, value, state, error_dict=dict(repo_type=msg) ) ## check if we can write to root location ! elif gr is None and not can_create_repos(): - msg = M(self, 'permission_denied_root', state) + msg = self.message('permission_denied_root', state) raise formencode.Invalid(msg, value, state, error_dict=dict(repo_type=msg) ) @@ -530,7 +514,7 @@ def CanCreateGroup(can_create_in_root=Fa } def to_python(self, value, state): - #root location + # root location if value == -1: return None return value @@ -540,16 +524,15 @@ def CanCreateGroup(can_create_in_root=Fa gr_name = gr.group_name if gr is not None else None # None means ROOT location if can_create_in_root and gr is None: - #we can create in root, we're fine no validations required + # we can create in root, we're fine no validations required return forbidden_in_root = gr is None and not can_create_in_root - val = HasRepoGroupPermissionAny('group.admin') - forbidden = not val(gr_name, 'can create group validator') + forbidden = not HasRepoGroupPermissionLevel('admin')(gr_name, 'can create group validator') if forbidden_in_root or forbidden: - msg = M(self, 'permission_denied', state) + msg = self.message('permission_denied', state) raise formencode.Invalid(msg, value, state, - error_dict=dict(group_parent_id=msg) + error_dict=dict(parent_group_id=msg) ) return _validator @@ -574,7 +557,7 @@ def ValidPerms(type_='repo'): perms_new = OrderedSet() # build a list of permission to update and new permission to create - #CLEAN OUT ORG VALUE FROM NEW MEMBERS, and group them using + # CLEAN OUT ORG VALUE FROM NEW MEMBERS, and group them using new_perms_group = defaultdict(dict) for k, v in value.copy().iteritems(): if k.startswith('perm_new_member'): @@ -616,17 +599,17 @@ def ValidPerms(type_='repo'): for k, v, t in perms_new: try: if t is 'user': - self.user_db = User.query()\ - .filter(User.active == True)\ + self.user_db = User.query() \ + .filter(User.active == True) \ .filter(User.username == k).one() if t is 'users_group': - self.user_db = UserGroup.query()\ - .filter(UserGroup.users_group_active == True)\ + self.user_db = UserGroup.query() \ + .filter(UserGroup.users_group_active == True) \ .filter(UserGroup.users_group_name == k).one() except Exception: log.exception('Updated permission failed') - msg = M(self, 'perm_new_member_type', state) + msg = self.message('perm_new_member_type', state) raise formencode.Invalid(msg, value, state, error_dict=dict(perm_new_member_name=msg) ) @@ -664,14 +647,16 @@ def ValidPath(): def validate_python(self, value, state): if not os.path.isdir(value): - msg = M(self, 'invalid_path', state) + msg = self.message('invalid_path', state) raise formencode.Invalid(msg, value, state, error_dict=dict(paths_root_path=msg) ) return _validator -def UniqSystemEmail(old_data={}): +def UniqSystemEmail(old_data=None): + old_data = old_data or {} + class _validator(formencode.validators.FancyValidator): messages = { 'email_taken': _('This email address is already in use') @@ -682,9 +667,9 @@ def UniqSystemEmail(old_data={}): def validate_python(self, value, state): if (old_data.get('email') or '').lower() != value: - user = User.get_by_email(value, case_insensitive=True) + user = User.get_by_email(value) if user is not None: - msg = M(self, 'email_taken', state) + msg = self.message('email_taken', state) raise formencode.Invalid(msg, value, state, error_dict=dict(email=msg) ) @@ -701,9 +686,9 @@ def ValidSystemEmail(): return value.lower() def validate_python(self, value, state): - user = User.get_by_email(value, case_insensitive=True) + user = User.get_by_email(value) if user is None: - msg = M(self, 'non_existing_email', state, email=value) + msg = self.message('non_existing_email', state, email=value) raise formencode.Invalid(msg, value, state, error_dict=dict(email=msg) ) @@ -753,11 +738,11 @@ def ValidIp(): v = v.strip() net = ipaddr.IPNetwork(address=v) if isinstance(net, ipaddr.IPv4Network): - #if IPv4 doesn't end with a mask, add /32 + # if IPv4 doesn't end with a mask, add /32 if '/' not in value: v += '/32' if isinstance(net, ipaddr.IPv6Network): - #if IPv6 doesn't end with a mask, add /128 + # if IPv6 doesn't end with a mask, add /128 if '/' not in value: v += '/128' return v @@ -765,7 +750,7 @@ def ValidIp(): def validate_python(self, value, state): try: addr = value.strip() - #this raises an ValueError if address is not IPv4 or IPv6 + # this raises an ValueError if address is not IPv4 or IPv6 ipaddr.IPNetwork(address=addr) except ValueError: raise formencode.Invalid(self.message('badFormat', state), @@ -823,7 +808,7 @@ def ValidAuthPlugins(): plugin = auth_modules.loadplugin(module) plugin_name = plugin.name if plugin_name in unique_names: - msg = M(self, 'import_duplicate', state, + msg = self.message('import_duplicate', state, loaded=unique_names[plugin_name], next_to_load=plugin_name) raise formencode.Invalid(msg, value, state) diff --git a/kallithea/public/codemirror/LICENSE b/kallithea/public/codemirror/LICENSE deleted file mode 100644 --- a/kallithea/public/codemirror/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (C) 2014 by Marijn Haverbeke and others - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/kallithea/public/codemirror/lib/codemirror.css b/kallithea/public/codemirror/lib/codemirror.css deleted file mode 100644 --- a/kallithea/public/codemirror/lib/codemirror.css +++ /dev/null @@ -1,309 +0,0 @@ -/* BASICS */ - -.CodeMirror { - /* Set height, width, borders, and global font properties here */ - font-family: monospace; - height: 300px; -} -.CodeMirror-scroll { - /* Set scrolling behaviour here */ - overflow: auto; -} - -/* PADDING */ - -.CodeMirror-lines { - padding: 4px 0; /* Vertical padding around content */ -} -.CodeMirror pre { - padding: 0 4px; /* Horizontal padding of content */ -} - -.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler { - background-color: white; /* The little square between H and V scrollbars */ -} - -/* GUTTER */ - -.CodeMirror-gutters { - border-right: 1px solid #ddd; - background-color: #f7f7f7; - white-space: nowrap; -} -.CodeMirror-linenumbers {} -.CodeMirror-linenumber { - padding: 0 3px 0 5px; - min-width: 20px; - text-align: right; - color: #999; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - -.CodeMirror-guttermarker { color: black; } -.CodeMirror-guttermarker-subtle { color: #999; } - -/* CURSOR */ - -.CodeMirror div.CodeMirror-cursor { - border-left: 1px solid black; -} -/* Shown when moving in bi-directional text */ -.CodeMirror div.CodeMirror-secondarycursor { - border-left: 1px solid silver; -} -.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor { - width: auto; - border: 0; - background: #7e7; -} -.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursors { - z-index: 1; -} - -.cm-animate-fat-cursor { - width: auto; - border: 0; - -webkit-animation: blink 1.06s steps(1) infinite; - -moz-animation: blink 1.06s steps(1) infinite; - animation: blink 1.06s steps(1) infinite; -} -@-moz-keyframes blink { - 0% { background: #7e7; } - 50% { background: none; } - 100% { background: #7e7; } -} -@-webkit-keyframes blink { - 0% { background: #7e7; } - 50% { background: none; } - 100% { background: #7e7; } -} -@keyframes blink { - 0% { background: #7e7; } - 50% { background: none; } - 100% { background: #7e7; } -} - -/* Can style cursor different in overwrite (non-insert) mode */ -div.CodeMirror-overwrite div.CodeMirror-cursor {} - -.cm-tab { display: inline-block; text-decoration: inherit; } - -.CodeMirror-ruler { - border-left: 1px solid #ccc; - position: absolute; -} - -/* DEFAULT THEME */ - -.cm-s-default .cm-keyword {color: #708;} -.cm-s-default .cm-atom {color: #219;} -.cm-s-default .cm-number {color: #164;} -.cm-s-default .cm-def {color: #00f;} -.cm-s-default .cm-variable, -.cm-s-default .cm-punctuation, -.cm-s-default .cm-property, -.cm-s-default .cm-operator {} -.cm-s-default .cm-variable-2 {color: #05a;} -.cm-s-default .cm-variable-3 {color: #085;} -.cm-s-default .cm-comment {color: #a50;} -.cm-s-default .cm-string {color: #a11;} -.cm-s-default .cm-string-2 {color: #f50;} -.cm-s-default .cm-meta {color: #555;} -.cm-s-default .cm-qualifier {color: #555;} -.cm-s-default .cm-builtin {color: #30a;} -.cm-s-default .cm-bracket {color: #997;} -.cm-s-default .cm-tag {color: #170;} -.cm-s-default .cm-attribute {color: #00c;} -.cm-s-default .cm-header {color: blue;} -.cm-s-default .cm-quote {color: #090;} -.cm-s-default .cm-hr {color: #999;} -.cm-s-default .cm-link {color: #00c;} - -.cm-negative {color: #d44;} -.cm-positive {color: #292;} -.cm-header, .cm-strong {font-weight: bold;} -.cm-em {font-style: italic;} -.cm-link {text-decoration: underline;} - -.cm-s-default .cm-error {color: #f00;} -.cm-invalidchar {color: #f00;} - -/* Default styles for common addons */ - -div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;} -div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} -.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); } -.CodeMirror-activeline-background {background: #e8f2ff;} - -/* STOP */ - -/* The rest of this file contains styles related to the mechanics of - the editor. You probably shouldn't touch them. */ - -.CodeMirror { - line-height: 1; - position: relative; - overflow: hidden; - background: white; - color: black; -} - -.CodeMirror-scroll { - /* 30px is the magic margin used to hide the element's real scrollbars */ - /* See overflow: hidden in .CodeMirror */ - margin-bottom: -30px; margin-right: -30px; - padding-bottom: 30px; - height: 100%; - outline: none; /* Prevent dragging from highlighting the element */ - position: relative; - -moz-box-sizing: content-box; - box-sizing: content-box; -} -.CodeMirror-sizer { - position: relative; - border-right: 30px solid transparent; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - -/* The fake, visible scrollbars. Used to force redraw during scrolling - before actuall scrolling happens, thus preventing shaking and - flickering artifacts. */ -.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler { - position: absolute; - z-index: 6; - display: none; -} -.CodeMirror-vscrollbar { - right: 0; top: 0; - overflow-x: hidden; - overflow-y: scroll; -} -.CodeMirror-hscrollbar { - bottom: 0; left: 0; - overflow-y: hidden; - overflow-x: scroll; -} -.CodeMirror-scrollbar-filler { - right: 0; bottom: 0; -} -.CodeMirror-gutter-filler { - left: 0; bottom: 0; -} - -.CodeMirror-gutters { - position: absolute; left: 0; top: 0; - padding-bottom: 30px; - z-index: 3; -} -.CodeMirror-gutter { - white-space: normal; - height: 100%; - -moz-box-sizing: content-box; - box-sizing: content-box; - padding-bottom: 30px; - margin-bottom: -32px; - display: inline-block; - /* Hack to make IE7 behave */ - *zoom:1; - *display:inline; -} -.CodeMirror-gutter-elt { - position: absolute; - cursor: default; - z-index: 4; -} - -.CodeMirror-lines { - cursor: text; - min-height: 1px; /* prevents collapsing before first draw */ -} -.CodeMirror pre { - /* Reset some styles that the rest of the page might have set */ - -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; - border-width: 0; - background: transparent; - font-family: inherit; - font-size: inherit; - margin: 0; - white-space: pre; - word-wrap: normal; - line-height: inherit; - color: inherit; - z-index: 2; - position: relative; - overflow: visible; -} -.CodeMirror-wrap pre { - word-wrap: break-word; - white-space: pre-wrap; - word-break: normal; -} - -.CodeMirror-linebackground { - position: absolute; - left: 0; right: 0; top: 0; bottom: 0; - z-index: 0; -} - -.CodeMirror-linewidget { - position: relative; - z-index: 2; - overflow: auto; -} - -.CodeMirror-widget {} - -.CodeMirror-wrap .CodeMirror-scroll { - overflow-x: hidden; -} - -.CodeMirror-measure { - position: absolute; - width: 100%; - height: 0; - overflow: hidden; - visibility: hidden; -} -.CodeMirror-measure pre { position: static; } - -.CodeMirror div.CodeMirror-cursor { - position: absolute; - border-right: none; - width: 0; -} - -div.CodeMirror-cursors { - visibility: hidden; - position: relative; - z-index: 3; -} -.CodeMirror-focused div.CodeMirror-cursors { - visibility: visible; -} - -.CodeMirror-selected { background: #d9d9d9; } -.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; } -.CodeMirror-crosshair { cursor: crosshair; } - -.cm-searching { - background: #ffa; - background: rgba(255, 255, 0, .4); -} - -/* IE7 hack to prevent it from returning funny offsetTops on the spans */ -.CodeMirror span { *vertical-align: text-bottom; } - -/* Used to force a border model for a node */ -.cm-force-border { padding-right: .1px; } - -@media print { - /* Hide the cursor when printing */ - .CodeMirror div.CodeMirror-cursors { - visibility: hidden; - } -} - -/* Help users use markselection to safely style text background */ -span.CodeMirror-selectedtext { background: none; } diff --git a/kallithea/public/codemirror/lib/codemirror.js b/kallithea/public/codemirror/lib/codemirror.js deleted file mode 100644 --- a/kallithea/public/codemirror/lib/codemirror.js +++ /dev/null @@ -1,7830 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// This is CodeMirror (http://codemirror.net), a code editor -// implemented in JavaScript on top of the browser's DOM. -// -// You can find some technical background for some of the code below -// at http://marijnhaverbeke.nl/blog/#cm-internals . - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - module.exports = mod(); - else if (typeof define == "function" && define.amd) // AMD - return define([], mod); - else // Plain browser env - this.CodeMirror = mod(); -})(function() { - "use strict"; - - // BROWSER SNIFFING - - // Kludges for bugs and behavior differences that can't be feature - // detected are enabled based on userAgent etc sniffing. - - var gecko = /gecko\/\d/i.test(navigator.userAgent); - // ie_uptoN means Internet Explorer version N or lower - var ie_upto10 = /MSIE \d/.test(navigator.userAgent); - var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent); - var ie = ie_upto10 || ie_11up; - var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]); - var webkit = /WebKit\//.test(navigator.userAgent); - var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent); - var chrome = /Chrome\//.test(navigator.userAgent); - var presto = /Opera\//.test(navigator.userAgent); - var safari = /Apple Computer/.test(navigator.vendor); - var khtml = /KHTML\//.test(navigator.userAgent); - var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent); - var phantom = /PhantomJS/.test(navigator.userAgent); - - var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent); - // This is woefully incomplete. Suggestions for alternative methods welcome. - var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent); - var mac = ios || /Mac/.test(navigator.platform); - var windows = /win/i.test(navigator.platform); - - var presto_version = presto && navigator.userAgent.match(/Version\/(\d*\.\d*)/); - if (presto_version) presto_version = Number(presto_version[1]); - if (presto_version && presto_version >= 15) { presto = false; webkit = true; } - // Some browsers use the wrong event properties to signal cmd/ctrl on OS X - var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11)); - var captureRightClick = gecko || (ie && ie_version >= 9); - - // Optimize some code when these features are not used. - var sawReadOnlySpans = false, sawCollapsedSpans = false; - - // EDITOR CONSTRUCTOR - - // A CodeMirror instance represents an editor. This is the object - // that user code is usually dealing with. - - function CodeMirror(place, options) { - if (!(this instanceof CodeMirror)) return new CodeMirror(place, options); - - this.options = options = options ? copyObj(options) : {}; - // Determine effective options based on given values and defaults. - copyObj(defaults, options, false); - setGuttersForLineNumbers(options); - - var doc = options.value; - if (typeof doc == "string") doc = new Doc(doc, options.mode); - this.doc = doc; - - var display = this.display = new Display(place, doc); - display.wrapper.CodeMirror = this; - updateGutters(this); - themeChanged(this); - if (options.lineWrapping) - this.display.wrapper.className += " CodeMirror-wrap"; - if (options.autofocus && !mobile) focusInput(this); - - this.state = { - keyMaps: [], // stores maps added by addKeyMap - overlays: [], // highlighting overlays, as added by addOverlay - modeGen: 0, // bumped when mode/overlay changes, used to invalidate highlighting info - overwrite: false, focused: false, - suppressEdits: false, // used to disable editing during key handlers when in readOnly mode - pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in readInput - draggingText: false, - highlight: new Delayed() // stores highlight worker timeout - }; - - // Override magic textarea content restore that IE sometimes does - // on our hidden textarea on reload - if (ie && ie_version < 11) setTimeout(bind(resetInput, this, true), 20); - - registerEventHandlers(this); - ensureGlobalHandlers(); - - startOperation(this); - this.curOp.forceUpdate = true; - attachDoc(this, doc); - - if ((options.autofocus && !mobile) || activeElt() == display.input) - setTimeout(bind(onFocus, this), 20); - else - onBlur(this); - - for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt)) - optionHandlers[opt](this, options[opt], Init); - maybeUpdateLineNumberWidth(this); - for (var i = 0; i < initHooks.length; ++i) initHooks[i](this); - endOperation(this); - } - - // DISPLAY CONSTRUCTOR - - // The display handles the DOM integration, both for input reading - // and content drawing. It holds references to DOM nodes and - // display-related state. - - function Display(place, doc) { - var d = this; - - // The semihidden textarea that is focused when the editor is - // focused, and receives input. - var input = d.input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none"); - // The textarea is kept positioned near the cursor to prevent the - // fact that it'll be scrolled into view on input from scrolling - // our fake cursor out of view. On webkit, when wrap=off, paste is - // very slow. So make the area wide instead. - if (webkit) input.style.width = "1000px"; - else input.setAttribute("wrap", "off"); - // If border: 0; -- iOS fails to open keyboard (issue #1287) - if (ios) input.style.border = "1px solid black"; - input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off"); input.setAttribute("spellcheck", "false"); - - // Wraps and hides input textarea - d.inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;"); - // The fake scrollbar elements. - d.scrollbarH = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar"); - d.scrollbarV = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar"); - // Covers bottom-right square when both scrollbars are present. - d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler"); - // Covers bottom of gutter when coverGutterNextToScrollbar is on - // and h scrollbar is present. - d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler"); - // Will contain the actual code, positioned to cover the viewport. - d.lineDiv = elt("div", null, "CodeMirror-code"); - // Elements are added to these to represent selection and cursors. - d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1"); - d.cursorDiv = elt("div", null, "CodeMirror-cursors"); - // A visibility: hidden element used to find the size of things. - d.measure = elt("div", null, "CodeMirror-measure"); - // When lines outside of the viewport are measured, they are drawn in this. - d.lineMeasure = elt("div", null, "CodeMirror-measure"); - // Wraps everything that needs to exist inside the vertically-padded coordinate system - d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv], - null, "position: relative; outline: none"); - // Moved around its parent to cover visible view. - d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative"); - // Set to the height of the document, allowing scrolling. - d.sizer = elt("div", [d.mover], "CodeMirror-sizer"); - // Behavior of elts with overflow: auto and padding is - // inconsistent across browsers. This is used to ensure the - // scrollable area is big enough. - d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerCutOff + "px; width: 1px;"); - // Will contain the gutters, if any. - d.gutters = elt("div", null, "CodeMirror-gutters"); - d.lineGutter = null; - // Actual scrollable element. - d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll"); - d.scroller.setAttribute("tabIndex", "-1"); - // The element in which the editor lives. - d.wrapper = elt("div", [d.inputDiv, d.scrollbarH, d.scrollbarV, - d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror"); - - // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported) - if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; } - // Needed to hide big blue blinking cursor on Mobile Safari - if (ios) input.style.width = "0px"; - if (!webkit) d.scroller.draggable = true; - // Needed to handle Tab key in KHTML - if (khtml) { d.inputDiv.style.height = "1px"; d.inputDiv.style.position = "absolute"; } - // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8). - if (ie && ie_version < 8) d.scrollbarH.style.minHeight = d.scrollbarV.style.minWidth = "18px"; - - if (place.appendChild) place.appendChild(d.wrapper); - else place(d.wrapper); - - // Current rendered range (may be bigger than the view window). - d.viewFrom = d.viewTo = doc.first; - // Information about the rendered lines. - d.view = []; - // Holds info about a single rendered line when it was rendered - // for measurement, while not in view. - d.externalMeasured = null; - // Empty space (in pixels) above the view - d.viewOffset = 0; - d.lastSizeC = 0; - d.updateLineNumbers = null; - - // Used to only resize the line number gutter when necessary (when - // the amount of lines crosses a boundary that makes its width change) - d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null; - // See readInput and resetInput - d.prevInput = ""; - // Set to true when a non-horizontal-scrolling line widget is - // added. As an optimization, line widget aligning is skipped when - // this is false. - d.alignWidgets = false; - // Flag that indicates whether we expect input to appear real soon - // now (after some event like 'keypress' or 'input') and are - // polling intensively. - d.pollingFast = false; - // Self-resetting timeout for the poller - d.poll = new Delayed(); - - d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null; - - // Tracks when resetInput has punted to just putting a short - // string into the textarea instead of the full selection. - d.inaccurateSelection = false; - - // Tracks the maximum line length so that the horizontal scrollbar - // can be kept static when scrolling. - d.maxLine = null; - d.maxLineLength = 0; - d.maxLineChanged = false; - - // Used for measuring wheel scrolling granularity - d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null; - - // True when shift is held down. - d.shift = false; - - // Used to track whether anything happened since the context menu - // was opened. - d.selForContextMenu = null; - } - - // STATE UPDATES - - // Used to get the editor into a consistent state again when options change. - - function loadMode(cm) { - cm.doc.mode = CodeMirror.getMode(cm.options, cm.doc.modeOption); - resetModeState(cm); - } - - function resetModeState(cm) { - cm.doc.iter(function(line) { - if (line.stateAfter) line.stateAfter = null; - if (line.styles) line.styles = null; - }); - cm.doc.frontier = cm.doc.first; - startWorker(cm, 100); - cm.state.modeGen++; - if (cm.curOp) regChange(cm); - } - - function wrappingChanged(cm) { - if (cm.options.lineWrapping) { - addClass(cm.display.wrapper, "CodeMirror-wrap"); - cm.display.sizer.style.minWidth = ""; - } else { - rmClass(cm.display.wrapper, "CodeMirror-wrap"); - findMaxLine(cm); - } - estimateLineHeights(cm); - regChange(cm); - clearCaches(cm); - setTimeout(function(){updateScrollbars(cm);}, 100); - } - - // Returns a function that estimates the height of a line, to use as - // first approximation until the line becomes visible (and is thus - // properly measurable). - function estimateHeight(cm) { - var th = textHeight(cm.display), wrapping = cm.options.lineWrapping; - var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3); - return function(line) { - if (lineIsHidden(cm.doc, line)) return 0; - - var widgetsHeight = 0; - if (line.widgets) for (var i = 0; i < line.widgets.length; i++) { - if (line.widgets[i].height) widgetsHeight += line.widgets[i].height; - } - - if (wrapping) - return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th; - else - return widgetsHeight + th; - }; - } - - function estimateLineHeights(cm) { - var doc = cm.doc, est = estimateHeight(cm); - doc.iter(function(line) { - var estHeight = est(line); - if (estHeight != line.height) updateLineHeight(line, estHeight); - }); - } - - function keyMapChanged(cm) { - var map = keyMap[cm.options.keyMap], style = map.style; - cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") + - (style ? " cm-keymap-" + style : ""); - } - - function themeChanged(cm) { - cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") + - cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-"); - clearCaches(cm); - } - - function guttersChanged(cm) { - updateGutters(cm); - regChange(cm); - setTimeout(function(){alignHorizontally(cm);}, 20); - } - - // Rebuild the gutter elements, ensure the margin to the left of the - // code matches their width. - function updateGutters(cm) { - var gutters = cm.display.gutters, specs = cm.options.gutters; - removeChildren(gutters); - for (var i = 0; i < specs.length; ++i) { - var gutterClass = specs[i]; - var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass)); - if (gutterClass == "CodeMirror-linenumbers") { - cm.display.lineGutter = gElt; - gElt.style.width = (cm.display.lineNumWidth || 1) + "px"; - } - } - gutters.style.display = i ? "" : "none"; - updateGutterSpace(cm); - } - - function updateGutterSpace(cm) { - var width = cm.display.gutters.offsetWidth; - cm.display.sizer.style.marginLeft = width + "px"; - cm.display.scrollbarH.style.left = cm.options.fixedGutter ? width + "px" : 0; - } - - // Compute the character length of a line, taking into account - // collapsed ranges (see markText) that might hide parts, and join - // other lines onto it. - function lineLength(line) { - if (line.height == 0) return 0; - var len = line.text.length, merged, cur = line; - while (merged = collapsedSpanAtStart(cur)) { - var found = merged.find(0, true); - cur = found.from.line; - len += found.from.ch - found.to.ch; - } - cur = line; - while (merged = collapsedSpanAtEnd(cur)) { - var found = merged.find(0, true); - len -= cur.text.length - found.from.ch; - cur = found.to.line; - len += cur.text.length - found.to.ch; - } - return len; - } - - // Find the longest line in the document. - function findMaxLine(cm) { - var d = cm.display, doc = cm.doc; - d.maxLine = getLine(doc, doc.first); - d.maxLineLength = lineLength(d.maxLine); - d.maxLineChanged = true; - doc.iter(function(line) { - var len = lineLength(line); - if (len > d.maxLineLength) { - d.maxLineLength = len; - d.maxLine = line; - } - }); - } - - // Make sure the gutters options contains the element - // "CodeMirror-linenumbers" when the lineNumbers option is true. - function setGuttersForLineNumbers(options) { - var found = indexOf(options.gutters, "CodeMirror-linenumbers"); - if (found == -1 && options.lineNumbers) { - options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]); - } else if (found > -1 && !options.lineNumbers) { - options.gutters = options.gutters.slice(0); - options.gutters.splice(found, 1); - } - } - - // SCROLLBARS - - function hScrollbarTakesSpace(cm) { - return cm.display.scroller.clientHeight - cm.display.wrapper.clientHeight < scrollerCutOff - 3; - } - - // Prepare DOM reads needed to update the scrollbars. Done in one - // shot to minimize update/measure roundtrips. - function measureForScrollbars(cm) { - var scroll = cm.display.scroller; - return { - clientHeight: scroll.clientHeight, - barHeight: cm.display.scrollbarV.clientHeight, - scrollWidth: scroll.scrollWidth, clientWidth: scroll.clientWidth, - hScrollbarTakesSpace: hScrollbarTakesSpace(cm), - barWidth: cm.display.scrollbarH.clientWidth, - docHeight: Math.round(cm.doc.height + paddingVert(cm.display)) - }; - } - - // Re-synchronize the fake scrollbars with the actual size of the - // content. - function updateScrollbars(cm, measure) { - if (!measure) measure = measureForScrollbars(cm); - var d = cm.display, sWidth = scrollbarWidth(d.measure); - var scrollHeight = measure.docHeight + scrollerCutOff; - var needsH = measure.scrollWidth > measure.clientWidth; - if (needsH && measure.scrollWidth <= measure.clientWidth + 1 && - sWidth > 0 && !measure.hScrollbarTakesSpace) - needsH = false; // (Issue #2562) - var needsV = scrollHeight > measure.clientHeight; - - if (needsV) { - d.scrollbarV.style.display = "block"; - d.scrollbarV.style.bottom = needsH ? sWidth + "px" : "0"; - // A bug in IE8 can cause this value to be negative, so guard it. - d.scrollbarV.firstChild.style.height = - Math.max(0, scrollHeight - measure.clientHeight + (measure.barHeight || d.scrollbarV.clientHeight)) + "px"; - } else { - d.scrollbarV.style.display = ""; - d.scrollbarV.firstChild.style.height = "0"; - } - if (needsH) { - d.scrollbarH.style.display = "block"; - d.scrollbarH.style.right = needsV ? sWidth + "px" : "0"; - d.scrollbarH.firstChild.style.width = - (measure.scrollWidth - measure.clientWidth + (measure.barWidth || d.scrollbarH.clientWidth)) + "px"; - } else { - d.scrollbarH.style.display = ""; - d.scrollbarH.firstChild.style.width = "0"; - } - if (needsH && needsV) { - d.scrollbarFiller.style.display = "block"; - d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = sWidth + "px"; - } else d.scrollbarFiller.style.display = ""; - if (needsH && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) { - d.gutterFiller.style.display = "block"; - d.gutterFiller.style.height = sWidth + "px"; - d.gutterFiller.style.width = d.gutters.offsetWidth + "px"; - } else d.gutterFiller.style.display = ""; - - if (!cm.state.checkedOverlayScrollbar && measure.clientHeight > 0) { - if (sWidth === 0) { - var w = mac && !mac_geMountainLion ? "12px" : "18px"; - d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = w; - var barMouseDown = function(e) { - if (e_target(e) != d.scrollbarV && e_target(e) != d.scrollbarH) - operation(cm, onMouseDown)(e); - }; - on(d.scrollbarV, "mousedown", barMouseDown); - on(d.scrollbarH, "mousedown", barMouseDown); - } - cm.state.checkedOverlayScrollbar = true; - } - } - - // Compute the lines that are visible in a given viewport (defaults - // the the current scroll position). viewport may contain top, - // height, and ensure (see op.scrollToPos) properties. - function visibleLines(display, doc, viewport) { - var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop; - top = Math.floor(top - paddingTop(display)); - var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight; - - var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom); - // Ensure is a {from: {line, ch}, to: {line, ch}} object, and - // forces those lines into the viewport (if possible). - if (viewport && viewport.ensure) { - var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line; - if (ensureFrom < from) - return {from: ensureFrom, - to: lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight)}; - if (Math.min(ensureTo, doc.lastLine()) >= to) - return {from: lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight), - to: ensureTo}; - } - return {from: from, to: Math.max(to, from + 1)}; - } - - // LINE NUMBERS - - // Re-align line numbers and gutter marks to compensate for - // horizontal scrolling. - function alignHorizontally(cm) { - var display = cm.display, view = display.view; - if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return; - var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft; - var gutterW = display.gutters.offsetWidth, left = comp + "px"; - for (var i = 0; i < view.length; i++) if (!view[i].hidden) { - if (cm.options.fixedGutter && view[i].gutter) - view[i].gutter.style.left = left; - var align = view[i].alignable; - if (align) for (var j = 0; j < align.length; j++) - align[j].style.left = left; - } - if (cm.options.fixedGutter) - display.gutters.style.left = (comp + gutterW) + "px"; - } - - // Used to ensure that the line number gutter is still the right - // size for the current document size. Returns true when an update - // is needed. - function maybeUpdateLineNumberWidth(cm) { - if (!cm.options.lineNumbers) return false; - var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display; - if (last.length != display.lineNumChars) { - var test = display.measure.appendChild(elt("div", [elt("div", last)], - "CodeMirror-linenumber CodeMirror-gutter-elt")); - var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW; - display.lineGutter.style.width = ""; - display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding); - display.lineNumWidth = display.lineNumInnerWidth + padding; - display.lineNumChars = display.lineNumInnerWidth ? last.length : -1; - display.lineGutter.style.width = display.lineNumWidth + "px"; - updateGutterSpace(cm); - return true; - } - return false; - } - - function lineNumberFor(options, i) { - return String(options.lineNumberFormatter(i + options.firstLineNumber)); - } - - // Computes display.scroller.scrollLeft + display.gutters.offsetWidth, - // but using getBoundingClientRect to get a sub-pixel-accurate - // result. - function compensateForHScroll(display) { - return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left; - } - - // DISPLAY DRAWING - - function DisplayUpdate(cm, viewport, force) { - var display = cm.display; - - this.viewport = viewport; - // Store some values that we'll need later (but don't want to force a relayout for) - this.visible = visibleLines(display, cm.doc, viewport); - this.editorIsHidden = !display.wrapper.offsetWidth; - this.wrapperHeight = display.wrapper.clientHeight; - this.oldViewFrom = display.viewFrom; this.oldViewTo = display.viewTo; - this.oldScrollerWidth = display.scroller.clientWidth; - this.force = force; - this.dims = getDimensions(cm); - } - - // Does the actual updating of the line display. Bails out - // (returning false) when there is nothing to be done and forced is - // false. - function updateDisplayIfNeeded(cm, update) { - var display = cm.display, doc = cm.doc; - if (update.editorIsHidden) { - resetView(cm); - return false; - } - - // Bail out if the visible area is already rendered and nothing changed. - if (!update.force && - update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo && - (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) && - countDirtyView(cm) == 0) - return false; - - if (maybeUpdateLineNumberWidth(cm)) { - resetView(cm); - update.dims = getDimensions(cm); - } - - // Compute a suitable new viewport (from & to) - var end = doc.first + doc.size; - var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first); - var to = Math.min(end, update.visible.to + cm.options.viewportMargin); - if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom); - if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo); - if (sawCollapsedSpans) { - from = visualLineNo(cm.doc, from); - to = visualLineEndNo(cm.doc, to); - } - - var different = from != display.viewFrom || to != display.viewTo || - display.lastSizeC != update.wrapperHeight; - adjustView(cm, from, to); - - display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom)); - // Position the mover div to align with the current scroll position - cm.display.mover.style.top = display.viewOffset + "px"; - - var toUpdate = countDirtyView(cm); - if (!different && toUpdate == 0 && !update.force && - (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo)) - return false; - - // For big changes, we hide the enclosing element during the - // update, since that speeds up the operations on most browsers. - var focused = activeElt(); - if (toUpdate > 4) display.lineDiv.style.display = "none"; - patchDisplay(cm, display.updateLineNumbers, update.dims); - if (toUpdate > 4) display.lineDiv.style.display = ""; - // There might have been a widget with a focused element that got - // hidden or updated, if so re-focus it. - if (focused && activeElt() != focused && focused.offsetHeight) focused.focus(); - - // Prevent selection and cursors from interfering with the scroll - // width. - removeChildren(display.cursorDiv); - removeChildren(display.selectionDiv); - - if (different) { - display.lastSizeC = update.wrapperHeight; - startWorker(cm, 400); - } - - display.updateLineNumbers = null; - - return true; - } - - function postUpdateDisplay(cm, update) { - var force = update.force, viewport = update.viewport; - for (var first = true;; first = false) { - if (first && cm.options.lineWrapping && update.oldScrollerWidth != cm.display.scroller.clientWidth) { - force = true; - } else { - force = false; - // Clip forced viewport to actual scrollable area. - if (viewport && viewport.top != null) - viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - scrollerCutOff - - cm.display.scroller.clientHeight, viewport.top)}; - // Updated line heights might result in the drawn area not - // actually covering the viewport. Keep looping until it does. - update.visible = visibleLines(cm.display, cm.doc, viewport); - if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo) - break; - } - if (!updateDisplayIfNeeded(cm, update)) break; - updateHeightsInViewport(cm); - var barMeasure = measureForScrollbars(cm); - updateSelection(cm); - setDocumentHeight(cm, barMeasure); - updateScrollbars(cm, barMeasure); - } - - signalLater(cm, "update", cm); - if (cm.display.viewFrom != update.oldViewFrom || cm.display.viewTo != update.oldViewTo) - signalLater(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo); - } - - function updateDisplaySimple(cm, viewport) { - var update = new DisplayUpdate(cm, viewport); - if (updateDisplayIfNeeded(cm, update)) { - updateHeightsInViewport(cm); - postUpdateDisplay(cm, update); - var barMeasure = measureForScrollbars(cm); - updateSelection(cm); - setDocumentHeight(cm, barMeasure); - updateScrollbars(cm, barMeasure); - } - } - - function setDocumentHeight(cm, measure) { - cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = measure.docHeight + "px"; - cm.display.gutters.style.height = Math.max(measure.docHeight, measure.clientHeight - scrollerCutOff) + "px"; - } - - function checkForWebkitWidthBug(cm, measure) { - // Work around Webkit bug where it sometimes reserves space for a - // non-existing phantom scrollbar in the scroller (Issue #2420) - if (cm.display.sizer.offsetWidth + cm.display.gutters.offsetWidth < cm.display.scroller.clientWidth - 1) { - cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = "0px"; - cm.display.gutters.style.height = measure.docHeight + "px"; - } - } - - // Read the actual heights of the rendered lines, and update their - // stored heights to match. - function updateHeightsInViewport(cm) { - var display = cm.display; - var prevBottom = display.lineDiv.offsetTop; - for (var i = 0; i < display.view.length; i++) { - var cur = display.view[i], height; - if (cur.hidden) continue; - if (ie && ie_version < 8) { - var bot = cur.node.offsetTop + cur.node.offsetHeight; - height = bot - prevBottom; - prevBottom = bot; - } else { - var box = cur.node.getBoundingClientRect(); - height = box.bottom - box.top; - } - var diff = cur.line.height - height; - if (height < 2) height = textHeight(display); - if (diff > .001 || diff < -.001) { - updateLineHeight(cur.line, height); - updateWidgetHeight(cur.line); - if (cur.rest) for (var j = 0; j < cur.rest.length; j++) - updateWidgetHeight(cur.rest[j]); - } - } - } - - // Read and store the height of line widgets associated with the - // given line. - function updateWidgetHeight(line) { - if (line.widgets) for (var i = 0; i < line.widgets.length; ++i) - line.widgets[i].height = line.widgets[i].node.offsetHeight; - } - - // Do a bulk-read of the DOM positions and sizes needed to draw the - // view, so that we don't interleave reading and writing to the DOM. - function getDimensions(cm) { - var d = cm.display, left = {}, width = {}; - var gutterLeft = d.gutters.clientLeft; - for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) { - left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft; - width[cm.options.gutters[i]] = n.clientWidth; - } - return {fixedPos: compensateForHScroll(d), - gutterTotalWidth: d.gutters.offsetWidth, - gutterLeft: left, - gutterWidth: width, - wrapperWidth: d.wrapper.clientWidth}; - } - - // Sync the actual display DOM structure with display.view, removing - // nodes for lines that are no longer in view, and creating the ones - // that are not there yet, and updating the ones that are out of - // date. - function patchDisplay(cm, updateNumbersFrom, dims) { - var display = cm.display, lineNumbers = cm.options.lineNumbers; - var container = display.lineDiv, cur = container.firstChild; - - function rm(node) { - var next = node.nextSibling; - // Works around a throw-scroll bug in OS X Webkit - if (webkit && mac && cm.display.currentWheelTarget == node) - node.style.display = "none"; - else - node.parentNode.removeChild(node); - return next; - } - - var view = display.view, lineN = display.viewFrom; - // Loop over the elements in the view, syncing cur (the DOM nodes - // in display.lineDiv) with the view as we go. - for (var i = 0; i < view.length; i++) { - var lineView = view[i]; - if (lineView.hidden) { - } else if (!lineView.node) { // Not drawn yet - var node = buildLineElement(cm, lineView, lineN, dims); - container.insertBefore(node, cur); - } else { // Already drawn - while (cur != lineView.node) cur = rm(cur); - var updateNumber = lineNumbers && updateNumbersFrom != null && - updateNumbersFrom <= lineN && lineView.lineNumber; - if (lineView.changes) { - if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false; - updateLineForChanges(cm, lineView, lineN, dims); - } - if (updateNumber) { - removeChildren(lineView.lineNumber); - lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN))); - } - cur = lineView.node.nextSibling; - } - lineN += lineView.size; - } - while (cur) cur = rm(cur); - } - - // When an aspect of a line changes, a string is added to - // lineView.changes. This updates the relevant part of the line's - // DOM structure. - function updateLineForChanges(cm, lineView, lineN, dims) { - for (var j = 0; j < lineView.changes.length; j++) { - var type = lineView.changes[j]; - if (type == "text") updateLineText(cm, lineView); - else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims); - else if (type == "class") updateLineClasses(lineView); - else if (type == "widget") updateLineWidgets(lineView, dims); - } - lineView.changes = null; - } - - // Lines with gutter elements, widgets or a background class need to - // be wrapped, and have the extra elements added to the wrapper div - function ensureLineWrapped(lineView) { - if (lineView.node == lineView.text) { - lineView.node = elt("div", null, null, "position: relative"); - if (lineView.text.parentNode) - lineView.text.parentNode.replaceChild(lineView.node, lineView.text); - lineView.node.appendChild(lineView.text); - if (ie && ie_version < 8) lineView.node.style.zIndex = 2; - } - return lineView.node; - } - - function updateLineBackground(lineView) { - var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass; - if (cls) cls += " CodeMirror-linebackground"; - if (lineView.background) { - if (cls) lineView.background.className = cls; - else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; } - } else if (cls) { - var wrap = ensureLineWrapped(lineView); - lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild); - } - } - - // Wrapper around buildLineContent which will reuse the structure - // in display.externalMeasured when possible. - function getLineContent(cm, lineView) { - var ext = cm.display.externalMeasured; - if (ext && ext.line == lineView.line) { - cm.display.externalMeasured = null; - lineView.measure = ext.measure; - return ext.built; - } - return buildLineContent(cm, lineView); - } - - // Redraw the line's text. Interacts with the background and text - // classes because the mode may output tokens that influence these - // classes. - function updateLineText(cm, lineView) { - var cls = lineView.text.className; - var built = getLineContent(cm, lineView); - if (lineView.text == lineView.node) lineView.node = built.pre; - lineView.text.parentNode.replaceChild(built.pre, lineView.text); - lineView.text = built.pre; - if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) { - lineView.bgClass = built.bgClass; - lineView.textClass = built.textClass; - updateLineClasses(lineView); - } else if (cls) { - lineView.text.className = cls; - } - } - - function updateLineClasses(lineView) { - updateLineBackground(lineView); - if (lineView.line.wrapClass) - ensureLineWrapped(lineView).className = lineView.line.wrapClass; - else if (lineView.node != lineView.text) - lineView.node.className = ""; - var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass; - lineView.text.className = textClass || ""; - } - - function updateLineGutter(cm, lineView, lineN, dims) { - if (lineView.gutter) { - lineView.node.removeChild(lineView.gutter); - lineView.gutter = null; - } - var markers = lineView.line.gutterMarkers; - if (cm.options.lineNumbers || markers) { - var wrap = ensureLineWrapped(lineView); - var gutterWrap = lineView.gutter = - wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "position: absolute; left: " + - (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"), - lineView.text); - if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"])) - lineView.lineNumber = gutterWrap.appendChild( - elt("div", lineNumberFor(cm.options, lineN), - "CodeMirror-linenumber CodeMirror-gutter-elt", - "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: " - + cm.display.lineNumInnerWidth + "px")); - if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) { - var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id]; - if (found) - gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " + - dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px")); - } - } - } - - function updateLineWidgets(lineView, dims) { - if (lineView.alignable) lineView.alignable = null; - for (var node = lineView.node.firstChild, next; node; node = next) { - var next = node.nextSibling; - if (node.className == "CodeMirror-linewidget") - lineView.node.removeChild(node); - } - insertLineWidgets(lineView, dims); - } - - // Build a line's DOM representation from scratch - function buildLineElement(cm, lineView, lineN, dims) { - var built = getLineContent(cm, lineView); - lineView.text = lineView.node = built.pre; - if (built.bgClass) lineView.bgClass = built.bgClass; - if (built.textClass) lineView.textClass = built.textClass; - - updateLineClasses(lineView); - updateLineGutter(cm, lineView, lineN, dims); - insertLineWidgets(lineView, dims); - return lineView.node; - } - - // A lineView may contain multiple logical lines (when merged by - // collapsed spans). The widgets for all of them need to be drawn. - function insertLineWidgets(lineView, dims) { - insertLineWidgetsFor(lineView.line, lineView, dims, true); - if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++) - insertLineWidgetsFor(lineView.rest[i], lineView, dims, false); - } - - function insertLineWidgetsFor(line, lineView, dims, allowAbove) { - if (!line.widgets) return; - var wrap = ensureLineWrapped(lineView); - for (var i = 0, ws = line.widgets; i < ws.length; ++i) { - var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget"); - if (!widget.handleMouseEvents) node.ignoreEvents = true; - positionLineWidget(widget, node, lineView, dims); - if (allowAbove && widget.above) - wrap.insertBefore(node, lineView.gutter || lineView.text); - else - wrap.appendChild(node); - signalLater(widget, "redraw"); - } - } - - function positionLineWidget(widget, node, lineView, dims) { - if (widget.noHScroll) { - (lineView.alignable || (lineView.alignable = [])).push(node); - var width = dims.wrapperWidth; - node.style.left = dims.fixedPos + "px"; - if (!widget.coverGutter) { - width -= dims.gutterTotalWidth; - node.style.paddingLeft = dims.gutterTotalWidth + "px"; - } - node.style.width = width + "px"; - } - if (widget.coverGutter) { - node.style.zIndex = 5; - node.style.position = "relative"; - if (!widget.noHScroll) node.style.marginLeft = -dims.gutterTotalWidth + "px"; - } - } - - // POSITION OBJECT - - // A Pos instance represents a position within the text. - var Pos = CodeMirror.Pos = function(line, ch) { - if (!(this instanceof Pos)) return new Pos(line, ch); - this.line = line; this.ch = ch; - }; - - // Compare two positions, return 0 if they are the same, a negative - // number when a is less, and a positive number otherwise. - var cmp = CodeMirror.cmpPos = function(a, b) { return a.line - b.line || a.ch - b.ch; }; - - function copyPos(x) {return Pos(x.line, x.ch);} - function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; } - function minPos(a, b) { return cmp(a, b) < 0 ? a : b; } - - // SELECTION / CURSOR - - // Selection objects are immutable. A new one is created every time - // the selection changes. A selection is one or more non-overlapping - // (and non-touching) ranges, sorted, and an integer that indicates - // which one is the primary selection (the one that's scrolled into - // view, that getCursor returns, etc). - function Selection(ranges, primIndex) { - this.ranges = ranges; - this.primIndex = primIndex; - } - - Selection.prototype = { - primary: function() { return this.ranges[this.primIndex]; }, - equals: function(other) { - if (other == this) return true; - if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false; - for (var i = 0; i < this.ranges.length; i++) { - var here = this.ranges[i], there = other.ranges[i]; - if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false; - } - return true; - }, - deepCopy: function() { - for (var out = [], i = 0; i < this.ranges.length; i++) - out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head)); - return new Selection(out, this.primIndex); - }, - somethingSelected: function() { - for (var i = 0; i < this.ranges.length; i++) - if (!this.ranges[i].empty()) return true; - return false; - }, - contains: function(pos, end) { - if (!end) end = pos; - for (var i = 0; i < this.ranges.length; i++) { - var range = this.ranges[i]; - if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0) - return i; - } - return -1; - } - }; - - function Range(anchor, head) { - this.anchor = anchor; this.head = head; - } - - Range.prototype = { - from: function() { return minPos(this.anchor, this.head); }, - to: function() { return maxPos(this.anchor, this.head); }, - empty: function() { - return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch; - } - }; - - // Take an unsorted, potentially overlapping set of ranges, and - // build a selection out of it. 'Consumes' ranges array (modifying - // it). - function normalizeSelection(ranges, primIndex) { - var prim = ranges[primIndex]; - ranges.sort(function(a, b) { return cmp(a.from(), b.from()); }); - primIndex = indexOf(ranges, prim); - for (var i = 1; i < ranges.length; i++) { - var cur = ranges[i], prev = ranges[i - 1]; - if (cmp(prev.to(), cur.from()) >= 0) { - var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to()); - var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head; - if (i <= primIndex) --primIndex; - ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to)); - } - } - return new Selection(ranges, primIndex); - } - - function simpleSelection(anchor, head) { - return new Selection([new Range(anchor, head || anchor)], 0); - } - - // Most of the external API clips given positions to make sure they - // actually exist within the document. - function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));} - function clipPos(doc, pos) { - if (pos.line < doc.first) return Pos(doc.first, 0); - var last = doc.first + doc.size - 1; - if (pos.line > last) return Pos(last, getLine(doc, last).text.length); - return clipToLen(pos, getLine(doc, pos.line).text.length); - } - function clipToLen(pos, linelen) { - var ch = pos.ch; - if (ch == null || ch > linelen) return Pos(pos.line, linelen); - else if (ch < 0) return Pos(pos.line, 0); - else return pos; - } - function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;} - function clipPosArray(doc, array) { - for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]); - return out; - } - - // SELECTION UPDATES - - // The 'scroll' parameter given to many of these indicated whether - // the new cursor position should be scrolled into view after - // modifying the selection. - - // If shift is held or the extend flag is set, extends a range to - // include a given position (and optionally a second position). - // Otherwise, simply returns the range between the given positions. - // Used for cursor motion and such. - function extendRange(doc, range, head, other) { - if (doc.cm && doc.cm.display.shift || doc.extend) { - var anchor = range.anchor; - if (other) { - var posBefore = cmp(head, anchor) < 0; - if (posBefore != (cmp(other, anchor) < 0)) { - anchor = head; - head = other; - } else if (posBefore != (cmp(head, other) < 0)) { - head = other; - } - } - return new Range(anchor, head); - } else { - return new Range(other || head, head); - } - } - - // Extend the primary selection range, discard the rest. - function extendSelection(doc, head, other, options) { - setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options); - } - - // Extend all selections (pos is an array of selections with length - // equal the number of selections) - function extendSelections(doc, heads, options) { - for (var out = [], i = 0; i < doc.sel.ranges.length; i++) - out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null); - var newSel = normalizeSelection(out, doc.sel.primIndex); - setSelection(doc, newSel, options); - } - - // Updates a single range in the selection. - function replaceOneSelection(doc, i, range, options) { - var ranges = doc.sel.ranges.slice(0); - ranges[i] = range; - setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options); - } - - // Reset the selection to a single range. - function setSimpleSelection(doc, anchor, head, options) { - setSelection(doc, simpleSelection(anchor, head), options); - } - - // Give beforeSelectionChange handlers a change to influence a - // selection update. - function filterSelectionChange(doc, sel) { - var obj = { - ranges: sel.ranges, - update: function(ranges) { - this.ranges = []; - for (var i = 0; i < ranges.length; i++) - this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor), - clipPos(doc, ranges[i].head)); - } - }; - signal(doc, "beforeSelectionChange", doc, obj); - if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj); - if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1); - else return sel; - } - - function setSelectionReplaceHistory(doc, sel, options) { - var done = doc.history.done, last = lst(done); - if (last && last.ranges) { - done[done.length - 1] = sel; - setSelectionNoUndo(doc, sel, options); - } else { - setSelection(doc, sel, options); - } - } - - // Set a new selection. - function setSelection(doc, sel, options) { - setSelectionNoUndo(doc, sel, options); - addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options); - } - - function setSelectionNoUndo(doc, sel, options) { - if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange")) - sel = filterSelectionChange(doc, sel); - - var bias = options && options.bias || - (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1); - setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true)); - - if (!(options && options.scroll === false) && doc.cm) - ensureCursorVisible(doc.cm); - } - - function setSelectionInner(doc, sel) { - if (sel.equals(doc.sel)) return; - - doc.sel = sel; - - if (doc.cm) { - doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true; - signalCursorActivity(doc.cm); - } - signalLater(doc, "cursorActivity", doc); - } - - // Verify that the selection does not partially select any atomic - // marked ranges. - function reCheckSelection(doc) { - setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll); - } - - // Return a selection that does not partially select any atomic - // ranges. - function skipAtomicInSelection(doc, sel, bias, mayClear) { - var out; - for (var i = 0; i < sel.ranges.length; i++) { - var range = sel.ranges[i]; - var newAnchor = skipAtomic(doc, range.anchor, bias, mayClear); - var newHead = skipAtomic(doc, range.head, bias, mayClear); - if (out || newAnchor != range.anchor || newHead != range.head) { - if (!out) out = sel.ranges.slice(0, i); - out[i] = new Range(newAnchor, newHead); - } - } - return out ? normalizeSelection(out, sel.primIndex) : sel; - } - - // Ensure a given position is not inside an atomic range. - function skipAtomic(doc, pos, bias, mayClear) { - var flipped = false, curPos = pos; - var dir = bias || 1; - doc.cantEdit = false; - search: for (;;) { - var line = getLine(doc, curPos.line); - if (line.markedSpans) { - for (var i = 0; i < line.markedSpans.length; ++i) { - var sp = line.markedSpans[i], m = sp.marker; - if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) && - (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) { - if (mayClear) { - signal(m, "beforeCursorEnter"); - if (m.explicitlyCleared) { - if (!line.markedSpans) break; - else {--i; continue;} - } - } - if (!m.atomic) continue; - var newPos = m.find(dir < 0 ? -1 : 1); - if (cmp(newPos, curPos) == 0) { - newPos.ch += dir; - if (newPos.ch < 0) { - if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1)); - else newPos = null; - } else if (newPos.ch > line.text.length) { - if (newPos.line < doc.first + doc.size - 1) newPos = Pos(newPos.line + 1, 0); - else newPos = null; - } - if (!newPos) { - if (flipped) { - // Driven in a corner -- no valid cursor position found at all - // -- try again *with* clearing, if we didn't already - if (!mayClear) return skipAtomic(doc, pos, bias, true); - // Otherwise, turn off editing until further notice, and return the start of the doc - doc.cantEdit = true; - return Pos(doc.first, 0); - } - flipped = true; newPos = pos; dir = -dir; - } - } - curPos = newPos; - continue search; - } - } - } - return curPos; - } - } - - // SELECTION DRAWING - - // Redraw the selection and/or cursor - function drawSelection(cm) { - var display = cm.display, doc = cm.doc, result = {}; - var curFragment = result.cursors = document.createDocumentFragment(); - var selFragment = result.selection = document.createDocumentFragment(); - - for (var i = 0; i < doc.sel.ranges.length; i++) { - var range = doc.sel.ranges[i]; - var collapsed = range.empty(); - if (collapsed || cm.options.showCursorWhenSelecting) - drawSelectionCursor(cm, range, curFragment); - if (!collapsed) - drawSelectionRange(cm, range, selFragment); - } - - // Move the hidden textarea near the cursor to prevent scrolling artifacts - if (cm.options.moveInputWithCursor) { - var headPos = cursorCoords(cm, doc.sel.primary().head, "div"); - var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect(); - result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10, - headPos.top + lineOff.top - wrapOff.top)); - result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10, - headPos.left + lineOff.left - wrapOff.left)); - } - - return result; - } - - function showSelection(cm, drawn) { - removeChildrenAndAdd(cm.display.cursorDiv, drawn.cursors); - removeChildrenAndAdd(cm.display.selectionDiv, drawn.selection); - if (drawn.teTop != null) { - cm.display.inputDiv.style.top = drawn.teTop + "px"; - cm.display.inputDiv.style.left = drawn.teLeft + "px"; - } - } - - function updateSelection(cm) { - showSelection(cm, drawSelection(cm)); - } - - // Draws a cursor for the given range - function drawSelectionCursor(cm, range, output) { - var pos = cursorCoords(cm, range.head, "div", null, null, !cm.options.singleCursorHeightPerLine); - - var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor")); - cursor.style.left = pos.left + "px"; - cursor.style.top = pos.top + "px"; - cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px"; - - if (pos.other) { - // Secondary cursor, shown when on a 'jump' in bi-directional text - var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor")); - otherCursor.style.display = ""; - otherCursor.style.left = pos.other.left + "px"; - otherCursor.style.top = pos.other.top + "px"; - otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px"; - } - } - - // Draws the given range as a highlighted selection - function drawSelectionRange(cm, range, output) { - var display = cm.display, doc = cm.doc; - var fragment = document.createDocumentFragment(); - var padding = paddingH(cm.display), leftSide = padding.left, rightSide = display.lineSpace.offsetWidth - padding.right; - - function add(left, top, width, bottom) { - if (top < 0) top = 0; - top = Math.round(top); - bottom = Math.round(bottom); - fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left + - "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) + - "px; height: " + (bottom - top) + "px")); - } - - function drawForLine(line, fromArg, toArg) { - var lineObj = getLine(doc, line); - var lineLen = lineObj.text.length; - var start, end; - function coords(ch, bias) { - return charCoords(cm, Pos(line, ch), "div", lineObj, bias); - } - - iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) { - var leftPos = coords(from, "left"), rightPos, left, right; - if (from == to) { - rightPos = leftPos; - left = right = leftPos.left; - } else { - rightPos = coords(to - 1, "right"); - if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; } - left = leftPos.left; - right = rightPos.right; - } - if (fromArg == null && from == 0) left = leftSide; - if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part - add(left, leftPos.top, null, leftPos.bottom); - left = leftSide; - if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top); - } - if (toArg == null && to == lineLen) right = rightSide; - if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left) - start = leftPos; - if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right) - end = rightPos; - if (left < leftSide + 1) left = leftSide; - add(left, rightPos.top, right - left, rightPos.bottom); - }); - return {start: start, end: end}; - } - - var sFrom = range.from(), sTo = range.to(); - if (sFrom.line == sTo.line) { - drawForLine(sFrom.line, sFrom.ch, sTo.ch); - } else { - var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line); - var singleVLine = visualLine(fromLine) == visualLine(toLine); - var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end; - var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start; - if (singleVLine) { - if (leftEnd.top < rightStart.top - 2) { - add(leftEnd.right, leftEnd.top, null, leftEnd.bottom); - add(leftSide, rightStart.top, rightStart.left, rightStart.bottom); - } else { - add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom); - } - } - if (leftEnd.bottom < rightStart.top) - add(leftSide, leftEnd.bottom, null, rightStart.top); - } - - output.appendChild(fragment); - } - - // Cursor-blinking - function restartBlink(cm) { - if (!cm.state.focused) return; - var display = cm.display; - clearInterval(display.blinker); - var on = true; - display.cursorDiv.style.visibility = ""; - if (cm.options.cursorBlinkRate > 0) - display.blinker = setInterval(function() { - display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden"; - }, cm.options.cursorBlinkRate); - else if (cm.options.cursorBlinkRate < 0) - display.cursorDiv.style.visibility = "hidden"; - } - - // HIGHLIGHT WORKER - - function startWorker(cm, time) { - if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo) - cm.state.highlight.set(time, bind(highlightWorker, cm)); - } - - function highlightWorker(cm) { - var doc = cm.doc; - if (doc.frontier < doc.first) doc.frontier = doc.first; - if (doc.frontier >= cm.display.viewTo) return; - var end = +new Date + cm.options.workTime; - var state = copyState(doc.mode, getStateBefore(cm, doc.frontier)); - var changedLines = []; - - doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) { - if (doc.frontier >= cm.display.viewFrom) { // Visible - var oldStyles = line.styles; - var highlighted = highlightLine(cm, line, state, true); - line.styles = highlighted.styles; - var oldCls = line.styleClasses, newCls = highlighted.classes; - if (newCls) line.styleClasses = newCls; - else if (oldCls) line.styleClasses = null; - var ischange = !oldStyles || oldStyles.length != line.styles.length || - oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass); - for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i]; - if (ischange) changedLines.push(doc.frontier); - line.stateAfter = copyState(doc.mode, state); - } else { - processLine(cm, line.text, state); - line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null; - } - ++doc.frontier; - if (+new Date > end) { - startWorker(cm, cm.options.workDelay); - return true; - } - }); - if (changedLines.length) runInOp(cm, function() { - for (var i = 0; i < changedLines.length; i++) - regLineChange(cm, changedLines[i], "text"); - }); - } - - // Finds the line to start with when starting a parse. Tries to - // find a line with a stateAfter, so that it can start with a - // valid state. If that fails, it returns the line with the - // smallest indentation, which tends to need the least context to - // parse correctly. - function findStartLine(cm, n, precise) { - var minindent, minline, doc = cm.doc; - var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100); - for (var search = n; search > lim; --search) { - if (search <= doc.first) return doc.first; - var line = getLine(doc, search - 1); - if (line.stateAfter && (!precise || search <= doc.frontier)) return search; - var indented = countColumn(line.text, null, cm.options.tabSize); - if (minline == null || minindent > indented) { - minline = search - 1; - minindent = indented; - } - } - return minline; - } - - function getStateBefore(cm, n, precise) { - var doc = cm.doc, display = cm.display; - if (!doc.mode.startState) return true; - var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter; - if (!state) state = startState(doc.mode); - else state = copyState(doc.mode, state); - doc.iter(pos, n, function(line) { - processLine(cm, line.text, state); - var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo; - line.stateAfter = save ? copyState(doc.mode, state) : null; - ++pos; - }); - if (precise) doc.frontier = pos; - return state; - } - - // POSITION MEASUREMENT - - function paddingTop(display) {return display.lineSpace.offsetTop;} - function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;} - function paddingH(display) { - if (display.cachedPaddingH) return display.cachedPaddingH; - var e = removeChildrenAndAdd(display.measure, elt("pre", "x")); - var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle; - var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)}; - if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data; - return data; - } - - // Ensure the lineView.wrapping.heights array is populated. This is - // an array of bottom offsets for the lines that make up a drawn - // line. When lineWrapping is on, there might be more than one - // height. - function ensureLineHeights(cm, lineView, rect) { - var wrapping = cm.options.lineWrapping; - var curWidth = wrapping && cm.display.scroller.clientWidth; - if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) { - var heights = lineView.measure.heights = []; - if (wrapping) { - lineView.measure.width = curWidth; - var rects = lineView.text.firstChild.getClientRects(); - for (var i = 0; i < rects.length - 1; i++) { - var cur = rects[i], next = rects[i + 1]; - if (Math.abs(cur.bottom - next.bottom) > 2) - heights.push((cur.bottom + next.top) / 2 - rect.top); - } - } - heights.push(rect.bottom - rect.top); - } - } - - // Find a line map (mapping character offsets to text nodes) and a - // measurement cache for the given line number. (A line view might - // contain multiple lines when collapsed ranges are present.) - function mapFromLineView(lineView, line, lineN) { - if (lineView.line == line) - return {map: lineView.measure.map, cache: lineView.measure.cache}; - for (var i = 0; i < lineView.rest.length; i++) - if (lineView.rest[i] == line) - return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]}; - for (var i = 0; i < lineView.rest.length; i++) - if (lineNo(lineView.rest[i]) > lineN) - return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true}; - } - - // Render a line into the hidden node display.externalMeasured. Used - // when measurement is needed for a line that's not in the viewport. - function updateExternalMeasurement(cm, line) { - line = visualLine(line); - var lineN = lineNo(line); - var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN); - view.lineN = lineN; - var built = view.built = buildLineContent(cm, view); - view.text = built.pre; - removeChildrenAndAdd(cm.display.lineMeasure, built.pre); - return view; - } - - // Get a {top, bottom, left, right} box (in line-local coordinates) - // for a given character. - function measureChar(cm, line, ch, bias) { - return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias); - } - - // Find a line view that corresponds to the given line number. - function findViewForLine(cm, lineN) { - if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo) - return cm.display.view[findViewIndex(cm, lineN)]; - var ext = cm.display.externalMeasured; - if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size) - return ext; - } - - // Measurement can be split in two steps, the set-up work that - // applies to the whole line, and the measurement of the actual - // character. Functions like coordsChar, that need to do a lot of - // measurements in a row, can thus ensure that the set-up work is - // only done once. - function prepareMeasureForLine(cm, line) { - var lineN = lineNo(line); - var view = findViewForLine(cm, lineN); - if (view && !view.text) - view = null; - else if (view && view.changes) - updateLineForChanges(cm, view, lineN, getDimensions(cm)); - if (!view) - view = updateExternalMeasurement(cm, line); - - var info = mapFromLineView(view, line, lineN); - return { - line: line, view: view, rect: null, - map: info.map, cache: info.cache, before: info.before, - hasHeights: false - }; - } - - // Given a prepared measurement object, measures the position of an - // actual character (or fetches it from the cache). - function measureCharPrepared(cm, prepared, ch, bias, varHeight) { - if (prepared.before) ch = -1; - var key = ch + (bias || ""), found; - if (prepared.cache.hasOwnProperty(key)) { - found = prepared.cache[key]; - } else { - if (!prepared.rect) - prepared.rect = prepared.view.text.getBoundingClientRect(); - if (!prepared.hasHeights) { - ensureLineHeights(cm, prepared.view, prepared.rect); - prepared.hasHeights = true; - } - found = measureCharInner(cm, prepared, ch, bias); - if (!found.bogus) prepared.cache[key] = found; - } - return {left: found.left, right: found.right, - top: varHeight ? found.rtop : found.top, - bottom: varHeight ? found.rbottom : found.bottom}; - } - - var nullRect = {left: 0, right: 0, top: 0, bottom: 0}; - - function measureCharInner(cm, prepared, ch, bias) { - var map = prepared.map; - - var node, start, end, collapse; - // First, search the line map for the text node corresponding to, - // or closest to, the target character. - for (var i = 0; i < map.length; i += 3) { - var mStart = map[i], mEnd = map[i + 1]; - if (ch < mStart) { - start = 0; end = 1; - collapse = "left"; - } else if (ch < mEnd) { - start = ch - mStart; - end = start + 1; - } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) { - end = mEnd - mStart; - start = end - 1; - if (ch >= mEnd) collapse = "right"; - } - if (start != null) { - node = map[i + 2]; - if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right")) - collapse = bias; - if (bias == "left" && start == 0) - while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) { - node = map[(i -= 3) + 2]; - collapse = "left"; - } - if (bias == "right" && start == mEnd - mStart) - while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) { - node = map[(i += 3) + 2]; - collapse = "right"; - } - break; - } - } - - var rect; - if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates. - for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned - while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start; - while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end; - if (ie && ie_version < 9 && start == 0 && end == mEnd - mStart) { - rect = node.parentNode.getBoundingClientRect(); - } else if (ie && cm.options.lineWrapping) { - var rects = range(node, start, end).getClientRects(); - if (rects.length) - rect = rects[bias == "right" ? rects.length - 1 : 0]; - else - rect = nullRect; - } else { - rect = range(node, start, end).getBoundingClientRect() || nullRect; - } - if (rect.left || rect.right || start == 0) break; - end = start; - start = start - 1; - collapse = "right"; - } - if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect); - } else { // If it is a widget, simply get the box for the whole widget. - if (start > 0) collapse = bias = "right"; - var rects; - if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1) - rect = rects[bias == "right" ? rects.length - 1 : 0]; - else - rect = node.getBoundingClientRect(); - } - if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) { - var rSpan = node.parentNode.getClientRects()[0]; - if (rSpan) - rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom}; - else - rect = nullRect; - } - - var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top; - var mid = (rtop + rbot) / 2; - var heights = prepared.view.measure.heights; - for (var i = 0; i < heights.length - 1; i++) - if (mid < heights[i]) break; - var top = i ? heights[i - 1] : 0, bot = heights[i]; - var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left, - right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left, - top: top, bottom: bot}; - if (!rect.left && !rect.right) result.bogus = true; - if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; } - - return result; - } - - // Work around problem with bounding client rects on ranges being - // returned incorrectly when zoomed on IE10 and below. - function maybeUpdateRectForZooming(measure, rect) { - if (!window.screen || screen.logicalXDPI == null || - screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure)) - return rect; - var scaleX = screen.logicalXDPI / screen.deviceXDPI; - var scaleY = screen.logicalYDPI / screen.deviceYDPI; - return {left: rect.left * scaleX, right: rect.right * scaleX, - top: rect.top * scaleY, bottom: rect.bottom * scaleY}; - } - - function clearLineMeasurementCacheFor(lineView) { - if (lineView.measure) { - lineView.measure.cache = {}; - lineView.measure.heights = null; - if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++) - lineView.measure.caches[i] = {}; - } - } - - function clearLineMeasurementCache(cm) { - cm.display.externalMeasure = null; - removeChildren(cm.display.lineMeasure); - for (var i = 0; i < cm.display.view.length; i++) - clearLineMeasurementCacheFor(cm.display.view[i]); - } - - function clearCaches(cm) { - clearLineMeasurementCache(cm); - cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null; - if (!cm.options.lineWrapping) cm.display.maxLineChanged = true; - cm.display.lineNumChars = null; - } - - function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; } - function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; } - - // Converts a {top, bottom, left, right} box from line-local - // coordinates into another coordinate system. Context may be one of - // "line", "div" (display.lineDiv), "local"/null (editor), or "page". - function intoCoordSystem(cm, lineObj, rect, context) { - if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) { - var size = widgetHeight(lineObj.widgets[i]); - rect.top += size; rect.bottom += size; - } - if (context == "line") return rect; - if (!context) context = "local"; - var yOff = heightAtLine(lineObj); - if (context == "local") yOff += paddingTop(cm.display); - else yOff -= cm.display.viewOffset; - if (context == "page" || context == "window") { - var lOff = cm.display.lineSpace.getBoundingClientRect(); - yOff += lOff.top + (context == "window" ? 0 : pageScrollY()); - var xOff = lOff.left + (context == "window" ? 0 : pageScrollX()); - rect.left += xOff; rect.right += xOff; - } - rect.top += yOff; rect.bottom += yOff; - return rect; - } - - // Coverts a box from "div" coords to another coordinate system. - // Context may be "window", "page", "div", or "local"/null. - function fromCoordSystem(cm, coords, context) { - if (context == "div") return coords; - var left = coords.left, top = coords.top; - // First move into "page" coordinate system - if (context == "page") { - left -= pageScrollX(); - top -= pageScrollY(); - } else if (context == "local" || !context) { - var localBox = cm.display.sizer.getBoundingClientRect(); - left += localBox.left; - top += localBox.top; - } - - var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect(); - return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top}; - } - - function charCoords(cm, pos, context, lineObj, bias) { - if (!lineObj) lineObj = getLine(cm.doc, pos.line); - return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context); - } - - // Returns a box for a given cursor position, which may have an - // 'other' property containing the position of the secondary cursor - // on a bidi boundary. - function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) { - lineObj = lineObj || getLine(cm.doc, pos.line); - if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj); - function get(ch, right) { - var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight); - if (right) m.left = m.right; else m.right = m.left; - return intoCoordSystem(cm, lineObj, m, context); - } - function getBidi(ch, partPos) { - var part = order[partPos], right = part.level % 2; - if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) { - part = order[--partPos]; - ch = bidiRight(part) - (part.level % 2 ? 0 : 1); - right = true; - } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) { - part = order[++partPos]; - ch = bidiLeft(part) - part.level % 2; - right = false; - } - if (right && ch == part.to && ch > part.from) return get(ch - 1); - return get(ch, right); - } - var order = getOrder(lineObj), ch = pos.ch; - if (!order) return get(ch); - var partPos = getBidiPartAt(order, ch); - var val = getBidi(ch, partPos); - if (bidiOther != null) val.other = getBidi(ch, bidiOther); - return val; - } - - // Used to cheaply estimate the coordinates for a position. Used for - // intermediate scroll updates. - function estimateCoords(cm, pos) { - var left = 0, pos = clipPos(cm.doc, pos); - if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch; - var lineObj = getLine(cm.doc, pos.line); - var top = heightAtLine(lineObj) + paddingTop(cm.display); - return {left: left, right: left, top: top, bottom: top + lineObj.height}; - } - - // Positions returned by coordsChar contain some extra information. - // xRel is the relative x position of the input coordinates compared - // to the found position (so xRel > 0 means the coordinates are to - // the right of the character position, for example). When outside - // is true, that means the coordinates lie outside the line's - // vertical range. - function PosWithInfo(line, ch, outside, xRel) { - var pos = Pos(line, ch); - pos.xRel = xRel; - if (outside) pos.outside = true; - return pos; - } - - // Compute the character position closest to the given coordinates. - // Input must be lineSpace-local ("div" coordinate system). - function coordsChar(cm, x, y) { - var doc = cm.doc; - y += cm.display.viewOffset; - if (y < 0) return PosWithInfo(doc.first, 0, true, -1); - var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1; - if (lineN > last) - return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1); - if (x < 0) x = 0; - - var lineObj = getLine(doc, lineN); - for (;;) { - var found = coordsCharInner(cm, lineObj, lineN, x, y); - var merged = collapsedSpanAtEnd(lineObj); - var mergedPos = merged && merged.find(0, true); - if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0)) - lineN = lineNo(lineObj = mergedPos.to.line); - else - return found; - } - } - - function coordsCharInner(cm, lineObj, lineNo, x, y) { - var innerOff = y - heightAtLine(lineObj); - var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth; - var preparedMeasure = prepareMeasureForLine(cm, lineObj); - - function getX(ch) { - var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure); - wrongLine = true; - if (innerOff > sp.bottom) return sp.left - adjust; - else if (innerOff < sp.top) return sp.left + adjust; - else wrongLine = false; - return sp.left; - } - - var bidi = getOrder(lineObj), dist = lineObj.text.length; - var from = lineLeft(lineObj), to = lineRight(lineObj); - var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine; - - if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1); - // Do a binary search between these bounds. - for (;;) { - if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) { - var ch = x < fromX || x - fromX <= toX - x ? from : to; - var xDiff = x - (ch == from ? fromX : toX); - while (isExtendingChar(lineObj.text.charAt(ch))) ++ch; - var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside, - xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0); - return pos; - } - var step = Math.ceil(dist / 2), middle = from + step; - if (bidi) { - middle = from; - for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1); - } - var middleX = getX(middle); - if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step;} - else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step;} - } - } - - var measureText; - // Compute the default text height. - function textHeight(display) { - if (display.cachedTextHeight != null) return display.cachedTextHeight; - if (measureText == null) { - measureText = elt("pre"); - // Measure a bunch of lines, for browsers that compute - // fractional heights. - for (var i = 0; i < 49; ++i) { - measureText.appendChild(document.createTextNode("x")); - measureText.appendChild(elt("br")); - } - measureText.appendChild(document.createTextNode("x")); - } - removeChildrenAndAdd(display.measure, measureText); - var height = measureText.offsetHeight / 50; - if (height > 3) display.cachedTextHeight = height; - removeChildren(display.measure); - return height || 1; - } - - // Compute the default character width. - function charWidth(display) { - if (display.cachedCharWidth != null) return display.cachedCharWidth; - var anchor = elt("span", "xxxxxxxxxx"); - var pre = elt("pre", [anchor]); - removeChildrenAndAdd(display.measure, pre); - var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10; - if (width > 2) display.cachedCharWidth = width; - return width || 10; - } - - // OPERATIONS - - // Operations are used to wrap a series of changes to the editor - // state in such a way that each change won't have to update the - // cursor and display (which would be awkward, slow, and - // error-prone). Instead, display updates are batched and then all - // combined and executed at once. - - var operationGroup = null; - - var nextOpId = 0; - // Start a new operation. - function startOperation(cm) { - cm.curOp = { - cm: cm, - viewChanged: false, // Flag that indicates that lines might need to be redrawn - startHeight: cm.doc.height, // Used to detect need to update scrollbar - forceUpdate: false, // Used to force a redraw - updateInput: null, // Whether to reset the input textarea - typing: false, // Whether this reset should be careful to leave existing text (for compositing) - changeObjs: null, // Accumulated changes, for firing change events - cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on - cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already - selectionChanged: false, // Whether the selection needs to be redrawn - updateMaxLine: false, // Set when the widest line needs to be determined anew - scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet - scrollToPos: null, // Used to scroll to a specific position - id: ++nextOpId // Unique ID - }; - if (operationGroup) { - operationGroup.ops.push(cm.curOp); - } else { - cm.curOp.ownsGroup = operationGroup = { - ops: [cm.curOp], - delayedCallbacks: [] - }; - } - } - - function fireCallbacksForOps(group) { - // Calls delayed callbacks and cursorActivity handlers until no - // new ones appear - var callbacks = group.delayedCallbacks, i = 0; - do { - for (; i < callbacks.length; i++) - callbacks[i](); - for (var j = 0; j < group.ops.length; j++) { - var op = group.ops[j]; - if (op.cursorActivityHandlers) - while (op.cursorActivityCalled < op.cursorActivityHandlers.length) - op.cursorActivityHandlers[op.cursorActivityCalled++](op.cm); - } - } while (i < callbacks.length); - } - - // Finish an operation, updating the display and signalling delayed events - function endOperation(cm) { - var op = cm.curOp, group = op.ownsGroup; - if (!group) return; - - try { fireCallbacksForOps(group); } - finally { - operationGroup = null; - for (var i = 0; i < group.ops.length; i++) - group.ops[i].cm.curOp = null; - endOperations(group); - } - } - - // The DOM updates done when an operation finishes are batched so - // that the minimum number of relayouts are required. - function endOperations(group) { - var ops = group.ops; - for (var i = 0; i < ops.length; i++) // Read DOM - endOperation_R1(ops[i]); - for (var i = 0; i < ops.length; i++) // Write DOM (maybe) - endOperation_W1(ops[i]); - for (var i = 0; i < ops.length; i++) // Read DOM - endOperation_R2(ops[i]); - for (var i = 0; i < ops.length; i++) // Write DOM (maybe) - endOperation_W2(ops[i]); - for (var i = 0; i < ops.length; i++) // Read DOM - endOperation_finish(ops[i]); - } - - function endOperation_R1(op) { - var cm = op.cm, display = cm.display; - if (op.updateMaxLine) findMaxLine(cm); - - op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null || - op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom || - op.scrollToPos.to.line >= display.viewTo) || - display.maxLineChanged && cm.options.lineWrapping; - op.update = op.mustUpdate && - new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate); - } - - function endOperation_W1(op) { - op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update); - } - - function endOperation_R2(op) { - var cm = op.cm, display = cm.display; - if (op.updatedDisplay) updateHeightsInViewport(cm); - - op.barMeasure = measureForScrollbars(cm); - - // If the max line changed since it was last measured, measure it, - // and ensure the document's width matches it. - // updateDisplay_W2 will use these properties to do the actual resizing - if (display.maxLineChanged && !cm.options.lineWrapping) { - op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3; - op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo + - scrollerCutOff - display.scroller.clientWidth); - } - - if (op.updatedDisplay || op.selectionChanged) - op.newSelectionNodes = drawSelection(cm); - } - - function endOperation_W2(op) { - var cm = op.cm; - - if (op.adjustWidthTo != null) { - cm.display.sizer.style.minWidth = op.adjustWidthTo + "px"; - if (op.maxScrollLeft < cm.doc.scrollLeft) - setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true); - cm.display.maxLineChanged = false; - } - - if (op.newSelectionNodes) - showSelection(cm, op.newSelectionNodes); - if (op.updatedDisplay) - setDocumentHeight(cm, op.barMeasure); - if (op.updatedDisplay || op.startHeight != cm.doc.height) - updateScrollbars(cm, op.barMeasure); - - if (op.selectionChanged) restartBlink(cm); - - if (cm.state.focused && op.updateInput) - resetInput(cm, op.typing); - } - - function endOperation_finish(op) { - var cm = op.cm, display = cm.display, doc = cm.doc; - - if (op.adjustWidthTo != null && Math.abs(op.barMeasure.scrollWidth - cm.display.scroller.scrollWidth) > 1) - updateScrollbars(cm); - - if (op.updatedDisplay) postUpdateDisplay(cm, op.update); - - // Abort mouse wheel delta measurement, when scrolling explicitly - if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos)) - display.wheelStartX = display.wheelStartY = null; - - // Propagate the scroll position to the actual DOM scroller - if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) { - var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop)); - display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top; - } - if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) { - var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft)); - display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left; - alignHorizontally(cm); - } - // If we need to scroll a specific position into view, do so. - if (op.scrollToPos) { - var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from), - clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin); - if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords); - } - - // Fire events for markers that are hidden/unidden by editing or - // undoing - var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers; - if (hidden) for (var i = 0; i < hidden.length; ++i) - if (!hidden[i].lines.length) signal(hidden[i], "hide"); - if (unhidden) for (var i = 0; i < unhidden.length; ++i) - if (unhidden[i].lines.length) signal(unhidden[i], "unhide"); - - if (display.wrapper.offsetHeight) - doc.scrollTop = cm.display.scroller.scrollTop; - - // Apply workaround for two webkit bugs - if (op.updatedDisplay && webkit) { - if (cm.options.lineWrapping) - checkForWebkitWidthBug(cm, op.barMeasure); // (Issue #2420) - if (op.barMeasure.scrollWidth > op.barMeasure.clientWidth && - op.barMeasure.scrollWidth < op.barMeasure.clientWidth + 1 && - !hScrollbarTakesSpace(cm)) - updateScrollbars(cm); // (Issue #2562) - } - - // Fire change events, and delayed event handlers - if (op.changeObjs) - signal(cm, "changes", cm, op.changeObjs); - } - - // Run the given function in an operation - function runInOp(cm, f) { - if (cm.curOp) return f(); - startOperation(cm); - try { return f(); } - finally { endOperation(cm); } - } - // Wraps a function in an operation. Returns the wrapped function. - function operation(cm, f) { - return function() { - if (cm.curOp) return f.apply(cm, arguments); - startOperation(cm); - try { return f.apply(cm, arguments); } - finally { endOperation(cm); } - }; - } - // Used to add methods to editor and doc instances, wrapping them in - // operations. - function methodOp(f) { - return function() { - if (this.curOp) return f.apply(this, arguments); - startOperation(this); - try { return f.apply(this, arguments); } - finally { endOperation(this); } - }; - } - function docMethodOp(f) { - return function() { - var cm = this.cm; - if (!cm || cm.curOp) return f.apply(this, arguments); - startOperation(cm); - try { return f.apply(this, arguments); } - finally { endOperation(cm); } - }; - } - - // VIEW TRACKING - - // These objects are used to represent the visible (currently drawn) - // part of the document. A LineView may correspond to multiple - // logical lines, if those are connected by collapsed ranges. - function LineView(doc, line, lineN) { - // The starting line - this.line = line; - // Continuing lines, if any - this.rest = visualLineContinued(line); - // Number of logical lines in this visual line - this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1; - this.node = this.text = null; - this.hidden = lineIsHidden(doc, line); - } - - // Create a range of LineView objects for the given lines. - function buildViewArray(cm, from, to) { - var array = [], nextPos; - for (var pos = from; pos < to; pos = nextPos) { - var view = new LineView(cm.doc, getLine(cm.doc, pos), pos); - nextPos = pos + view.size; - array.push(view); - } - return array; - } - - // Updates the display.view data structure for a given change to the - // document. From and to are in pre-change coordinates. Lendiff is - // the amount of lines added or subtracted by the change. This is - // used for changes that span multiple lines, or change the way - // lines are divided into visual lines. regLineChange (below) - // registers single-line changes. - function regChange(cm, from, to, lendiff) { - if (from == null) from = cm.doc.first; - if (to == null) to = cm.doc.first + cm.doc.size; - if (!lendiff) lendiff = 0; - - var display = cm.display; - if (lendiff && to < display.viewTo && - (display.updateLineNumbers == null || display.updateLineNumbers > from)) - display.updateLineNumbers = from; - - cm.curOp.viewChanged = true; - - if (from >= display.viewTo) { // Change after - if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo) - resetView(cm); - } else if (to <= display.viewFrom) { // Change before - if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) { - resetView(cm); - } else { - display.viewFrom += lendiff; - display.viewTo += lendiff; - } - } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap - resetView(cm); - } else if (from <= display.viewFrom) { // Top overlap - var cut = viewCuttingPoint(cm, to, to + lendiff, 1); - if (cut) { - display.view = display.view.slice(cut.index); - display.viewFrom = cut.lineN; - display.viewTo += lendiff; - } else { - resetView(cm); - } - } else if (to >= display.viewTo) { // Bottom overlap - var cut = viewCuttingPoint(cm, from, from, -1); - if (cut) { - display.view = display.view.slice(0, cut.index); - display.viewTo = cut.lineN; - } else { - resetView(cm); - } - } else { // Gap in the middle - var cutTop = viewCuttingPoint(cm, from, from, -1); - var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1); - if (cutTop && cutBot) { - display.view = display.view.slice(0, cutTop.index) - .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN)) - .concat(display.view.slice(cutBot.index)); - display.viewTo += lendiff; - } else { - resetView(cm); - } - } - - var ext = display.externalMeasured; - if (ext) { - if (to < ext.lineN) - ext.lineN += lendiff; - else if (from < ext.lineN + ext.size) - display.externalMeasured = null; - } - } - - // Register a change to a single line. Type must be one of "text", - // "gutter", "class", "widget" - function regLineChange(cm, line, type) { - cm.curOp.viewChanged = true; - var display = cm.display, ext = cm.display.externalMeasured; - if (ext && line >= ext.lineN && line < ext.lineN + ext.size) - display.externalMeasured = null; - - if (line < display.viewFrom || line >= display.viewTo) return; - var lineView = display.view[findViewIndex(cm, line)]; - if (lineView.node == null) return; - var arr = lineView.changes || (lineView.changes = []); - if (indexOf(arr, type) == -1) arr.push(type); - } - - // Clear the view. - function resetView(cm) { - cm.display.viewFrom = cm.display.viewTo = cm.doc.first; - cm.display.view = []; - cm.display.viewOffset = 0; - } - - // Find the view element corresponding to a given line. Return null - // when the line isn't visible. - function findViewIndex(cm, n) { - if (n >= cm.display.viewTo) return null; - n -= cm.display.viewFrom; - if (n < 0) return null; - var view = cm.display.view; - for (var i = 0; i < view.length; i++) { - n -= view[i].size; - if (n < 0) return i; - } - } - - function viewCuttingPoint(cm, oldN, newN, dir) { - var index = findViewIndex(cm, oldN), diff, view = cm.display.view; - if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size) - return {index: index, lineN: newN}; - for (var i = 0, n = cm.display.viewFrom; i < index; i++) - n += view[i].size; - if (n != oldN) { - if (dir > 0) { - if (index == view.length - 1) return null; - diff = (n + view[index].size) - oldN; - index++; - } else { - diff = n - oldN; - } - oldN += diff; newN += diff; - } - while (visualLineNo(cm.doc, newN) != newN) { - if (index == (dir < 0 ? 0 : view.length - 1)) return null; - newN += dir * view[index - (dir < 0 ? 1 : 0)].size; - index += dir; - } - return {index: index, lineN: newN}; - } - - // Force the view to cover a given range, adding empty view element - // or clipping off existing ones as needed. - function adjustView(cm, from, to) { - var display = cm.display, view = display.view; - if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) { - display.view = buildViewArray(cm, from, to); - display.viewFrom = from; - } else { - if (display.viewFrom > from) - display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view); - else if (display.viewFrom < from) - display.view = display.view.slice(findViewIndex(cm, from)); - display.viewFrom = from; - if (display.viewTo < to) - display.view = display.view.concat(buildViewArray(cm, display.viewTo, to)); - else if (display.viewTo > to) - display.view = display.view.slice(0, findViewIndex(cm, to)); - } - display.viewTo = to; - } - - // Count the number of lines in the view whose DOM representation is - // out of date (or nonexistent). - function countDirtyView(cm) { - var view = cm.display.view, dirty = 0; - for (var i = 0; i < view.length; i++) { - var lineView = view[i]; - if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty; - } - return dirty; - } - - // INPUT HANDLING - - // Poll for input changes, using the normal rate of polling. This - // runs as long as the editor is focused. - function slowPoll(cm) { - if (cm.display.pollingFast) return; - cm.display.poll.set(cm.options.pollInterval, function() { - readInput(cm); - if (cm.state.focused) slowPoll(cm); - }); - } - - // When an event has just come in that is likely to add or change - // something in the input textarea, we poll faster, to ensure that - // the change appears on the screen quickly. - function fastPoll(cm) { - var missed = false; - cm.display.pollingFast = true; - function p() { - var changed = readInput(cm); - if (!changed && !missed) {missed = true; cm.display.poll.set(60, p);} - else {cm.display.pollingFast = false; slowPoll(cm);} - } - cm.display.poll.set(20, p); - } - - // This will be set to an array of strings when copying, so that, - // when pasting, we know what kind of selections the copied text - // was made out of. - var lastCopied = null; - - // Read input from the textarea, and update the document to match. - // When something is selected, it is present in the textarea, and - // selected (unless it is huge, in which case a placeholder is - // used). When nothing is selected, the cursor sits after previously - // seen text (can be empty), which is stored in prevInput (we must - // not reset the textarea when typing, because that breaks IME). - function readInput(cm) { - var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc; - // Since this is called a *lot*, try to bail out as cheaply as - // possible when it is clear that nothing happened. hasSelection - // will be the case when there is a lot of text in the textarea, - // in which case reading its value would be expensive. - if (!cm.state.focused || (hasSelection(input) && !prevInput) || isReadOnly(cm) || cm.options.disableInput) - return false; - // See paste handler for more on the fakedLastChar kludge - if (cm.state.pasteIncoming && cm.state.fakedLastChar) { - input.value = input.value.substring(0, input.value.length - 1); - cm.state.fakedLastChar = false; - } - var text = input.value; - // If nothing changed, bail. - if (text == prevInput && !cm.somethingSelected()) return false; - // Work around nonsensical selection resetting in IE9/10, and - // inexplicable appearance of private area unicode characters on - // some key combos in Mac (#2689). - if (ie && ie_version >= 9 && cm.display.inputHasSelection === text || - mac && /[\uf700-\uf7ff]/.test(text)) { - resetInput(cm); - return false; - } - - var withOp = !cm.curOp; - if (withOp) startOperation(cm); - cm.display.shift = false; - - if (text.charCodeAt(0) == 0x200b && doc.sel == cm.display.selForContextMenu && !prevInput) - prevInput = "\u200b"; - // Find the part of the input that is actually new - var same = 0, l = Math.min(prevInput.length, text.length); - while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same; - var inserted = text.slice(same), textLines = splitLines(inserted); - - // When pasing N lines into N selections, insert one line per selection - var multiPaste = null; - if (cm.state.pasteIncoming && doc.sel.ranges.length > 1) { - if (lastCopied && lastCopied.join("\n") == inserted) - multiPaste = doc.sel.ranges.length % lastCopied.length == 0 && map(lastCopied, splitLines); - else if (textLines.length == doc.sel.ranges.length) - multiPaste = map(textLines, function(l) { return [l]; }); - } - - // Normal behavior is to insert the new text into every selection - for (var i = doc.sel.ranges.length - 1; i >= 0; i--) { - var range = doc.sel.ranges[i]; - var from = range.from(), to = range.to(); - // Handle deletion - if (same < prevInput.length) - from = Pos(from.line, from.ch - (prevInput.length - same)); - // Handle overwrite - else if (cm.state.overwrite && range.empty() && !cm.state.pasteIncoming) - to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length)); - var updateInput = cm.curOp.updateInput; - var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines, - origin: cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input"}; - makeChange(cm.doc, changeEvent); - signalLater(cm, "inputRead", cm, changeEvent); - // When an 'electric' character is inserted, immediately trigger a reindent - if (inserted && !cm.state.pasteIncoming && cm.options.electricChars && - cm.options.smartIndent && range.head.ch < 100 && - (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) { - var mode = cm.getModeAt(range.head); - var end = changeEnd(changeEvent); - if (mode.electricChars) { - for (var j = 0; j < mode.electricChars.length; j++) - if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) { - indentLine(cm, end.line, "smart"); - break; - } - } else if (mode.electricInput) { - if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch))) - indentLine(cm, end.line, "smart"); - } - } - } - ensureCursorVisible(cm); - cm.curOp.updateInput = updateInput; - cm.curOp.typing = true; - - // Don't leave long text in the textarea, since it makes further polling slow - if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = ""; - else cm.display.prevInput = text; - if (withOp) endOperation(cm); - cm.state.pasteIncoming = cm.state.cutIncoming = false; - return true; - } - - // Reset the input to correspond to the selection (or to be empty, - // when not typing and nothing is selected) - function resetInput(cm, typing) { - var minimal, selected, doc = cm.doc; - if (cm.somethingSelected()) { - cm.display.prevInput = ""; - var range = doc.sel.primary(); - minimal = hasCopyEvent && - (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000); - var content = minimal ? "-" : selected || cm.getSelection(); - cm.display.input.value = content; - if (cm.state.focused) selectInput(cm.display.input); - if (ie && ie_version >= 9) cm.display.inputHasSelection = content; - } else if (!typing) { - cm.display.prevInput = cm.display.input.value = ""; - if (ie && ie_version >= 9) cm.display.inputHasSelection = null; - } - cm.display.inaccurateSelection = minimal; - } - - function focusInput(cm) { - if (cm.options.readOnly != "nocursor" && (!mobile || activeElt() != cm.display.input)) - cm.display.input.focus(); - } - - function ensureFocus(cm) { - if (!cm.state.focused) { focusInput(cm); onFocus(cm); } - } - - function isReadOnly(cm) { - return cm.options.readOnly || cm.doc.cantEdit; - } - - // EVENT HANDLERS - - // Attach the necessary event handlers when initializing the editor - function registerEventHandlers(cm) { - var d = cm.display; - on(d.scroller, "mousedown", operation(cm, onMouseDown)); - // Older IE's will not fire a second mousedown for a double click - if (ie && ie_version < 11) - on(d.scroller, "dblclick", operation(cm, function(e) { - if (signalDOMEvent(cm, e)) return; - var pos = posFromMouse(cm, e); - if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return; - e_preventDefault(e); - var word = cm.findWordAt(pos); - extendSelection(cm.doc, word.anchor, word.head); - })); - else - on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); }); - // Prevent normal selection in the editor (we handle our own) - on(d.lineSpace, "selectstart", function(e) { - if (!eventInWidget(d, e)) e_preventDefault(e); - }); - // Some browsers fire contextmenu *after* opening the menu, at - // which point we can't mess with it anymore. Context menu is - // handled in onMouseDown for these browsers. - if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);}); - - // Sync scrolling between fake scrollbars and real scrollable - // area, ensure viewport is updated when scrolling. - on(d.scroller, "scroll", function() { - if (d.scroller.clientHeight) { - setScrollTop(cm, d.scroller.scrollTop); - setScrollLeft(cm, d.scroller.scrollLeft, true); - signal(cm, "scroll", cm); - } - }); - on(d.scrollbarV, "scroll", function() { - if (d.scroller.clientHeight) setScrollTop(cm, d.scrollbarV.scrollTop); - }); - on(d.scrollbarH, "scroll", function() { - if (d.scroller.clientHeight) setScrollLeft(cm, d.scrollbarH.scrollLeft); - }); - - // Listen to wheel events in order to try and update the viewport on time. - on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);}); - on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);}); - - // Prevent clicks in the scrollbars from killing focus - function reFocus() { if (cm.state.focused) setTimeout(bind(focusInput, cm), 0); } - on(d.scrollbarH, "mousedown", reFocus); - on(d.scrollbarV, "mousedown", reFocus); - // Prevent wrapper from ever scrolling - on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; }); - - on(d.input, "keyup", function(e) { onKeyUp.call(cm, e); }); - on(d.input, "input", function() { - if (ie && ie_version >= 9 && cm.display.inputHasSelection) cm.display.inputHasSelection = null; - fastPoll(cm); - }); - on(d.input, "keydown", operation(cm, onKeyDown)); - on(d.input, "keypress", operation(cm, onKeyPress)); - on(d.input, "focus", bind(onFocus, cm)); - on(d.input, "blur", bind(onBlur, cm)); - - function drag_(e) { - if (!signalDOMEvent(cm, e)) e_stop(e); - } - if (cm.options.dragDrop) { - on(d.scroller, "dragstart", function(e){onDragStart(cm, e);}); - on(d.scroller, "dragenter", drag_); - on(d.scroller, "dragover", drag_); - on(d.scroller, "drop", operation(cm, onDrop)); - } - on(d.scroller, "paste", function(e) { - if (eventInWidget(d, e)) return; - cm.state.pasteIncoming = true; - focusInput(cm); - fastPoll(cm); - }); - on(d.input, "paste", function() { - // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206 - // Add a char to the end of textarea before paste occur so that - // selection doesn't span to the end of textarea. - if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) { - var start = d.input.selectionStart, end = d.input.selectionEnd; - d.input.value += "$"; - // The selection end needs to be set before the start, otherwise there - // can be an intermediate non-empty selection between the two, which - // can override the middle-click paste buffer on linux and cause the - // wrong thing to get pasted. - d.input.selectionEnd = end; - d.input.selectionStart = start; - cm.state.fakedLastChar = true; - } - cm.state.pasteIncoming = true; - fastPoll(cm); - }); - - function prepareCopyCut(e) { - if (cm.somethingSelected()) { - lastCopied = cm.getSelections(); - if (d.inaccurateSelection) { - d.prevInput = ""; - d.inaccurateSelection = false; - d.input.value = lastCopied.join("\n"); - selectInput(d.input); - } - } else { - var text = [], ranges = []; - for (var i = 0; i < cm.doc.sel.ranges.length; i++) { - var line = cm.doc.sel.ranges[i].head.line; - var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)}; - ranges.push(lineRange); - text.push(cm.getRange(lineRange.anchor, lineRange.head)); - } - if (e.type == "cut") { - cm.setSelections(ranges, null, sel_dontScroll); - } else { - d.prevInput = ""; - d.input.value = text.join("\n"); - selectInput(d.input); - } - lastCopied = text; - } - if (e.type == "cut") cm.state.cutIncoming = true; - } - on(d.input, "cut", prepareCopyCut); - on(d.input, "copy", prepareCopyCut); - - // Needed to handle Tab key in KHTML - if (khtml) on(d.sizer, "mouseup", function() { - if (activeElt() == d.input) d.input.blur(); - focusInput(cm); - }); - } - - // Called when the window resizes - function onResize(cm) { - // Might be a text scaling operation, clear size caches. - var d = cm.display; - d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null; - cm.setSize(); - } - - // MOUSE EVENTS - - // Return true when the given mouse event happened in a widget - function eventInWidget(display, e) { - for (var n = e_target(e); n != display.wrapper; n = n.parentNode) { - if (!n || n.ignoreEvents || n.parentNode == display.sizer && n != display.mover) return true; - } - } - - // Given a mouse event, find the corresponding position. If liberal - // is false, it checks whether a gutter or scrollbar was clicked, - // and returns null if it was. forRect is used by rectangular - // selections, and tries to estimate a character position even for - // coordinates beyond the right of the text. - function posFromMouse(cm, e, liberal, forRect) { - var display = cm.display; - if (!liberal) { - var target = e_target(e); - if (target == display.scrollbarH || target == display.scrollbarV || - target == display.scrollbarFiller || target == display.gutterFiller) return null; - } - var x, y, space = display.lineSpace.getBoundingClientRect(); - // Fails unpredictably on IE[67] when mouse is dragged around quickly. - try { x = e.clientX - space.left; y = e.clientY - space.top; } - catch (e) { return null; } - var coords = coordsChar(cm, x, y), line; - if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) { - var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length; - coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff)); - } - return coords; - } - - // A mouse down can be a single click, double click, triple click, - // start of selection drag, start of text drag, new cursor - // (ctrl-click), rectangle drag (alt-drag), or xwin - // middle-click-paste. Or it might be a click on something we should - // not interfere with, such as a scrollbar or widget. - function onMouseDown(e) { - if (signalDOMEvent(this, e)) return; - var cm = this, display = cm.display; - display.shift = e.shiftKey; - - if (eventInWidget(display, e)) { - if (!webkit) { - // Briefly turn off draggability, to allow widgets to do - // normal dragging things. - display.scroller.draggable = false; - setTimeout(function(){display.scroller.draggable = true;}, 100); - } - return; - } - if (clickInGutter(cm, e)) return; - var start = posFromMouse(cm, e); - window.focus(); - - switch (e_button(e)) { - case 1: - if (start) - leftButtonDown(cm, e, start); - else if (e_target(e) == display.scroller) - e_preventDefault(e); - break; - case 2: - if (webkit) cm.state.lastMiddleDown = +new Date; - if (start) extendSelection(cm.doc, start); - setTimeout(bind(focusInput, cm), 20); - e_preventDefault(e); - break; - case 3: - if (captureRightClick) onContextMenu(cm, e); - break; - } - } - - var lastClick, lastDoubleClick; - function leftButtonDown(cm, e, start) { - setTimeout(bind(ensureFocus, cm), 0); - - var now = +new Date, type; - if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) { - type = "triple"; - } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) { - type = "double"; - lastDoubleClick = {time: now, pos: start}; - } else { - type = "single"; - lastClick = {time: now, pos: start}; - } - - var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey; - if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) && - type == "single" && sel.contains(start) > -1 && sel.somethingSelected()) - leftButtonStartDrag(cm, e, start, modifier); - else - leftButtonSelect(cm, e, start, type, modifier); - } - - // Start a text drag. When it ends, see if any dragging actually - // happen, and treat as a click if it didn't. - function leftButtonStartDrag(cm, e, start, modifier) { - var display = cm.display; - var dragEnd = operation(cm, function(e2) { - if (webkit) display.scroller.draggable = false; - cm.state.draggingText = false; - off(document, "mouseup", dragEnd); - off(display.scroller, "drop", dragEnd); - if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) { - e_preventDefault(e2); - if (!modifier) - extendSelection(cm.doc, start); - focusInput(cm); - // Work around unexplainable focus problem in IE9 (#2127) - if (ie && ie_version == 9) - setTimeout(function() {document.body.focus(); focusInput(cm);}, 20); - } - }); - // Let the drag handler handle this. - if (webkit) display.scroller.draggable = true; - cm.state.draggingText = dragEnd; - // IE's approach to draggable - if (display.scroller.dragDrop) display.scroller.dragDrop(); - on(document, "mouseup", dragEnd); - on(display.scroller, "drop", dragEnd); - } - - // Normal selection, as opposed to text dragging. - function leftButtonSelect(cm, e, start, type, addNew) { - var display = cm.display, doc = cm.doc; - e_preventDefault(e); - - var ourRange, ourIndex, startSel = doc.sel; - if (addNew && !e.shiftKey) { - ourIndex = doc.sel.contains(start); - if (ourIndex > -1) - ourRange = doc.sel.ranges[ourIndex]; - else - ourRange = new Range(start, start); - } else { - ourRange = doc.sel.primary(); - } - - if (e.altKey) { - type = "rect"; - if (!addNew) ourRange = new Range(start, start); - start = posFromMouse(cm, e, true, true); - ourIndex = -1; - } else if (type == "double") { - var word = cm.findWordAt(start); - if (cm.display.shift || doc.extend) - ourRange = extendRange(doc, ourRange, word.anchor, word.head); - else - ourRange = word; - } else if (type == "triple") { - var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0))); - if (cm.display.shift || doc.extend) - ourRange = extendRange(doc, ourRange, line.anchor, line.head); - else - ourRange = line; - } else { - ourRange = extendRange(doc, ourRange, start); - } - - if (!addNew) { - ourIndex = 0; - setSelection(doc, new Selection([ourRange], 0), sel_mouse); - startSel = doc.sel; - } else if (ourIndex > -1) { - replaceOneSelection(doc, ourIndex, ourRange, sel_mouse); - } else { - ourIndex = doc.sel.ranges.length; - setSelection(doc, normalizeSelection(doc.sel.ranges.concat([ourRange]), ourIndex), - {scroll: false, origin: "*mouse"}); - } - - var lastPos = start; - function extendTo(pos) { - if (cmp(lastPos, pos) == 0) return; - lastPos = pos; - - if (type == "rect") { - var ranges = [], tabSize = cm.options.tabSize; - var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize); - var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize); - var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol); - for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line)); - line <= end; line++) { - var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize); - if (left == right) - ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos))); - else if (text.length > leftPos) - ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize)))); - } - if (!ranges.length) ranges.push(new Range(start, start)); - setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex), - {origin: "*mouse", scroll: false}); - cm.scrollIntoView(pos); - } else { - var oldRange = ourRange; - var anchor = oldRange.anchor, head = pos; - if (type != "single") { - if (type == "double") - var range = cm.findWordAt(pos); - else - var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0))); - if (cmp(range.anchor, anchor) > 0) { - head = range.head; - anchor = minPos(oldRange.from(), range.anchor); - } else { - head = range.anchor; - anchor = maxPos(oldRange.to(), range.head); - } - } - var ranges = startSel.ranges.slice(0); - ranges[ourIndex] = new Range(clipPos(doc, anchor), head); - setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse); - } - } - - var editorSize = display.wrapper.getBoundingClientRect(); - // Used to ensure timeout re-tries don't fire when another extend - // happened in the meantime (clearTimeout isn't reliable -- at - // least on Chrome, the timeouts still happen even when cleared, - // if the clear happens after their scheduled firing time). - var counter = 0; - - function extend(e) { - var curCount = ++counter; - var cur = posFromMouse(cm, e, true, type == "rect"); - if (!cur) return; - if (cmp(cur, lastPos) != 0) { - ensureFocus(cm); - extendTo(cur); - var visible = visibleLines(display, doc); - if (cur.line >= visible.to || cur.line < visible.from) - setTimeout(operation(cm, function(){if (counter == curCount) extend(e);}), 150); - } else { - var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0; - if (outside) setTimeout(operation(cm, function() { - if (counter != curCount) return; - display.scroller.scrollTop += outside; - extend(e); - }), 50); - } - } - - function done(e) { - counter = Infinity; - e_preventDefault(e); - focusInput(cm); - off(document, "mousemove", move); - off(document, "mouseup", up); - doc.history.lastSelOrigin = null; - } - - var move = operation(cm, function(e) { - if (!e_button(e)) done(e); - else extend(e); - }); - var up = operation(cm, done); - on(document, "mousemove", move); - on(document, "mouseup", up); - } - - // Determines whether an event happened in the gutter, and fires the - // handlers for the corresponding event. - function gutterEvent(cm, e, type, prevent, signalfn) { - try { var mX = e.clientX, mY = e.clientY; } - catch(e) { return false; } - if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false; - if (prevent) e_preventDefault(e); - - var display = cm.display; - var lineBox = display.lineDiv.getBoundingClientRect(); - - if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e); - mY -= lineBox.top - display.viewOffset; - - for (var i = 0; i < cm.options.gutters.length; ++i) { - var g = display.gutters.childNodes[i]; - if (g && g.getBoundingClientRect().right >= mX) { - var line = lineAtHeight(cm.doc, mY); - var gutter = cm.options.gutters[i]; - signalfn(cm, type, cm, line, gutter, e); - return e_defaultPrevented(e); - } - } - } - - function clickInGutter(cm, e) { - return gutterEvent(cm, e, "gutterClick", true, signalLater); - } - - // Kludge to work around strange IE behavior where it'll sometimes - // re-fire a series of drag-related events right after the drop (#1551) - var lastDrop = 0; - - function onDrop(e) { - var cm = this; - if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) - return; - e_preventDefault(e); - if (ie) lastDrop = +new Date; - var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files; - if (!pos || isReadOnly(cm)) return; - // Might be a file drop, in which case we simply extract the text - // and insert it. - if (files && files.length && window.FileReader && window.File) { - var n = files.length, text = Array(n), read = 0; - var loadFile = function(file, i) { - var reader = new FileReader; - reader.onload = operation(cm, function() { - text[i] = reader.result; - if (++read == n) { - pos = clipPos(cm.doc, pos); - var change = {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"}; - makeChange(cm.doc, change); - setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change))); - } - }); - reader.readAsText(file); - }; - for (var i = 0; i < n; ++i) loadFile(files[i], i); - } else { // Normal drop - // Don't do a replace if the drop happened inside of the selected text. - if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) { - cm.state.draggingText(e); - // Ensure the editor is re-focused - setTimeout(bind(focusInput, cm), 20); - return; - } - try { - var text = e.dataTransfer.getData("Text"); - if (text) { - if (cm.state.draggingText && !(mac ? e.metaKey : e.ctrlKey)) - var selected = cm.listSelections(); - setSelectionNoUndo(cm.doc, simpleSelection(pos, pos)); - if (selected) for (var i = 0; i < selected.length; ++i) - replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag"); - cm.replaceSelection(text, "around", "paste"); - focusInput(cm); - } - } - catch(e){} - } - } - - function onDragStart(cm, e) { - if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; } - if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return; - - e.dataTransfer.setData("Text", cm.getSelection()); - - // Use dummy image instead of default browsers image. - // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there. - if (e.dataTransfer.setDragImage && !safari) { - var img = elt("img", null, null, "position: fixed; left: 0; top: 0;"); - img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="; - if (presto) { - img.width = img.height = 1; - cm.display.wrapper.appendChild(img); - // Force a relayout, or Opera won't use our image for some obscure reason - img._top = img.offsetTop; - } - e.dataTransfer.setDragImage(img, 0, 0); - if (presto) img.parentNode.removeChild(img); - } - } - - // SCROLL EVENTS - - // Sync the scrollable area and scrollbars, ensure the viewport - // covers the visible area. - function setScrollTop(cm, val) { - if (Math.abs(cm.doc.scrollTop - val) < 2) return; - cm.doc.scrollTop = val; - if (!gecko) updateDisplaySimple(cm, {top: val}); - if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val; - if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val; - if (gecko) updateDisplaySimple(cm); - startWorker(cm, 100); - } - // Sync scroller and scrollbar, ensure the gutter elements are - // aligned. - function setScrollLeft(cm, val, isScroller) { - if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return; - val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth); - cm.doc.scrollLeft = val; - alignHorizontally(cm); - if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val; - if (cm.display.scrollbarH.scrollLeft != val) cm.display.scrollbarH.scrollLeft = val; - } - - // Since the delta values reported on mouse wheel events are - // unstandardized between browsers and even browser versions, and - // generally horribly unpredictable, this code starts by measuring - // the scroll effect that the first few mouse wheel events have, - // and, from that, detects the way it can convert deltas to pixel - // offsets afterwards. - // - // The reason we want to know the amount a wheel event will scroll - // is that it gives us a chance to update the display before the - // actual scrolling happens, reducing flickering. - - var wheelSamples = 0, wheelPixelsPerUnit = null; - // Fill in a browser-detected starting value on browsers where we - // know one. These don't have to be accurate -- the result of them - // being wrong would just be a slight flicker on the first wheel - // scroll (if it is large enough). - if (ie) wheelPixelsPerUnit = -.53; - else if (gecko) wheelPixelsPerUnit = 15; - else if (chrome) wheelPixelsPerUnit = -.7; - else if (safari) wheelPixelsPerUnit = -1/3; - - function onScrollWheel(cm, e) { - var dx = e.wheelDeltaX, dy = e.wheelDeltaY; - if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail; - if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail; - else if (dy == null) dy = e.wheelDelta; - - var display = cm.display, scroll = display.scroller; - // Quit if there's nothing to scroll here - if (!(dx && scroll.scrollWidth > scroll.clientWidth || - dy && scroll.scrollHeight > scroll.clientHeight)) return; - - // Webkit browsers on OS X abort momentum scrolls when the target - // of the scroll event is removed from the scrollable element. - // This hack (see related code in patchDisplay) makes sure the - // element is kept around. - if (dy && mac && webkit) { - outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) { - for (var i = 0; i < view.length; i++) { - if (view[i].node == cur) { - cm.display.currentWheelTarget = cur; - break outer; - } - } - } - } - - // On some browsers, horizontal scrolling will cause redraws to - // happen before the gutter has been realigned, causing it to - // wriggle around in a most unseemly way. When we have an - // estimated pixels/delta value, we just handle horizontal - // scrolling entirely here. It'll be slightly off from native, but - // better than glitching out. - if (dx && !gecko && !presto && wheelPixelsPerUnit != null) { - if (dy) - setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight))); - setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth))); - e_preventDefault(e); - display.wheelStartX = null; // Abort measurement, if in progress - return; - } - - // 'Project' the visible viewport to cover the area that is being - // scrolled into view (if we know enough to estimate it). - if (dy && wheelPixelsPerUnit != null) { - var pixels = dy * wheelPixelsPerUnit; - var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight; - if (pixels < 0) top = Math.max(0, top + pixels - 50); - else bot = Math.min(cm.doc.height, bot + pixels + 50); - updateDisplaySimple(cm, {top: top, bottom: bot}); - } - - if (wheelSamples < 20) { - if (display.wheelStartX == null) { - display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop; - display.wheelDX = dx; display.wheelDY = dy; - setTimeout(function() { - if (display.wheelStartX == null) return; - var movedX = scroll.scrollLeft - display.wheelStartX; - var movedY = scroll.scrollTop - display.wheelStartY; - var sample = (movedY && display.wheelDY && movedY / display.wheelDY) || - (movedX && display.wheelDX && movedX / display.wheelDX); - display.wheelStartX = display.wheelStartY = null; - if (!sample) return; - wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1); - ++wheelSamples; - }, 200); - } else { - display.wheelDX += dx; display.wheelDY += dy; - } - } - } - - // KEY EVENTS - - // Run a handler that was bound to a key. - function doHandleBinding(cm, bound, dropShift) { - if (typeof bound == "string") { - bound = commands[bound]; - if (!bound) return false; - } - // Ensure previous input has been read, so that the handler sees a - // consistent view of the document - if (cm.display.pollingFast && readInput(cm)) cm.display.pollingFast = false; - var prevShift = cm.display.shift, done = false; - try { - if (isReadOnly(cm)) cm.state.suppressEdits = true; - if (dropShift) cm.display.shift = false; - done = bound(cm) != Pass; - } finally { - cm.display.shift = prevShift; - cm.state.suppressEdits = false; - } - return done; - } - - // Collect the currently active keymaps. - function allKeyMaps(cm) { - var maps = cm.state.keyMaps.slice(0); - if (cm.options.extraKeys) maps.push(cm.options.extraKeys); - maps.push(cm.options.keyMap); - return maps; - } - - var maybeTransition; - // Handle a key from the keydown event. - function handleKeyBinding(cm, e) { - // Handle automatic keymap transitions - var startMap = getKeyMap(cm.options.keyMap), next = startMap.auto; - clearTimeout(maybeTransition); - if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() { - if (getKeyMap(cm.options.keyMap) == startMap) { - cm.options.keyMap = (next.call ? next.call(null, cm) : next); - keyMapChanged(cm); - } - }, 50); - - var name = keyName(e, true), handled = false; - if (!name) return false; - var keymaps = allKeyMaps(cm); - - if (e.shiftKey) { - // First try to resolve full name (including 'Shift-'). Failing - // that, see if there is a cursor-motion command (starting with - // 'go') bound to the keyname without 'Shift-'. - handled = lookupKey("Shift-" + name, keymaps, function(b) {return doHandleBinding(cm, b, true);}) - || lookupKey(name, keymaps, function(b) { - if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion) - return doHandleBinding(cm, b); - }); - } else { - handled = lookupKey(name, keymaps, function(b) { return doHandleBinding(cm, b); }); - } - - if (handled) { - e_preventDefault(e); - restartBlink(cm); - signalLater(cm, "keyHandled", cm, name, e); - } - return handled; - } - - // Handle a key from the keypress event - function handleCharBinding(cm, e, ch) { - var handled = lookupKey("'" + ch + "'", allKeyMaps(cm), - function(b) { return doHandleBinding(cm, b, true); }); - if (handled) { - e_preventDefault(e); - restartBlink(cm); - signalLater(cm, "keyHandled", cm, "'" + ch + "'", e); - } - return handled; - } - - var lastStoppedKey = null; - function onKeyDown(e) { - var cm = this; - ensureFocus(cm); - if (signalDOMEvent(cm, e)) return; - // IE does strange things with escape. - if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false; - var code = e.keyCode; - cm.display.shift = code == 16 || e.shiftKey; - var handled = handleKeyBinding(cm, e); - if (presto) { - lastStoppedKey = handled ? code : null; - // Opera has no cut event... we try to at least catch the key combo - if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey)) - cm.replaceSelection("", null, "cut"); - } - - // Turn mouse into crosshair when Alt is held on Mac. - if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className)) - showCrossHair(cm); - } - - function showCrossHair(cm) { - var lineDiv = cm.display.lineDiv; - addClass(lineDiv, "CodeMirror-crosshair"); - - function up(e) { - if (e.keyCode == 18 || !e.altKey) { - rmClass(lineDiv, "CodeMirror-crosshair"); - off(document, "keyup", up); - off(document, "mouseover", up); - } - } - on(document, "keyup", up); - on(document, "mouseover", up); - } - - function onKeyUp(e) { - if (e.keyCode == 16) this.doc.sel.shift = false; - signalDOMEvent(this, e); - } - - function onKeyPress(e) { - var cm = this; - if (signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return; - var keyCode = e.keyCode, charCode = e.charCode; - if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;} - if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return; - var ch = String.fromCharCode(charCode == null ? keyCode : charCode); - if (handleCharBinding(cm, e, ch)) return; - if (ie && ie_version >= 9) cm.display.inputHasSelection = null; - fastPoll(cm); - } - - // FOCUS/BLUR EVENTS - - function onFocus(cm) { - if (cm.options.readOnly == "nocursor") return; - if (!cm.state.focused) { - signal(cm, "focus", cm); - cm.state.focused = true; - addClass(cm.display.wrapper, "CodeMirror-focused"); - // The prevInput test prevents this from firing when a context - // menu is closed (since the resetInput would kill the - // select-all detection hack) - if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) { - resetInput(cm); - if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730 - } - } - slowPoll(cm); - restartBlink(cm); - } - function onBlur(cm) { - if (cm.state.focused) { - signal(cm, "blur", cm); - cm.state.focused = false; - rmClass(cm.display.wrapper, "CodeMirror-focused"); - } - clearInterval(cm.display.blinker); - setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150); - } - - // CONTEXT MENU HANDLING - - // To make the context menu work, we need to briefly unhide the - // textarea (making it as unobtrusive as possible) to let the - // right-click take effect on it. - function onContextMenu(cm, e) { - if (signalDOMEvent(cm, e, "contextmenu")) return; - var display = cm.display; - if (eventInWidget(display, e) || contextMenuInGutter(cm, e)) return; - - var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop; - if (!pos || presto) return; // Opera is difficult. - - // Reset the current text selection only if the click is done outside of the selection - // and 'resetSelectionOnContextMenu' option is true. - var reset = cm.options.resetSelectionOnContextMenu; - if (reset && cm.doc.sel.contains(pos) == -1) - operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll); - - var oldCSS = display.input.style.cssText; - display.inputDiv.style.position = "absolute"; - display.input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) + - "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " + - (ie ? "rgba(255, 255, 255, .05)" : "transparent") + - "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"; - if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712) - focusInput(cm); - if (webkit) window.scrollTo(null, oldScrollY); - resetInput(cm); - // Adds "Select all" to context menu in FF - if (!cm.somethingSelected()) display.input.value = display.prevInput = " "; - display.selForContextMenu = cm.doc.sel; - clearTimeout(display.detectingSelectAll); - - // Select-all will be greyed out if there's nothing to select, so - // this adds a zero-width space so that we can later check whether - // it got selected. - function prepareSelectAllHack() { - if (display.input.selectionStart != null) { - var selected = cm.somethingSelected(); - var extval = display.input.value = "\u200b" + (selected ? display.input.value : ""); - display.prevInput = selected ? "" : "\u200b"; - display.input.selectionStart = 1; display.input.selectionEnd = extval.length; - // Re-set this, in case some other handler touched the - // selection in the meantime. - display.selForContextMenu = cm.doc.sel; - } - } - function rehide() { - display.inputDiv.style.position = "relative"; - display.input.style.cssText = oldCSS; - if (ie && ie_version < 9) display.scrollbarV.scrollTop = display.scroller.scrollTop = scrollPos; - slowPoll(cm); - - // Try to detect the user choosing select-all - if (display.input.selectionStart != null) { - if (!ie || (ie && ie_version < 9)) prepareSelectAllHack(); - var i = 0, poll = function() { - if (display.selForContextMenu == cm.doc.sel && display.input.selectionStart == 0) - operation(cm, commands.selectAll)(cm); - else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500); - else resetInput(cm); - }; - display.detectingSelectAll = setTimeout(poll, 200); - } - } - - if (ie && ie_version >= 9) prepareSelectAllHack(); - if (captureRightClick) { - e_stop(e); - var mouseup = function() { - off(window, "mouseup", mouseup); - setTimeout(rehide, 20); - }; - on(window, "mouseup", mouseup); - } else { - setTimeout(rehide, 50); - } - } - - function contextMenuInGutter(cm, e) { - if (!hasHandler(cm, "gutterContextMenu")) return false; - return gutterEvent(cm, e, "gutterContextMenu", false, signal); - } - - // UPDATING - - // Compute the position of the end of a change (its 'to' property - // refers to the pre-change end). - var changeEnd = CodeMirror.changeEnd = function(change) { - if (!change.text) return change.to; - return Pos(change.from.line + change.text.length - 1, - lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0)); - }; - - // Adjust a position to refer to the post-change position of the - // same text, or the end of the change if the change covers it. - function adjustForChange(pos, change) { - if (cmp(pos, change.from) < 0) return pos; - if (cmp(pos, change.to) <= 0) return changeEnd(change); - - var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch; - if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch; - return Pos(line, ch); - } - - function computeSelAfterChange(doc, change) { - var out = []; - for (var i = 0; i < doc.sel.ranges.length; i++) { - var range = doc.sel.ranges[i]; - out.push(new Range(adjustForChange(range.anchor, change), - adjustForChange(range.head, change))); - } - return normalizeSelection(out, doc.sel.primIndex); - } - - function offsetPos(pos, old, nw) { - if (pos.line == old.line) - return Pos(nw.line, pos.ch - old.ch + nw.ch); - else - return Pos(nw.line + (pos.line - old.line), pos.ch); - } - - // Used by replaceSelections to allow moving the selection to the - // start or around the replaced test. Hint may be "start" or "around". - function computeReplacedSel(doc, changes, hint) { - var out = []; - var oldPrev = Pos(doc.first, 0), newPrev = oldPrev; - for (var i = 0; i < changes.length; i++) { - var change = changes[i]; - var from = offsetPos(change.from, oldPrev, newPrev); - var to = offsetPos(changeEnd(change), oldPrev, newPrev); - oldPrev = change.to; - newPrev = to; - if (hint == "around") { - var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0; - out[i] = new Range(inv ? to : from, inv ? from : to); - } else { - out[i] = new Range(from, from); - } - } - return new Selection(out, doc.sel.primIndex); - } - - // Allow "beforeChange" event handlers to influence a change - function filterChange(doc, change, update) { - var obj = { - canceled: false, - from: change.from, - to: change.to, - text: change.text, - origin: change.origin, - cancel: function() { this.canceled = true; } - }; - if (update) obj.update = function(from, to, text, origin) { - if (from) this.from = clipPos(doc, from); - if (to) this.to = clipPos(doc, to); - if (text) this.text = text; - if (origin !== undefined) this.origin = origin; - }; - signal(doc, "beforeChange", doc, obj); - if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj); - - if (obj.canceled) return null; - return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin}; - } - - // Apply a change to a document, and add it to the document's - // history, and propagating it to all linked documents. - function makeChange(doc, change, ignoreReadOnly) { - if (doc.cm) { - if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly); - if (doc.cm.state.suppressEdits) return; - } - - if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) { - change = filterChange(doc, change, true); - if (!change) return; - } - - // Possibly split or suppress the update based on the presence - // of read-only spans in its range. - var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to); - if (split) { - for (var i = split.length - 1; i >= 0; --i) - makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text}); - } else { - makeChangeInner(doc, change); - } - } - - function makeChangeInner(doc, change) { - if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return; - var selAfter = computeSelAfterChange(doc, change); - addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN); - - makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change)); - var rebased = []; - - linkedDocs(doc, function(doc, sharedHist) { - if (!sharedHist && indexOf(rebased, doc.history) == -1) { - rebaseHist(doc.history, change); - rebased.push(doc.history); - } - makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change)); - }); - } - - // Revert a change stored in a document's history. - function makeChangeFromHistory(doc, type, allowSelectionOnly) { - if (doc.cm && doc.cm.state.suppressEdits) return; - - var hist = doc.history, event, selAfter = doc.sel; - var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done; - - // Verify that there is a useable event (so that ctrl-z won't - // needlessly clear selection events) - for (var i = 0; i < source.length; i++) { - event = source[i]; - if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges) - break; - } - if (i == source.length) return; - hist.lastOrigin = hist.lastSelOrigin = null; - - for (;;) { - event = source.pop(); - if (event.ranges) { - pushSelectionToHistory(event, dest); - if (allowSelectionOnly && !event.equals(doc.sel)) { - setSelection(doc, event, {clearRedo: false}); - return; - } - selAfter = event; - } - else break; - } - - // Build up a reverse change object to add to the opposite history - // stack (redo when undoing, and vice versa). - var antiChanges = []; - pushSelectionToHistory(selAfter, dest); - dest.push({changes: antiChanges, generation: hist.generation}); - hist.generation = event.generation || ++hist.maxGeneration; - - var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange"); - - for (var i = event.changes.length - 1; i >= 0; --i) { - var change = event.changes[i]; - change.origin = type; - if (filter && !filterChange(doc, change, false)) { - source.length = 0; - return; - } - - antiChanges.push(historyChangeFromChange(doc, change)); - - var after = i ? computeSelAfterChange(doc, change) : lst(source); - makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change)); - if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)}); - var rebased = []; - - // Propagate to the linked documents - linkedDocs(doc, function(doc, sharedHist) { - if (!sharedHist && indexOf(rebased, doc.history) == -1) { - rebaseHist(doc.history, change); - rebased.push(doc.history); - } - makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change)); - }); - } - } - - // Sub-views need their line numbers shifted when text is added - // above or below them in the parent document. - function shiftDoc(doc, distance) { - if (distance == 0) return; - doc.first += distance; - doc.sel = new Selection(map(doc.sel.ranges, function(range) { - return new Range(Pos(range.anchor.line + distance, range.anchor.ch), - Pos(range.head.line + distance, range.head.ch)); - }), doc.sel.primIndex); - if (doc.cm) { - regChange(doc.cm, doc.first, doc.first - distance, distance); - for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++) - regLineChange(doc.cm, l, "gutter"); - } - } - - // More lower-level change function, handling only a single document - // (not linked ones). - function makeChangeSingleDoc(doc, change, selAfter, spans) { - if (doc.cm && !doc.cm.curOp) - return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans); - - if (change.to.line < doc.first) { - shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line)); - return; - } - if (change.from.line > doc.lastLine()) return; - - // Clip the change to the size of this doc - if (change.from.line < doc.first) { - var shift = change.text.length - 1 - (doc.first - change.from.line); - shiftDoc(doc, shift); - change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch), - text: [lst(change.text)], origin: change.origin}; - } - var last = doc.lastLine(); - if (change.to.line > last) { - change = {from: change.from, to: Pos(last, getLine(doc, last).text.length), - text: [change.text[0]], origin: change.origin}; - } - - change.removed = getBetween(doc, change.from, change.to); - - if (!selAfter) selAfter = computeSelAfterChange(doc, change); - if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans); - else updateDoc(doc, change, spans); - setSelectionNoUndo(doc, selAfter, sel_dontScroll); - } - - // Handle the interaction of a change to a document with the editor - // that this document is part of. - function makeChangeSingleDocInEditor(cm, change, spans) { - var doc = cm.doc, display = cm.display, from = change.from, to = change.to; - - var recomputeMaxLength = false, checkWidthStart = from.line; - if (!cm.options.lineWrapping) { - checkWidthStart = lineNo(visualLine(getLine(doc, from.line))); - doc.iter(checkWidthStart, to.line + 1, function(line) { - if (line == display.maxLine) { - recomputeMaxLength = true; - return true; - } - }); - } - - if (doc.sel.contains(change.from, change.to) > -1) - signalCursorActivity(cm); - - updateDoc(doc, change, spans, estimateHeight(cm)); - - if (!cm.options.lineWrapping) { - doc.iter(checkWidthStart, from.line + change.text.length, function(line) { - var len = lineLength(line); - if (len > display.maxLineLength) { - display.maxLine = line; - display.maxLineLength = len; - display.maxLineChanged = true; - recomputeMaxLength = false; - } - }); - if (recomputeMaxLength) cm.curOp.updateMaxLine = true; - } - - // Adjust frontier, schedule worker - doc.frontier = Math.min(doc.frontier, from.line); - startWorker(cm, 400); - - var lendiff = change.text.length - (to.line - from.line) - 1; - // Remember that these lines changed, for updating the display - if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change)) - regLineChange(cm, from.line, "text"); - else - regChange(cm, from.line, to.line + 1, lendiff); - - var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change"); - if (changeHandler || changesHandler) { - var obj = { - from: from, to: to, - text: change.text, - removed: change.removed, - origin: change.origin - }; - if (changeHandler) signalLater(cm, "change", cm, obj); - if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj); - } - cm.display.selForContextMenu = null; - } - - function replaceRange(doc, code, from, to, origin) { - if (!to) to = from; - if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; } - if (typeof code == "string") code = splitLines(code); - makeChange(doc, {from: from, to: to, text: code, origin: origin}); - } - - // SCROLLING THINGS INTO VIEW - - // If an editor sits on the top or bottom of the window, partially - // scrolled out of view, this ensures that the cursor is visible. - function maybeScrollWindow(cm, coords) { - var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null; - if (coords.top + box.top < 0) doScroll = true; - else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false; - if (doScroll != null && !phantom) { - var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " + - (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " + - (coords.bottom - coords.top + scrollerCutOff) + "px; left: " + - coords.left + "px; width: 2px;"); - cm.display.lineSpace.appendChild(scrollNode); - scrollNode.scrollIntoView(doScroll); - cm.display.lineSpace.removeChild(scrollNode); - } - } - - // Scroll a given position into view (immediately), verifying that - // it actually became visible (as line heights are accurately - // measured, the position of something may 'drift' during drawing). - function scrollPosIntoView(cm, pos, end, margin) { - if (margin == null) margin = 0; - for (var limit = 0; limit < 5; limit++) { - var changed = false, coords = cursorCoords(cm, pos); - var endCoords = !end || end == pos ? coords : cursorCoords(cm, end); - var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left), - Math.min(coords.top, endCoords.top) - margin, - Math.max(coords.left, endCoords.left), - Math.max(coords.bottom, endCoords.bottom) + margin); - var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft; - if (scrollPos.scrollTop != null) { - setScrollTop(cm, scrollPos.scrollTop); - if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true; - } - if (scrollPos.scrollLeft != null) { - setScrollLeft(cm, scrollPos.scrollLeft); - if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true; - } - if (!changed) return coords; - } - } - - // Scroll a given set of coordinates into view (immediately). - function scrollIntoView(cm, x1, y1, x2, y2) { - var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2); - if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop); - if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft); - } - - // Calculate a new scroll position needed to scroll the given - // rectangle into view. Returns an object with scrollTop and - // scrollLeft properties. When these are undefined, the - // vertical/horizontal position does not need to be adjusted. - function calculateScrollPos(cm, x1, y1, x2, y2) { - var display = cm.display, snapMargin = textHeight(cm.display); - if (y1 < 0) y1 = 0; - var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop; - var screen = display.scroller.clientHeight - scrollerCutOff, result = {}; - if (y2 - y1 > screen) y2 = y1 + screen; - var docBottom = cm.doc.height + paddingVert(display); - var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin; - if (y1 < screentop) { - result.scrollTop = atTop ? 0 : y1; - } else if (y2 > screentop + screen) { - var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen); - if (newTop != screentop) result.scrollTop = newTop; - } - - var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft; - var screenw = display.scroller.clientWidth - scrollerCutOff - display.gutters.offsetWidth; - var tooWide = x2 - x1 > screenw; - if (tooWide) x2 = x1 + screenw; - if (x1 < 10) - result.scrollLeft = 0; - else if (x1 < screenleft) - result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10)); - else if (x2 > screenw + screenleft - 3) - result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw; - - return result; - } - - // Store a relative adjustment to the scroll position in the current - // operation (to be applied when the operation finishes). - function addToScrollPos(cm, left, top) { - if (left != null || top != null) resolveScrollToPos(cm); - if (left != null) - cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left; - if (top != null) - cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top; - } - - // Make sure that at the end of the operation the current cursor is - // shown. - function ensureCursorVisible(cm) { - resolveScrollToPos(cm); - var cur = cm.getCursor(), from = cur, to = cur; - if (!cm.options.lineWrapping) { - from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur; - to = Pos(cur.line, cur.ch + 1); - } - cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true}; - } - - // When an operation has its scrollToPos property set, and another - // scroll action is applied before the end of the operation, this - // 'simulates' scrolling that position into view in a cheap way, so - // that the effect of intermediate scroll commands is not ignored. - function resolveScrollToPos(cm) { - var range = cm.curOp.scrollToPos; - if (range) { - cm.curOp.scrollToPos = null; - var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to); - var sPos = calculateScrollPos(cm, Math.min(from.left, to.left), - Math.min(from.top, to.top) - range.margin, - Math.max(from.right, to.right), - Math.max(from.bottom, to.bottom) + range.margin); - cm.scrollTo(sPos.scrollLeft, sPos.scrollTop); - } - } - - // API UTILITIES - - // Indent the given line. The how parameter can be "smart", - // "add"/null, "subtract", or "prev". When aggressive is false - // (typically set to true for forced single-line indents), empty - // lines are not indented, and places where the mode returns Pass - // are left alone. - function indentLine(cm, n, how, aggressive) { - var doc = cm.doc, state; - if (how == null) how = "add"; - if (how == "smart") { - // Fall back to "prev" when the mode doesn't have an indentation - // method. - if (!doc.mode.indent) how = "prev"; - else state = getStateBefore(cm, n); - } - - var tabSize = cm.options.tabSize; - var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize); - if (line.stateAfter) line.stateAfter = null; - var curSpaceString = line.text.match(/^\s*/)[0], indentation; - if (!aggressive && !/\S/.test(line.text)) { - indentation = 0; - how = "not"; - } else if (how == "smart") { - indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text); - if (indentation == Pass || indentation > 150) { - if (!aggressive) return; - how = "prev"; - } - } - if (how == "prev") { - if (n > doc.first) indentation = countColumn(getLine(doc, n-1).text, null, tabSize); - else indentation = 0; - } else if (how == "add") { - indentation = curSpace + cm.options.indentUnit; - } else if (how == "subtract") { - indentation = curSpace - cm.options.indentUnit; - } else if (typeof how == "number") { - indentation = curSpace + how; - } - indentation = Math.max(0, indentation); - - var indentString = "", pos = 0; - if (cm.options.indentWithTabs) - for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";} - if (pos < indentation) indentString += spaceStr(indentation - pos); - - if (indentString != curSpaceString) { - replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input"); - } else { - // Ensure that, if the cursor was in the whitespace at the start - // of the line, it is moved to the end of that space. - for (var i = 0; i < doc.sel.ranges.length; i++) { - var range = doc.sel.ranges[i]; - if (range.head.line == n && range.head.ch < curSpaceString.length) { - var pos = Pos(n, curSpaceString.length); - replaceOneSelection(doc, i, new Range(pos, pos)); - break; - } - } - } - line.stateAfter = null; - } - - // Utility for applying a change to a line by handle or number, - // returning the number and optionally registering the line as - // changed. - function changeLine(doc, handle, changeType, op) { - var no = handle, line = handle; - if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle)); - else no = lineNo(handle); - if (no == null) return null; - if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType); - return line; - } - - // Helper for deleting text near the selection(s), used to implement - // backspace, delete, and similar functionality. - function deleteNearSelection(cm, compute) { - var ranges = cm.doc.sel.ranges, kill = []; - // Build up a set of ranges to kill first, merging overlapping - // ranges. - for (var i = 0; i < ranges.length; i++) { - var toKill = compute(ranges[i]); - while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) { - var replaced = kill.pop(); - if (cmp(replaced.from, toKill.from) < 0) { - toKill.from = replaced.from; - break; - } - } - kill.push(toKill); - } - // Next, remove those actual ranges. - runInOp(cm, function() { - for (var i = kill.length - 1; i >= 0; i--) - replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete"); - ensureCursorVisible(cm); - }); - } - - // Used for horizontal relative motion. Dir is -1 or 1 (left or - // right), unit can be "char", "column" (like char, but doesn't - // cross line boundaries), "word" (across next word), or "group" (to - // the start of next group of word or non-word-non-whitespace - // chars). The visually param controls whether, in right-to-left - // text, direction 1 means to move towards the next index in the - // string, or towards the character to the right of the current - // position. The resulting position will have a hitSide=true - // property if it reached the end of the document. - function findPosH(doc, pos, dir, unit, visually) { - var line = pos.line, ch = pos.ch, origDir = dir; - var lineObj = getLine(doc, line); - var possible = true; - function findNextLine() { - var l = line + dir; - if (l < doc.first || l >= doc.first + doc.size) return (possible = false); - line = l; - return lineObj = getLine(doc, l); - } - function moveOnce(boundToLine) { - var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true); - if (next == null) { - if (!boundToLine && findNextLine()) { - if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj); - else ch = dir < 0 ? lineObj.text.length : 0; - } else return (possible = false); - } else ch = next; - return true; - } - - if (unit == "char") moveOnce(); - else if (unit == "column") moveOnce(true); - else if (unit == "word" || unit == "group") { - var sawType = null, group = unit == "group"; - var helper = doc.cm && doc.cm.getHelper(pos, "wordChars"); - for (var first = true;; first = false) { - if (dir < 0 && !moveOnce(!first)) break; - var cur = lineObj.text.charAt(ch) || "\n"; - var type = isWordChar(cur, helper) ? "w" - : group && cur == "\n" ? "n" - : !group || /\s/.test(cur) ? null - : "p"; - if (group && !first && !type) type = "s"; - if (sawType && sawType != type) { - if (dir < 0) {dir = 1; moveOnce();} - break; - } - - if (type) sawType = type; - if (dir > 0 && !moveOnce(!first)) break; - } - } - var result = skipAtomic(doc, Pos(line, ch), origDir, true); - if (!possible) result.hitSide = true; - return result; - } - - // For relative vertical movement. Dir may be -1 or 1. Unit can be - // "page" or "line". The resulting position will have a hitSide=true - // property if it reached the end of the document. - function findPosV(cm, pos, dir, unit) { - var doc = cm.doc, x = pos.left, y; - if (unit == "page") { - var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight); - y = pos.top + dir * (pageSize - (dir < 0 ? 1.5 : .5) * textHeight(cm.display)); - } else if (unit == "line") { - y = dir > 0 ? pos.bottom + 3 : pos.top - 3; - } - for (;;) { - var target = coordsChar(cm, x, y); - if (!target.outside) break; - if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; } - y += dir * 5; - } - return target; - } - - // EDITOR METHODS - - // The publicly visible API. Note that methodOp(f) means - // 'wrap f in an operation, performed on its `this` parameter'. - - // This is not the complete set of editor methods. Most of the - // methods defined on the Doc type are also injected into - // CodeMirror.prototype, for backwards compatibility and - // convenience. - - CodeMirror.prototype = { - constructor: CodeMirror, - focus: function(){window.focus(); focusInput(this); fastPoll(this);}, - - setOption: function(option, value) { - var options = this.options, old = options[option]; - if (options[option] == value && option != "mode") return; - options[option] = value; - if (optionHandlers.hasOwnProperty(option)) - operation(this, optionHandlers[option])(this, value, old); - }, - - getOption: function(option) {return this.options[option];}, - getDoc: function() {return this.doc;}, - - addKeyMap: function(map, bottom) { - this.state.keyMaps[bottom ? "push" : "unshift"](map); - }, - removeKeyMap: function(map) { - var maps = this.state.keyMaps; - for (var i = 0; i < maps.length; ++i) - if (maps[i] == map || (typeof maps[i] != "string" && maps[i].name == map)) { - maps.splice(i, 1); - return true; - } - }, - - addOverlay: methodOp(function(spec, options) { - var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec); - if (mode.startState) throw new Error("Overlays may not be stateful."); - this.state.overlays.push({mode: mode, modeSpec: spec, opaque: options && options.opaque}); - this.state.modeGen++; - regChange(this); - }), - removeOverlay: methodOp(function(spec) { - var overlays = this.state.overlays; - for (var i = 0; i < overlays.length; ++i) { - var cur = overlays[i].modeSpec; - if (cur == spec || typeof spec == "string" && cur.name == spec) { - overlays.splice(i, 1); - this.state.modeGen++; - regChange(this); - return; - } - } - }), - - indentLine: methodOp(function(n, dir, aggressive) { - if (typeof dir != "string" && typeof dir != "number") { - if (dir == null) dir = this.options.smartIndent ? "smart" : "prev"; - else dir = dir ? "add" : "subtract"; - } - if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive); - }), - indentSelection: methodOp(function(how) { - var ranges = this.doc.sel.ranges, end = -1; - for (var i = 0; i < ranges.length; i++) { - var range = ranges[i]; - if (!range.empty()) { - var from = range.from(), to = range.to(); - var start = Math.max(end, from.line); - end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1; - for (var j = start; j < end; ++j) - indentLine(this, j, how); - var newRanges = this.doc.sel.ranges; - if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0) - replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll); - } else if (range.head.line > end) { - indentLine(this, range.head.line, how, true); - end = range.head.line; - if (i == this.doc.sel.primIndex) ensureCursorVisible(this); - } - } - }), - - // Fetch the parser token for a given character. Useful for hacks - // that want to inspect the mode state (say, for completion). - getTokenAt: function(pos, precise) { - var doc = this.doc; - pos = clipPos(doc, pos); - var state = getStateBefore(this, pos.line, precise), mode = this.doc.mode; - var line = getLine(doc, pos.line); - var stream = new StringStream(line.text, this.options.tabSize); - while (stream.pos < pos.ch && !stream.eol()) { - stream.start = stream.pos; - var style = readToken(mode, stream, state); - } - return {start: stream.start, - end: stream.pos, - string: stream.current(), - type: style || null, - state: state}; - }, - - getTokenTypeAt: function(pos) { - pos = clipPos(this.doc, pos); - var styles = getLineStyles(this, getLine(this.doc, pos.line)); - var before = 0, after = (styles.length - 1) / 2, ch = pos.ch; - var type; - if (ch == 0) type = styles[2]; - else for (;;) { - var mid = (before + after) >> 1; - if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid; - else if (styles[mid * 2 + 1] < ch) before = mid + 1; - else { type = styles[mid * 2 + 2]; break; } - } - var cut = type ? type.indexOf("cm-overlay ") : -1; - return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1); - }, - - getModeAt: function(pos) { - var mode = this.doc.mode; - if (!mode.innerMode) return mode; - return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode; - }, - - getHelper: function(pos, type) { - return this.getHelpers(pos, type)[0]; - }, - - getHelpers: function(pos, type) { - var found = []; - if (!helpers.hasOwnProperty(type)) return helpers; - var help = helpers[type], mode = this.getModeAt(pos); - if (typeof mode[type] == "string") { - if (help[mode[type]]) found.push(help[mode[type]]); - } else if (mode[type]) { - for (var i = 0; i < mode[type].length; i++) { - var val = help[mode[type][i]]; - if (val) found.push(val); - } - } else if (mode.helperType && help[mode.helperType]) { - found.push(help[mode.helperType]); - } else if (help[mode.name]) { - found.push(help[mode.name]); - } - for (var i = 0; i < help._global.length; i++) { - var cur = help._global[i]; - if (cur.pred(mode, this) && indexOf(found, cur.val) == -1) - found.push(cur.val); - } - return found; - }, - - getStateAfter: function(line, precise) { - var doc = this.doc; - line = clipLine(doc, line == null ? doc.first + doc.size - 1: line); - return getStateBefore(this, line + 1, precise); - }, - - cursorCoords: function(start, mode) { - var pos, range = this.doc.sel.primary(); - if (start == null) pos = range.head; - else if (typeof start == "object") pos = clipPos(this.doc, start); - else pos = start ? range.from() : range.to(); - return cursorCoords(this, pos, mode || "page"); - }, - - charCoords: function(pos, mode) { - return charCoords(this, clipPos(this.doc, pos), mode || "page"); - }, - - coordsChar: function(coords, mode) { - coords = fromCoordSystem(this, coords, mode || "page"); - return coordsChar(this, coords.left, coords.top); - }, - - lineAtHeight: function(height, mode) { - height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top; - return lineAtHeight(this.doc, height + this.display.viewOffset); - }, - heightAtLine: function(line, mode) { - var end = false, last = this.doc.first + this.doc.size - 1; - if (line < this.doc.first) line = this.doc.first; - else if (line > last) { line = last; end = true; } - var lineObj = getLine(this.doc, line); - return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top + - (end ? this.doc.height - heightAtLine(lineObj) : 0); - }, - - defaultTextHeight: function() { return textHeight(this.display); }, - defaultCharWidth: function() { return charWidth(this.display); }, - - setGutterMarker: methodOp(function(line, gutterID, value) { - return changeLine(this.doc, line, "gutter", function(line) { - var markers = line.gutterMarkers || (line.gutterMarkers = {}); - markers[gutterID] = value; - if (!value && isEmpty(markers)) line.gutterMarkers = null; - return true; - }); - }), - - clearGutter: methodOp(function(gutterID) { - var cm = this, doc = cm.doc, i = doc.first; - doc.iter(function(line) { - if (line.gutterMarkers && line.gutterMarkers[gutterID]) { - line.gutterMarkers[gutterID] = null; - regLineChange(cm, i, "gutter"); - if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null; - } - ++i; - }); - }), - - addLineWidget: methodOp(function(handle, node, options) { - return addLineWidget(this, handle, node, options); - }), - - removeLineWidget: function(widget) { widget.clear(); }, - - lineInfo: function(line) { - if (typeof line == "number") { - if (!isLine(this.doc, line)) return null; - var n = line; - line = getLine(this.doc, line); - if (!line) return null; - } else { - var n = lineNo(line); - if (n == null) return null; - } - return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers, - textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass, - widgets: line.widgets}; - }, - - getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo};}, - - addWidget: function(pos, node, scroll, vert, horiz) { - var display = this.display; - pos = cursorCoords(this, clipPos(this.doc, pos)); - var top = pos.bottom, left = pos.left; - node.style.position = "absolute"; - display.sizer.appendChild(node); - if (vert == "over") { - top = pos.top; - } else if (vert == "above" || vert == "near") { - var vspace = Math.max(display.wrapper.clientHeight, this.doc.height), - hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth); - // Default to positioning above (if specified and possible); otherwise default to positioning below - if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight) - top = pos.top - node.offsetHeight; - else if (pos.bottom + node.offsetHeight <= vspace) - top = pos.bottom; - if (left + node.offsetWidth > hspace) - left = hspace - node.offsetWidth; - } - node.style.top = top + "px"; - node.style.left = node.style.right = ""; - if (horiz == "right") { - left = display.sizer.clientWidth - node.offsetWidth; - node.style.right = "0px"; - } else { - if (horiz == "left") left = 0; - else if (horiz == "middle") left = (display.sizer.clientWidth - node.offsetWidth) / 2; - node.style.left = left + "px"; - } - if (scroll) - scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight); - }, - - triggerOnKeyDown: methodOp(onKeyDown), - triggerOnKeyPress: methodOp(onKeyPress), - triggerOnKeyUp: onKeyUp, - - execCommand: function(cmd) { - if (commands.hasOwnProperty(cmd)) - return commands[cmd](this); - }, - - findPosH: function(from, amount, unit, visually) { - var dir = 1; - if (amount < 0) { dir = -1; amount = -amount; } - for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) { - cur = findPosH(this.doc, cur, dir, unit, visually); - if (cur.hitSide) break; - } - return cur; - }, - - moveH: methodOp(function(dir, unit) { - var cm = this; - cm.extendSelectionsBy(function(range) { - if (cm.display.shift || cm.doc.extend || range.empty()) - return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually); - else - return dir < 0 ? range.from() : range.to(); - }, sel_move); - }), - - deleteH: methodOp(function(dir, unit) { - var sel = this.doc.sel, doc = this.doc; - if (sel.somethingSelected()) - doc.replaceSelection("", null, "+delete"); - else - deleteNearSelection(this, function(range) { - var other = findPosH(doc, range.head, dir, unit, false); - return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other}; - }); - }), - - findPosV: function(from, amount, unit, goalColumn) { - var dir = 1, x = goalColumn; - if (amount < 0) { dir = -1; amount = -amount; } - for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) { - var coords = cursorCoords(this, cur, "div"); - if (x == null) x = coords.left; - else coords.left = x; - cur = findPosV(this, coords, dir, unit); - if (cur.hitSide) break; - } - return cur; - }, - - moveV: methodOp(function(dir, unit) { - var cm = this, doc = this.doc, goals = []; - var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected(); - doc.extendSelectionsBy(function(range) { - if (collapse) - return dir < 0 ? range.from() : range.to(); - var headPos = cursorCoords(cm, range.head, "div"); - if (range.goalColumn != null) headPos.left = range.goalColumn; - goals.push(headPos.left); - var pos = findPosV(cm, headPos, dir, unit); - if (unit == "page" && range == doc.sel.primary()) - addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top); - return pos; - }, sel_move); - if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++) - doc.sel.ranges[i].goalColumn = goals[i]; - }), - - // Find the word at the given position (as returned by coordsChar). - findWordAt: function(pos) { - var doc = this.doc, line = getLine(doc, pos.line).text; - var start = pos.ch, end = pos.ch; - if (line) { - var helper = this.getHelper(pos, "wordChars"); - if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end; - var startChar = line.charAt(start); - var check = isWordChar(startChar, helper) - ? function(ch) { return isWordChar(ch, helper); } - : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);} - : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);}; - while (start > 0 && check(line.charAt(start - 1))) --start; - while (end < line.length && check(line.charAt(end))) ++end; - } - return new Range(Pos(pos.line, start), Pos(pos.line, end)); - }, - - toggleOverwrite: function(value) { - if (value != null && value == this.state.overwrite) return; - if (this.state.overwrite = !this.state.overwrite) - addClass(this.display.cursorDiv, "CodeMirror-overwrite"); - else - rmClass(this.display.cursorDiv, "CodeMirror-overwrite"); - - signal(this, "overwriteToggle", this, this.state.overwrite); - }, - hasFocus: function() { return activeElt() == this.display.input; }, - - scrollTo: methodOp(function(x, y) { - if (x != null || y != null) resolveScrollToPos(this); - if (x != null) this.curOp.scrollLeft = x; - if (y != null) this.curOp.scrollTop = y; - }), - getScrollInfo: function() { - var scroller = this.display.scroller, co = scrollerCutOff; - return {left: scroller.scrollLeft, top: scroller.scrollTop, - height: scroller.scrollHeight - co, width: scroller.scrollWidth - co, - clientHeight: scroller.clientHeight - co, clientWidth: scroller.clientWidth - co}; - }, - - scrollIntoView: methodOp(function(range, margin) { - if (range == null) { - range = {from: this.doc.sel.primary().head, to: null}; - if (margin == null) margin = this.options.cursorScrollMargin; - } else if (typeof range == "number") { - range = {from: Pos(range, 0), to: null}; - } else if (range.from == null) { - range = {from: range, to: null}; - } - if (!range.to) range.to = range.from; - range.margin = margin || 0; - - if (range.from.line != null) { - resolveScrollToPos(this); - this.curOp.scrollToPos = range; - } else { - var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left), - Math.min(range.from.top, range.to.top) - range.margin, - Math.max(range.from.right, range.to.right), - Math.max(range.from.bottom, range.to.bottom) + range.margin); - this.scrollTo(sPos.scrollLeft, sPos.scrollTop); - } - }), - - setSize: methodOp(function(width, height) { - var cm = this; - function interpret(val) { - return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val; - } - if (width != null) cm.display.wrapper.style.width = interpret(width); - if (height != null) cm.display.wrapper.style.height = interpret(height); - if (cm.options.lineWrapping) clearLineMeasurementCache(this); - var lineNo = cm.display.viewFrom; - cm.doc.iter(lineNo, cm.display.viewTo, function(line) { - if (line.widgets) for (var i = 0; i < line.widgets.length; i++) - if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; } - ++lineNo; - }); - cm.curOp.forceUpdate = true; - signal(cm, "refresh", this); - }), - - operation: function(f){return runInOp(this, f);}, - - refresh: methodOp(function() { - var oldHeight = this.display.cachedTextHeight; - regChange(this); - this.curOp.forceUpdate = true; - clearCaches(this); - this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop); - updateGutterSpace(this); - if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5) - estimateLineHeights(this); - signal(this, "refresh", this); - }), - - swapDoc: methodOp(function(doc) { - var old = this.doc; - old.cm = null; - attachDoc(this, doc); - clearCaches(this); - resetInput(this); - this.scrollTo(doc.scrollLeft, doc.scrollTop); - this.curOp.forceScroll = true; - signalLater(this, "swapDoc", this, old); - return old; - }), - - getInputField: function(){return this.display.input;}, - getWrapperElement: function(){return this.display.wrapper;}, - getScrollerElement: function(){return this.display.scroller;}, - getGutterElement: function(){return this.display.gutters;} - }; - eventMixin(CodeMirror); - - // OPTION DEFAULTS - - // The default configuration options. - var defaults = CodeMirror.defaults = {}; - // Functions to run when options are changed. - var optionHandlers = CodeMirror.optionHandlers = {}; - - function option(name, deflt, handle, notOnInit) { - CodeMirror.defaults[name] = deflt; - if (handle) optionHandlers[name] = - notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old);} : handle; - } - - // Passed to option handlers when there is no old value. - var Init = CodeMirror.Init = {toString: function(){return "CodeMirror.Init";}}; - - // These two are, on init, called from the constructor because they - // have to be initialized before the editor can start at all. - option("value", "", function(cm, val) { - cm.setValue(val); - }, true); - option("mode", null, function(cm, val) { - cm.doc.modeOption = val; - loadMode(cm); - }, true); - - option("indentUnit", 2, loadMode, true); - option("indentWithTabs", false); - option("smartIndent", true); - option("tabSize", 4, function(cm) { - resetModeState(cm); - clearCaches(cm); - regChange(cm); - }, true); - option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val) { - cm.options.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g"); - cm.refresh(); - }, true); - option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true); - option("electricChars", true); - option("rtlMoveVisually", !windows); - option("wholeLineUpdateBefore", true); - - option("theme", "default", function(cm) { - themeChanged(cm); - guttersChanged(cm); - }, true); - option("keyMap", "default", keyMapChanged); - option("extraKeys", null); - - option("lineWrapping", false, wrappingChanged, true); - option("gutters", [], function(cm) { - setGuttersForLineNumbers(cm.options); - guttersChanged(cm); - }, true); - option("fixedGutter", true, function(cm, val) { - cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0"; - cm.refresh(); - }, true); - option("coverGutterNextToScrollbar", false, updateScrollbars, true); - option("lineNumbers", false, function(cm) { - setGuttersForLineNumbers(cm.options); - guttersChanged(cm); - }, true); - option("firstLineNumber", 1, guttersChanged, true); - option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true); - option("showCursorWhenSelecting", false, updateSelection, true); - - option("resetSelectionOnContextMenu", true); - - option("readOnly", false, function(cm, val) { - if (val == "nocursor") { - onBlur(cm); - cm.display.input.blur(); - cm.display.disabled = true; - } else { - cm.display.disabled = false; - if (!val) resetInput(cm); - } - }); - option("disableInput", false, function(cm, val) {if (!val) resetInput(cm);}, true); - option("dragDrop", true); - - option("cursorBlinkRate", 530); - option("cursorScrollMargin", 0); - option("cursorHeight", 1, updateSelection, true); - option("singleCursorHeightPerLine", true, updateSelection, true); - option("workTime", 100); - option("workDelay", 100); - option("flattenSpans", true, resetModeState, true); - option("addModeClass", false, resetModeState, true); - option("pollInterval", 100); - option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;}); - option("historyEventDelay", 1250); - option("viewportMargin", 10, function(cm){cm.refresh();}, true); - option("maxHighlightLength", 10000, resetModeState, true); - option("moveInputWithCursor", true, function(cm, val) { - if (!val) cm.display.inputDiv.style.top = cm.display.inputDiv.style.left = 0; - }); - - option("tabindex", null, function(cm, val) { - cm.display.input.tabIndex = val || ""; - }); - option("autofocus", null); - - // MODE DEFINITION AND QUERYING - - // Known modes, by name and by MIME - var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {}; - - // Extra arguments are stored as the mode's dependencies, which is - // used by (legacy) mechanisms like loadmode.js to automatically - // load a mode. (Preferred mechanism is the require/define calls.) - CodeMirror.defineMode = function(name, mode) { - if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name; - if (arguments.length > 2) - mode.dependencies = Array.prototype.slice.call(arguments, 2); - modes[name] = mode; - }; - - CodeMirror.defineMIME = function(mime, spec) { - mimeModes[mime] = spec; - }; - - // Given a MIME type, a {name, ...options} config object, or a name - // string, return a mode config object. - CodeMirror.resolveMode = function(spec) { - if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) { - spec = mimeModes[spec]; - } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) { - var found = mimeModes[spec.name]; - if (typeof found == "string") found = {name: found}; - spec = createObj(found, spec); - spec.name = found.name; - } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) { - return CodeMirror.resolveMode("application/xml"); - } - if (typeof spec == "string") return {name: spec}; - else return spec || {name: "null"}; - }; - - // Given a mode spec (anything that resolveMode accepts), find and - // initialize an actual mode object. - CodeMirror.getMode = function(options, spec) { - var spec = CodeMirror.resolveMode(spec); - var mfactory = modes[spec.name]; - if (!mfactory) return CodeMirror.getMode(options, "text/plain"); - var modeObj = mfactory(options, spec); - if (modeExtensions.hasOwnProperty(spec.name)) { - var exts = modeExtensions[spec.name]; - for (var prop in exts) { - if (!exts.hasOwnProperty(prop)) continue; - if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop]; - modeObj[prop] = exts[prop]; - } - } - modeObj.name = spec.name; - if (spec.helperType) modeObj.helperType = spec.helperType; - if (spec.modeProps) for (var prop in spec.modeProps) - modeObj[prop] = spec.modeProps[prop]; - - return modeObj; - }; - - // Minimal default mode. - CodeMirror.defineMode("null", function() { - return {token: function(stream) {stream.skipToEnd();}}; - }); - CodeMirror.defineMIME("text/plain", "null"); - - // This can be used to attach properties to mode objects from - // outside the actual mode definition. - var modeExtensions = CodeMirror.modeExtensions = {}; - CodeMirror.extendMode = function(mode, properties) { - var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {}); - copyObj(properties, exts); - }; - - // EXTENSIONS - - CodeMirror.defineExtension = function(name, func) { - CodeMirror.prototype[name] = func; - }; - CodeMirror.defineDocExtension = function(name, func) { - Doc.prototype[name] = func; - }; - CodeMirror.defineOption = option; - - var initHooks = []; - CodeMirror.defineInitHook = function(f) {initHooks.push(f);}; - - var helpers = CodeMirror.helpers = {}; - CodeMirror.registerHelper = function(type, name, value) { - if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []}; - helpers[type][name] = value; - }; - CodeMirror.registerGlobalHelper = function(type, name, predicate, value) { - CodeMirror.registerHelper(type, name, value); - helpers[type]._global.push({pred: predicate, val: value}); - }; - - // MODE STATE HANDLING - - // Utility functions for working with state. Exported because nested - // modes need to do this for their inner modes. - - var copyState = CodeMirror.copyState = function(mode, state) { - if (state === true) return state; - if (mode.copyState) return mode.copyState(state); - var nstate = {}; - for (var n in state) { - var val = state[n]; - if (val instanceof Array) val = val.concat([]); - nstate[n] = val; - } - return nstate; - }; - - var startState = CodeMirror.startState = function(mode, a1, a2) { - return mode.startState ? mode.startState(a1, a2) : true; - }; - - // Given a mode and a state (for that mode), find the inner mode and - // state at the position that the state refers to. - CodeMirror.innerMode = function(mode, state) { - while (mode.innerMode) { - var info = mode.innerMode(state); - if (!info || info.mode == mode) break; - state = info.state; - mode = info.mode; - } - return info || {mode: mode, state: state}; - }; - - // STANDARD COMMANDS - - // Commands are parameter-less actions that can be performed on an - // editor, mostly used for keybindings. - var commands = CodeMirror.commands = { - selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);}, - singleSelection: function(cm) { - cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll); - }, - killLine: function(cm) { - deleteNearSelection(cm, function(range) { - if (range.empty()) { - var len = getLine(cm.doc, range.head.line).text.length; - if (range.head.ch == len && range.head.line < cm.lastLine()) - return {from: range.head, to: Pos(range.head.line + 1, 0)}; - else - return {from: range.head, to: Pos(range.head.line, len)}; - } else { - return {from: range.from(), to: range.to()}; - } - }); - }, - deleteLine: function(cm) { - deleteNearSelection(cm, function(range) { - return {from: Pos(range.from().line, 0), - to: clipPos(cm.doc, Pos(range.to().line + 1, 0))}; - }); - }, - delLineLeft: function(cm) { - deleteNearSelection(cm, function(range) { - return {from: Pos(range.from().line, 0), to: range.from()}; - }); - }, - delWrappedLineLeft: function(cm) { - deleteNearSelection(cm, function(range) { - var top = cm.charCoords(range.head, "div").top + 5; - var leftPos = cm.coordsChar({left: 0, top: top}, "div"); - return {from: leftPos, to: range.from()}; - }); - }, - delWrappedLineRight: function(cm) { - deleteNearSelection(cm, function(range) { - var top = cm.charCoords(range.head, "div").top + 5; - var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div"); - return {from: range.from(), to: rightPos }; - }); - }, - undo: function(cm) {cm.undo();}, - redo: function(cm) {cm.redo();}, - undoSelection: function(cm) {cm.undoSelection();}, - redoSelection: function(cm) {cm.redoSelection();}, - goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));}, - goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));}, - goLineStart: function(cm) { - cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); }, - {origin: "+move", bias: 1}); - }, - goLineStartSmart: function(cm) { - cm.extendSelectionsBy(function(range) { - return lineStartSmart(cm, range.head); - }, {origin: "+move", bias: 1}); - }, - goLineEnd: function(cm) { - cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); }, - {origin: "+move", bias: -1}); - }, - goLineRight: function(cm) { - cm.extendSelectionsBy(function(range) { - var top = cm.charCoords(range.head, "div").top + 5; - return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div"); - }, sel_move); - }, - goLineLeft: function(cm) { - cm.extendSelectionsBy(function(range) { - var top = cm.charCoords(range.head, "div").top + 5; - return cm.coordsChar({left: 0, top: top}, "div"); - }, sel_move); - }, - goLineLeftSmart: function(cm) { - cm.extendSelectionsBy(function(range) { - var top = cm.charCoords(range.head, "div").top + 5; - var pos = cm.coordsChar({left: 0, top: top}, "div"); - if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head); - return pos; - }, sel_move); - }, - goLineUp: function(cm) {cm.moveV(-1, "line");}, - goLineDown: function(cm) {cm.moveV(1, "line");}, - goPageUp: function(cm) {cm.moveV(-1, "page");}, - goPageDown: function(cm) {cm.moveV(1, "page");}, - goCharLeft: function(cm) {cm.moveH(-1, "char");}, - goCharRight: function(cm) {cm.moveH(1, "char");}, - goColumnLeft: function(cm) {cm.moveH(-1, "column");}, - goColumnRight: function(cm) {cm.moveH(1, "column");}, - goWordLeft: function(cm) {cm.moveH(-1, "word");}, - goGroupRight: function(cm) {cm.moveH(1, "group");}, - goGroupLeft: function(cm) {cm.moveH(-1, "group");}, - goWordRight: function(cm) {cm.moveH(1, "word");}, - delCharBefore: function(cm) {cm.deleteH(-1, "char");}, - delCharAfter: function(cm) {cm.deleteH(1, "char");}, - delWordBefore: function(cm) {cm.deleteH(-1, "word");}, - delWordAfter: function(cm) {cm.deleteH(1, "word");}, - delGroupBefore: function(cm) {cm.deleteH(-1, "group");}, - delGroupAfter: function(cm) {cm.deleteH(1, "group");}, - indentAuto: function(cm) {cm.indentSelection("smart");}, - indentMore: function(cm) {cm.indentSelection("add");}, - indentLess: function(cm) {cm.indentSelection("subtract");}, - insertTab: function(cm) {cm.replaceSelection("\t");}, - insertSoftTab: function(cm) { - var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize; - for (var i = 0; i < ranges.length; i++) { - var pos = ranges[i].from(); - var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize); - spaces.push(new Array(tabSize - col % tabSize + 1).join(" ")); - } - cm.replaceSelections(spaces); - }, - defaultTab: function(cm) { - if (cm.somethingSelected()) cm.indentSelection("add"); - else cm.execCommand("insertTab"); - }, - transposeChars: function(cm) { - runInOp(cm, function() { - var ranges = cm.listSelections(), newSel = []; - for (var i = 0; i < ranges.length; i++) { - var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text; - if (line) { - if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1); - if (cur.ch > 0) { - cur = new Pos(cur.line, cur.ch + 1); - cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2), - Pos(cur.line, cur.ch - 2), cur, "+transpose"); - } else if (cur.line > cm.doc.first) { - var prev = getLine(cm.doc, cur.line - 1).text; - if (prev) - cm.replaceRange(line.charAt(0) + "\n" + prev.charAt(prev.length - 1), - Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose"); - } - } - newSel.push(new Range(cur, cur)); - } - cm.setSelections(newSel); - }); - }, - newlineAndIndent: function(cm) { - runInOp(cm, function() { - var len = cm.listSelections().length; - for (var i = 0; i < len; i++) { - var range = cm.listSelections()[i]; - cm.replaceRange("\n", range.anchor, range.head, "+input"); - cm.indentLine(range.from().line + 1, null, true); - ensureCursorVisible(cm); - } - }); - }, - toggleOverwrite: function(cm) {cm.toggleOverwrite();} - }; - - // STANDARD KEYMAPS - - var keyMap = CodeMirror.keyMap = {}; - keyMap.basic = { - "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown", - "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown", - "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore", - "Tab": "defaultTab", "Shift-Tab": "indentAuto", - "Enter": "newlineAndIndent", "Insert": "toggleOverwrite", - "Esc": "singleSelection" - }; - // Note that the save and find-related commands aren't defined by - // default. User code or addons can define them. Unknown commands - // are simply ignored. - keyMap.pcDefault = { - "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo", - "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown", - "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd", - "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find", - "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll", - "Ctrl-[": "indentLess", "Ctrl-]": "indentMore", - "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection", - fallthrough: "basic" - }; - keyMap.macDefault = { - "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo", - "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft", - "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore", - "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find", - "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll", - "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight", - "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd", - fallthrough: ["basic", "emacsy"] - }; - // Very basic readline/emacs-style bindings, which are standard on Mac. - keyMap.emacsy = { - "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown", - "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd", - "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore", - "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars" - }; - keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault; - - // KEYMAP DISPATCH - - function getKeyMap(val) { - if (typeof val == "string") return keyMap[val]; - else return val; - } - - // Given an array of keymaps and a key name, call handle on any - // bindings found, until that returns a truthy value, at which point - // we consider the key handled. Implements things like binding a key - // to false stopping further handling and keymap fallthrough. - var lookupKey = CodeMirror.lookupKey = function(name, maps, handle) { - function lookup(map) { - map = getKeyMap(map); - var found = map[name]; - if (found === false) return "stop"; - if (found != null && handle(found)) return true; - if (map.nofallthrough) return "stop"; - - var fallthrough = map.fallthrough; - if (fallthrough == null) return false; - if (Object.prototype.toString.call(fallthrough) != "[object Array]") - return lookup(fallthrough); - for (var i = 0; i < fallthrough.length; ++i) { - var done = lookup(fallthrough[i]); - if (done) return done; - } - return false; - } - - for (var i = 0; i < maps.length; ++i) { - var done = lookup(maps[i]); - if (done) return done != "stop"; - } - }; - - // Modifier key presses don't count as 'real' key presses for the - // purpose of keymap fallthrough. - var isModifierKey = CodeMirror.isModifierKey = function(event) { - var name = keyNames[event.keyCode]; - return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod"; - }; - - // Look up the name of a key as indicated by an event object. - var keyName = CodeMirror.keyName = function(event, noShift) { - if (presto && event.keyCode == 34 && event["char"]) return false; - var name = keyNames[event.keyCode]; - if (name == null || event.altGraphKey) return false; - if (event.altKey) name = "Alt-" + name; - if (flipCtrlCmd ? event.metaKey : event.ctrlKey) name = "Ctrl-" + name; - if (flipCtrlCmd ? event.ctrlKey : event.metaKey) name = "Cmd-" + name; - if (!noShift && event.shiftKey) name = "Shift-" + name; - return name; - }; - - // FROMTEXTAREA - - CodeMirror.fromTextArea = function(textarea, options) { - if (!options) options = {}; - options.value = textarea.value; - if (!options.tabindex && textarea.tabindex) - options.tabindex = textarea.tabindex; - if (!options.placeholder && textarea.placeholder) - options.placeholder = textarea.placeholder; - // Set autofocus to true if this textarea is focused, or if it has - // autofocus and no other element is focused. - if (options.autofocus == null) { - var hasFocus = activeElt(); - options.autofocus = hasFocus == textarea || - textarea.getAttribute("autofocus") != null && hasFocus == document.body; - } - - function save() {textarea.value = cm.getValue();} - if (textarea.form) { - on(textarea.form, "submit", save); - // Deplorable hack to make the submit method do the right thing. - if (!options.leaveSubmitMethodAlone) { - var form = textarea.form, realSubmit = form.submit; - try { - var wrappedSubmit = form.submit = function() { - save(); - form.submit = realSubmit; - form.submit(); - form.submit = wrappedSubmit; - }; - } catch(e) {} - } - } - - textarea.style.display = "none"; - var cm = CodeMirror(function(node) { - textarea.parentNode.insertBefore(node, textarea.nextSibling); - }, options); - cm.save = save; - cm.getTextArea = function() { return textarea; }; - cm.toTextArea = function() { - cm.toTextArea = isNaN; // Prevent this from being ran twice - save(); - textarea.parentNode.removeChild(cm.getWrapperElement()); - textarea.style.display = ""; - if (textarea.form) { - off(textarea.form, "submit", save); - if (typeof textarea.form.submit == "function") - textarea.form.submit = realSubmit; - } - }; - return cm; - }; - - // STRING STREAM - - // Fed to the mode parsers, provides helper functions to make - // parsers more succinct. - - var StringStream = CodeMirror.StringStream = function(string, tabSize) { - this.pos = this.start = 0; - this.string = string; - this.tabSize = tabSize || 8; - this.lastColumnPos = this.lastColumnValue = 0; - this.lineStart = 0; - }; - - StringStream.prototype = { - eol: function() {return this.pos >= this.string.length;}, - sol: function() {return this.pos == this.lineStart;}, - peek: function() {return this.string.charAt(this.pos) || undefined;}, - next: function() { - if (this.pos < this.string.length) - return this.string.charAt(this.pos++); - }, - eat: function(match) { - var ch = this.string.charAt(this.pos); - if (typeof match == "string") var ok = ch == match; - else var ok = ch && (match.test ? match.test(ch) : match(ch)); - if (ok) {++this.pos; return ch;} - }, - eatWhile: function(match) { - var start = this.pos; - while (this.eat(match)){} - return this.pos > start; - }, - eatSpace: function() { - var start = this.pos; - while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos; - return this.pos > start; - }, - skipToEnd: function() {this.pos = this.string.length;}, - skipTo: function(ch) { - var found = this.string.indexOf(ch, this.pos); - if (found > -1) {this.pos = found; return true;} - }, - backUp: function(n) {this.pos -= n;}, - column: function() { - if (this.lastColumnPos < this.start) { - this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue); - this.lastColumnPos = this.start; - } - return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0); - }, - indentation: function() { - return countColumn(this.string, null, this.tabSize) - - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0); - }, - match: function(pattern, consume, caseInsensitive) { - if (typeof pattern == "string") { - var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;}; - var substr = this.string.substr(this.pos, pattern.length); - if (cased(substr) == cased(pattern)) { - if (consume !== false) this.pos += pattern.length; - return true; - } - } else { - var match = this.string.slice(this.pos).match(pattern); - if (match && match.index > 0) return null; - if (match && consume !== false) this.pos += match[0].length; - return match; - } - }, - current: function(){return this.string.slice(this.start, this.pos);}, - hideFirstChars: function(n, inner) { - this.lineStart += n; - try { return inner(); } - finally { this.lineStart -= n; } - } - }; - - // TEXTMARKERS - - // Created with markText and setBookmark methods. A TextMarker is a - // handle that can be used to clear or find a marked position in the - // document. Line objects hold arrays (markedSpans) containing - // {from, to, marker} object pointing to such marker objects, and - // indicating that such a marker is present on that line. Multiple - // lines may point to the same marker when it spans across lines. - // The spans will have null for their from/to properties when the - // marker continues beyond the start/end of the line. Markers have - // links back to the lines they currently touch. - - var TextMarker = CodeMirror.TextMarker = function(doc, type) { - this.lines = []; - this.type = type; - this.doc = doc; - }; - eventMixin(TextMarker); - - // Clear the marker. - TextMarker.prototype.clear = function() { - if (this.explicitlyCleared) return; - var cm = this.doc.cm, withOp = cm && !cm.curOp; - if (withOp) startOperation(cm); - if (hasHandler(this, "clear")) { - var found = this.find(); - if (found) signalLater(this, "clear", found.from, found.to); - } - var min = null, max = null; - for (var i = 0; i < this.lines.length; ++i) { - var line = this.lines[i]; - var span = getMarkedSpanFor(line.markedSpans, this); - if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text"); - else if (cm) { - if (span.to != null) max = lineNo(line); - if (span.from != null) min = lineNo(line); - } - line.markedSpans = removeMarkedSpan(line.markedSpans, span); - if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm) - updateLineHeight(line, textHeight(cm.display)); - } - if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) { - var visual = visualLine(this.lines[i]), len = lineLength(visual); - if (len > cm.display.maxLineLength) { - cm.display.maxLine = visual; - cm.display.maxLineLength = len; - cm.display.maxLineChanged = true; - } - } - - if (min != null && cm && this.collapsed) regChange(cm, min, max + 1); - this.lines.length = 0; - this.explicitlyCleared = true; - if (this.atomic && this.doc.cantEdit) { - this.doc.cantEdit = false; - if (cm) reCheckSelection(cm.doc); - } - if (cm) signalLater(cm, "markerCleared", cm, this); - if (withOp) endOperation(cm); - if (this.parent) this.parent.clear(); - }; - - // Find the position of the marker in the document. Returns a {from, - // to} object by default. Side can be passed to get a specific side - // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the - // Pos objects returned contain a line object, rather than a line - // number (used to prevent looking up the same line twice). - TextMarker.prototype.find = function(side, lineObj) { - if (side == null && this.type == "bookmark") side = 1; - var from, to; - for (var i = 0; i < this.lines.length; ++i) { - var line = this.lines[i]; - var span = getMarkedSpanFor(line.markedSpans, this); - if (span.from != null) { - from = Pos(lineObj ? line : lineNo(line), span.from); - if (side == -1) return from; - } - if (span.to != null) { - to = Pos(lineObj ? line : lineNo(line), span.to); - if (side == 1) return to; - } - } - return from && {from: from, to: to}; - }; - - // Signals that the marker's widget changed, and surrounding layout - // should be recomputed. - TextMarker.prototype.changed = function() { - var pos = this.find(-1, true), widget = this, cm = this.doc.cm; - if (!pos || !cm) return; - runInOp(cm, function() { - var line = pos.line, lineN = lineNo(pos.line); - var view = findViewForLine(cm, lineN); - if (view) { - clearLineMeasurementCacheFor(view); - cm.curOp.selectionChanged = cm.curOp.forceUpdate = true; - } - cm.curOp.updateMaxLine = true; - if (!lineIsHidden(widget.doc, line) && widget.height != null) { - var oldHeight = widget.height; - widget.height = null; - var dHeight = widgetHeight(widget) - oldHeight; - if (dHeight) - updateLineHeight(line, line.height + dHeight); - } - }); - }; - - TextMarker.prototype.attachLine = function(line) { - if (!this.lines.length && this.doc.cm) { - var op = this.doc.cm.curOp; - if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1) - (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this); - } - this.lines.push(line); - }; - TextMarker.prototype.detachLine = function(line) { - this.lines.splice(indexOf(this.lines, line), 1); - if (!this.lines.length && this.doc.cm) { - var op = this.doc.cm.curOp; - (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this); - } - }; - - // Collapsed markers have unique ids, in order to be able to order - // them, which is needed for uniquely determining an outer marker - // when they overlap (they may nest, but not partially overlap). - var nextMarkerId = 0; - - // Create a marker, wire it up to the right lines, and - function markText(doc, from, to, options, type) { - // Shared markers (across linked documents) are handled separately - // (markTextShared will call out to this again, once per - // document). - if (options && options.shared) return markTextShared(doc, from, to, options, type); - // Ensure we are in an operation. - if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type); - - var marker = new TextMarker(doc, type), diff = cmp(from, to); - if (options) copyObj(options, marker, false); - // Don't connect empty markers unless clearWhenEmpty is false - if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false) - return marker; - if (marker.replacedWith) { - // Showing up as a widget implies collapsed (widget replaces text) - marker.collapsed = true; - marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget"); - if (!options.handleMouseEvents) marker.widgetNode.ignoreEvents = true; - if (options.insertLeft) marker.widgetNode.insertLeft = true; - } - if (marker.collapsed) { - if (conflictingCollapsedRange(doc, from.line, from, to, marker) || - from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker)) - throw new Error("Inserting collapsed marker partially overlapping an existing one"); - sawCollapsedSpans = true; - } - - if (marker.addToHistory) - addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN); - - var curLine = from.line, cm = doc.cm, updateMaxLine; - doc.iter(curLine, to.line + 1, function(line) { - if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine) - updateMaxLine = true; - if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0); - addMarkedSpan(line, new MarkedSpan(marker, - curLine == from.line ? from.ch : null, - curLine == to.line ? to.ch : null)); - ++curLine; - }); - // lineIsHidden depends on the presence of the spans, so needs a second pass - if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) { - if (lineIsHidden(doc, line)) updateLineHeight(line, 0); - }); - - if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear(); }); - - if (marker.readOnly) { - sawReadOnlySpans = true; - if (doc.history.done.length || doc.history.undone.length) - doc.clearHistory(); - } - if (marker.collapsed) { - marker.id = ++nextMarkerId; - marker.atomic = true; - } - if (cm) { - // Sync editor state - if (updateMaxLine) cm.curOp.updateMaxLine = true; - if (marker.collapsed) - regChange(cm, from.line, to.line + 1); - else if (marker.className || marker.title || marker.startStyle || marker.endStyle) - for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text"); - if (marker.atomic) reCheckSelection(cm.doc); - signalLater(cm, "markerAdded", cm, marker); - } - return marker; - } - - // SHARED TEXTMARKERS - - // A shared marker spans multiple linked documents. It is - // implemented as a meta-marker-object controlling multiple normal - // markers. - var SharedTextMarker = CodeMirror.SharedTextMarker = function(markers, primary) { - this.markers = markers; - this.primary = primary; - for (var i = 0; i < markers.length; ++i) - markers[i].parent = this; - }; - eventMixin(SharedTextMarker); - - SharedTextMarker.prototype.clear = function() { - if (this.explicitlyCleared) return; - this.explicitlyCleared = true; - for (var i = 0; i < this.markers.length; ++i) - this.markers[i].clear(); - signalLater(this, "clear"); - }; - SharedTextMarker.prototype.find = function(side, lineObj) { - return this.primary.find(side, lineObj); - }; - - function markTextShared(doc, from, to, options, type) { - options = copyObj(options); - options.shared = false; - var markers = [markText(doc, from, to, options, type)], primary = markers[0]; - var widget = options.widgetNode; - linkedDocs(doc, function(doc) { - if (widget) options.widgetNode = widget.cloneNode(true); - markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type)); - for (var i = 0; i < doc.linked.length; ++i) - if (doc.linked[i].isParent) return; - primary = lst(markers); - }); - return new SharedTextMarker(markers, primary); - } - - function findSharedMarkers(doc) { - return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())), - function(m) { return m.parent; }); - } - - function copySharedMarkers(doc, markers) { - for (var i = 0; i < markers.length; i++) { - var marker = markers[i], pos = marker.find(); - var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to); - if (cmp(mFrom, mTo)) { - var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type); - marker.markers.push(subMark); - subMark.parent = marker; - } - } - } - - function detachSharedMarkers(markers) { - for (var i = 0; i < markers.length; i++) { - var marker = markers[i], linked = [marker.primary.doc];; - linkedDocs(marker.primary.doc, function(d) { linked.push(d); }); - for (var j = 0; j < marker.markers.length; j++) { - var subMarker = marker.markers[j]; - if (indexOf(linked, subMarker.doc) == -1) { - subMarker.parent = null; - marker.markers.splice(j--, 1); - } - } - } - } - - // TEXTMARKER SPANS - - function MarkedSpan(marker, from, to) { - this.marker = marker; - this.from = from; this.to = to; - } - - // Search an array of spans for a span matching the given marker. - function getMarkedSpanFor(spans, marker) { - if (spans) for (var i = 0; i < spans.length; ++i) { - var span = spans[i]; - if (span.marker == marker) return span; - } - } - // Remove a span from an array, returning undefined if no spans are - // left (we don't store arrays for lines without spans). - function removeMarkedSpan(spans, span) { - for (var r, i = 0; i < spans.length; ++i) - if (spans[i] != span) (r || (r = [])).push(spans[i]); - return r; - } - // Add a span to a line. - function addMarkedSpan(line, span) { - line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span]; - span.marker.attachLine(line); - } - - // Used for the algorithm that adjusts markers for a change in the - // document. These functions cut an array of spans at a given - // character position, returning an array of remaining chunks (or - // undefined if nothing remains). - function markedSpansBefore(old, startCh, isInsert) { - if (old) for (var i = 0, nw; i < old.length; ++i) { - var span = old[i], marker = span.marker; - var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh); - if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) { - var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh); - (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to)); - } - } - return nw; - } - function markedSpansAfter(old, endCh, isInsert) { - if (old) for (var i = 0, nw; i < old.length; ++i) { - var span = old[i], marker = span.marker; - var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh); - if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) { - var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh); - (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh, - span.to == null ? null : span.to - endCh)); - } - } - return nw; - } - - // Given a change object, compute the new set of marker spans that - // cover the line in which the change took place. Removes spans - // entirely within the change, reconnects spans belonging to the - // same marker that appear on both sides of the change, and cuts off - // spans partially within the change. Returns an array of span - // arrays with one element for each line in (after) the change. - function stretchSpansOverChange(doc, change) { - var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans; - var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans; - if (!oldFirst && !oldLast) return null; - - var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0; - // Get the spans that 'stick out' on both sides - var first = markedSpansBefore(oldFirst, startCh, isInsert); - var last = markedSpansAfter(oldLast, endCh, isInsert); - - // Next, merge those two ends - var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0); - if (first) { - // Fix up .to properties of first - for (var i = 0; i < first.length; ++i) { - var span = first[i]; - if (span.to == null) { - var found = getMarkedSpanFor(last, span.marker); - if (!found) span.to = startCh; - else if (sameLine) span.to = found.to == null ? null : found.to + offset; - } - } - } - if (last) { - // Fix up .from in last (or move them into first in case of sameLine) - for (var i = 0; i < last.length; ++i) { - var span = last[i]; - if (span.to != null) span.to += offset; - if (span.from == null) { - var found = getMarkedSpanFor(first, span.marker); - if (!found) { - span.from = offset; - if (sameLine) (first || (first = [])).push(span); - } - } else { - span.from += offset; - if (sameLine) (first || (first = [])).push(span); - } - } - } - // Make sure we didn't create any zero-length spans - if (first) first = clearEmptySpans(first); - if (last && last != first) last = clearEmptySpans(last); - - var newMarkers = [first]; - if (!sameLine) { - // Fill gap with whole-line-spans - var gap = change.text.length - 2, gapMarkers; - if (gap > 0 && first) - for (var i = 0; i < first.length; ++i) - if (first[i].to == null) - (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null)); - for (var i = 0; i < gap; ++i) - newMarkers.push(gapMarkers); - newMarkers.push(last); - } - return newMarkers; - } - - // Remove spans that are empty and don't have a clearWhenEmpty - // option of false. - function clearEmptySpans(spans) { - for (var i = 0; i < spans.length; ++i) { - var span = spans[i]; - if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false) - spans.splice(i--, 1); - } - if (!spans.length) return null; - return spans; - } - - // Used for un/re-doing changes from the history. Combines the - // result of computing the existing spans with the set of spans that - // existed in the history (so that deleting around a span and then - // undoing brings back the span). - function mergeOldSpans(doc, change) { - var old = getOldSpans(doc, change); - var stretched = stretchSpansOverChange(doc, change); - if (!old) return stretched; - if (!stretched) return old; - - for (var i = 0; i < old.length; ++i) { - var oldCur = old[i], stretchCur = stretched[i]; - if (oldCur && stretchCur) { - spans: for (var j = 0; j < stretchCur.length; ++j) { - var span = stretchCur[j]; - for (var k = 0; k < oldCur.length; ++k) - if (oldCur[k].marker == span.marker) continue spans; - oldCur.push(span); - } - } else if (stretchCur) { - old[i] = stretchCur; - } - } - return old; - } - - // Used to 'clip' out readOnly ranges when making a change. - function removeReadOnlyRanges(doc, from, to) { - var markers = null; - doc.iter(from.line, to.line + 1, function(line) { - if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) { - var mark = line.markedSpans[i].marker; - if (mark.readOnly && (!markers || indexOf(markers, mark) == -1)) - (markers || (markers = [])).push(mark); - } - }); - if (!markers) return null; - var parts = [{from: from, to: to}]; - for (var i = 0; i < markers.length; ++i) { - var mk = markers[i], m = mk.find(0); - for (var j = 0; j < parts.length; ++j) { - var p = parts[j]; - if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue; - var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to); - if (dfrom < 0 || !mk.inclusiveLeft && !dfrom) - newParts.push({from: p.from, to: m.from}); - if (dto > 0 || !mk.inclusiveRight && !dto) - newParts.push({from: m.to, to: p.to}); - parts.splice.apply(parts, newParts); - j += newParts.length - 1; - } - } - return parts; - } - - // Connect or disconnect spans from a line. - function detachMarkedSpans(line) { - var spans = line.markedSpans; - if (!spans) return; - for (var i = 0; i < spans.length; ++i) - spans[i].marker.detachLine(line); - line.markedSpans = null; - } - function attachMarkedSpans(line, spans) { - if (!spans) return; - for (var i = 0; i < spans.length; ++i) - spans[i].marker.attachLine(line); - line.markedSpans = spans; - } - - // Helpers used when computing which overlapping collapsed span - // counts as the larger one. - function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; } - function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; } - - // Returns a number indicating which of two overlapping collapsed - // spans is larger (and thus includes the other). Falls back to - // comparing ids when the spans cover exactly the same range. - function compareCollapsedMarkers(a, b) { - var lenDiff = a.lines.length - b.lines.length; - if (lenDiff != 0) return lenDiff; - var aPos = a.find(), bPos = b.find(); - var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b); - if (fromCmp) return -fromCmp; - var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b); - if (toCmp) return toCmp; - return b.id - a.id; - } - - // Find out whether a line ends or starts in a collapsed span. If - // so, return the marker for that span. - function collapsedSpanAtSide(line, start) { - var sps = sawCollapsedSpans && line.markedSpans, found; - if (sps) for (var sp, i = 0; i < sps.length; ++i) { - sp = sps[i]; - if (sp.marker.collapsed && (start ? sp.from : sp.to) == null && - (!found || compareCollapsedMarkers(found, sp.marker) < 0)) - found = sp.marker; - } - return found; - } - function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); } - function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); } - - // Test whether there exists a collapsed span that partially - // overlaps (covers the start or end, but not both) of a new span. - // Such overlap is not allowed. - function conflictingCollapsedRange(doc, lineNo, from, to, marker) { - var line = getLine(doc, lineNo); - var sps = sawCollapsedSpans && line.markedSpans; - if (sps) for (var i = 0; i < sps.length; ++i) { - var sp = sps[i]; - if (!sp.marker.collapsed) continue; - var found = sp.marker.find(0); - var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker); - var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker); - if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue; - if (fromCmp <= 0 && (cmp(found.to, from) > 0 || (sp.marker.inclusiveRight && marker.inclusiveLeft)) || - fromCmp >= 0 && (cmp(found.from, to) < 0 || (sp.marker.inclusiveLeft && marker.inclusiveRight))) - return true; - } - } - - // A visual line is a line as drawn on the screen. Folding, for - // example, can cause multiple logical lines to appear on the same - // visual line. This finds the start of the visual line that the - // given line is part of (usually that is the line itself). - function visualLine(line) { - var merged; - while (merged = collapsedSpanAtStart(line)) - line = merged.find(-1, true).line; - return line; - } - - // Returns an array of logical lines that continue the visual line - // started by the argument, or undefined if there are no such lines. - function visualLineContinued(line) { - var merged, lines; - while (merged = collapsedSpanAtEnd(line)) { - line = merged.find(1, true).line; - (lines || (lines = [])).push(line); - } - return lines; - } - - // Get the line number of the start of the visual line that the - // given line number is part of. - function visualLineNo(doc, lineN) { - var line = getLine(doc, lineN), vis = visualLine(line); - if (line == vis) return lineN; - return lineNo(vis); - } - // Get the line number of the start of the next visual line after - // the given line. - function visualLineEndNo(doc, lineN) { - if (lineN > doc.lastLine()) return lineN; - var line = getLine(doc, lineN), merged; - if (!lineIsHidden(doc, line)) return lineN; - while (merged = collapsedSpanAtEnd(line)) - line = merged.find(1, true).line; - return lineNo(line) + 1; - } - - // Compute whether a line is hidden. Lines count as hidden when they - // are part of a visual line that starts with another line, or when - // they are entirely covered by collapsed, non-widget span. - function lineIsHidden(doc, line) { - var sps = sawCollapsedSpans && line.markedSpans; - if (sps) for (var sp, i = 0; i < sps.length; ++i) { - sp = sps[i]; - if (!sp.marker.collapsed) continue; - if (sp.from == null) return true; - if (sp.marker.widgetNode) continue; - if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp)) - return true; - } - } - function lineIsHiddenInner(doc, line, span) { - if (span.to == null) { - var end = span.marker.find(1, true); - return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker)); - } - if (span.marker.inclusiveRight && span.to == line.text.length) - return true; - for (var sp, i = 0; i < line.markedSpans.length; ++i) { - sp = line.markedSpans[i]; - if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to && - (sp.to == null || sp.to != span.from) && - (sp.marker.inclusiveLeft || span.marker.inclusiveRight) && - lineIsHiddenInner(doc, line, sp)) return true; - } - } - - // LINE WIDGETS - - // Line widgets are block elements displayed above or below a line. - - var LineWidget = CodeMirror.LineWidget = function(cm, node, options) { - if (options) for (var opt in options) if (options.hasOwnProperty(opt)) - this[opt] = options[opt]; - this.cm = cm; - this.node = node; - }; - eventMixin(LineWidget); - - function adjustScrollWhenAboveVisible(cm, line, diff) { - if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop)) - addToScrollPos(cm, null, diff); - } - - LineWidget.prototype.clear = function() { - var cm = this.cm, ws = this.line.widgets, line = this.line, no = lineNo(line); - if (no == null || !ws) return; - for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1); - if (!ws.length) line.widgets = null; - var height = widgetHeight(this); - runInOp(cm, function() { - adjustScrollWhenAboveVisible(cm, line, -height); - regLineChange(cm, no, "widget"); - updateLineHeight(line, Math.max(0, line.height - height)); - }); - }; - LineWidget.prototype.changed = function() { - var oldH = this.height, cm = this.cm, line = this.line; - this.height = null; - var diff = widgetHeight(this) - oldH; - if (!diff) return; - runInOp(cm, function() { - cm.curOp.forceUpdate = true; - adjustScrollWhenAboveVisible(cm, line, diff); - updateLineHeight(line, line.height + diff); - }); - }; - - function widgetHeight(widget) { - if (widget.height != null) return widget.height; - if (!contains(document.body, widget.node)) { - var parentStyle = "position: relative;"; - if (widget.coverGutter) - parentStyle += "margin-left: -" + widget.cm.getGutterElement().offsetWidth + "px;"; - removeChildrenAndAdd(widget.cm.display.measure, elt("div", [widget.node], null, parentStyle)); - } - return widget.height = widget.node.offsetHeight; - } - - function addLineWidget(cm, handle, node, options) { - var widget = new LineWidget(cm, node, options); - if (widget.noHScroll) cm.display.alignWidgets = true; - changeLine(cm.doc, handle, "widget", function(line) { - var widgets = line.widgets || (line.widgets = []); - if (widget.insertAt == null) widgets.push(widget); - else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget); - widget.line = line; - if (!lineIsHidden(cm.doc, line)) { - var aboveVisible = heightAtLine(line) < cm.doc.scrollTop; - updateLineHeight(line, line.height + widgetHeight(widget)); - if (aboveVisible) addToScrollPos(cm, null, widget.height); - cm.curOp.forceUpdate = true; - } - return true; - }); - return widget; - } - - // LINE DATA STRUCTURE - - // Line objects. These hold state related to a line, including - // highlighting info (the styles array). - var Line = CodeMirror.Line = function(text, markedSpans, estimateHeight) { - this.text = text; - attachMarkedSpans(this, markedSpans); - this.height = estimateHeight ? estimateHeight(this) : 1; - }; - eventMixin(Line); - Line.prototype.lineNo = function() { return lineNo(this); }; - - // Change the content (text, markers) of a line. Automatically - // invalidates cached information and tries to re-estimate the - // line's height. - function updateLine(line, text, markedSpans, estimateHeight) { - line.text = text; - if (line.stateAfter) line.stateAfter = null; - if (line.styles) line.styles = null; - if (line.order != null) line.order = null; - detachMarkedSpans(line); - attachMarkedSpans(line, markedSpans); - var estHeight = estimateHeight ? estimateHeight(line) : 1; - if (estHeight != line.height) updateLineHeight(line, estHeight); - } - - // Detach a line from the document tree and its markers. - function cleanUpLine(line) { - line.parent = null; - detachMarkedSpans(line); - } - - function extractLineClasses(type, output) { - if (type) for (;;) { - var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/); - if (!lineClass) break; - type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length); - var prop = lineClass[1] ? "bgClass" : "textClass"; - if (output[prop] == null) - output[prop] = lineClass[2]; - else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop])) - output[prop] += " " + lineClass[2]; - } - return type; - } - - function callBlankLine(mode, state) { - if (mode.blankLine) return mode.blankLine(state); - if (!mode.innerMode) return; - var inner = CodeMirror.innerMode(mode, state); - if (inner.mode.blankLine) return inner.mode.blankLine(inner.state); - } - - function readToken(mode, stream, state) { - for (var i = 0; i < 10; i++) { - var style = mode.token(stream, state); - if (stream.pos > stream.start) return style; - } - throw new Error("Mode " + mode.name + " failed to advance stream."); - } - - // Run the given mode's parser over a line, calling f for each token. - function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) { - var flattenSpans = mode.flattenSpans; - if (flattenSpans == null) flattenSpans = cm.options.flattenSpans; - var curStart = 0, curStyle = null; - var stream = new StringStream(text, cm.options.tabSize), style; - if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses); - while (!stream.eol()) { - if (stream.pos > cm.options.maxHighlightLength) { - flattenSpans = false; - if (forceToEnd) processLine(cm, text, state, stream.pos); - stream.pos = text.length; - style = null; - } else { - style = extractLineClasses(readToken(mode, stream, state), lineClasses); - } - if (cm.options.addModeClass) { - var mName = CodeMirror.innerMode(mode, state).mode.name; - if (mName) style = "m-" + (style ? mName + " " + style : mName); - } - if (!flattenSpans || curStyle != style) { - if (curStart < stream.start) f(stream.start, curStyle); - curStart = stream.start; curStyle = style; - } - stream.start = stream.pos; - } - while (curStart < stream.pos) { - // Webkit seems to refuse to render text nodes longer than 57444 characters - var pos = Math.min(stream.pos, curStart + 50000); - f(pos, curStyle); - curStart = pos; - } - } - - // Compute a style array (an array starting with a mode generation - // -- for invalidation -- followed by pairs of end positions and - // style strings), which is used to highlight the tokens on the - // line. - function highlightLine(cm, line, state, forceToEnd) { - // A styles array always starts with a number identifying the - // mode/overlays that it is based on (for easy invalidation). - var st = [cm.state.modeGen], lineClasses = {}; - // Compute the base array of styles - runMode(cm, line.text, cm.doc.mode, state, function(end, style) { - st.push(end, style); - }, lineClasses, forceToEnd); - - // Run overlays, adjust style array. - for (var o = 0; o < cm.state.overlays.length; ++o) { - var overlay = cm.state.overlays[o], i = 1, at = 0; - runMode(cm, line.text, overlay.mode, true, function(end, style) { - var start = i; - // Ensure there's a token end at the current position, and that i points at it - while (at < end) { - var i_end = st[i]; - if (i_end > end) - st.splice(i, 1, end, st[i+1], i_end); - i += 2; - at = Math.min(end, i_end); - } - if (!style) return; - if (overlay.opaque) { - st.splice(start, i - start, end, "cm-overlay " + style); - i = start + 2; - } else { - for (; start < i; start += 2) { - var cur = st[start+1]; - st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style; - } - } - }, lineClasses); - } - - return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null}; - } - - function getLineStyles(cm, line) { - if (!line.styles || line.styles[0] != cm.state.modeGen) { - var result = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line))); - line.styles = result.styles; - if (result.classes) line.styleClasses = result.classes; - else if (line.styleClasses) line.styleClasses = null; - } - return line.styles; - } - - // Lightweight form of highlight -- proceed over this line and - // update state, but don't save a style array. Used for lines that - // aren't currently visible. - function processLine(cm, text, state, startAt) { - var mode = cm.doc.mode; - var stream = new StringStream(text, cm.options.tabSize); - stream.start = stream.pos = startAt || 0; - if (text == "") callBlankLine(mode, state); - while (!stream.eol() && stream.pos <= cm.options.maxHighlightLength) { - readToken(mode, stream, state); - stream.start = stream.pos; - } - } - - // Convert a style as returned by a mode (either null, or a string - // containing one or more styles) to a CSS style. This is cached, - // and also looks for line-wide styles. - var styleToClassCache = {}, styleToClassCacheWithMode = {}; - function interpretTokenStyle(style, options) { - if (!style || /^\s*$/.test(style)) return null; - var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache; - return cache[style] || - (cache[style] = style.replace(/\S+/g, "cm-$&")); - } - - // Render the DOM representation of the text of a line. Also builds - // up a 'line map', which points at the DOM nodes that represent - // specific stretches of text, and is used by the measuring code. - // The returned object contains the DOM node, this map, and - // information about line-wide styles that were set by the mode. - function buildLineContent(cm, lineView) { - // The padding-right forces the element to have a 'border', which - // is needed on Webkit to be able to get line-level bounding - // rectangles for it (in measureChar). - var content = elt("span", null, null, webkit ? "padding-right: .1px" : null); - var builder = {pre: elt("pre", [content]), content: content, col: 0, pos: 0, cm: cm}; - lineView.measure = {}; - - // Iterate over the logical lines that make up this visual line. - for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) { - var line = i ? lineView.rest[i - 1] : lineView.line, order; - builder.pos = 0; - builder.addToken = buildToken; - // Optionally wire in some hacks into the token-rendering - // algorithm, to deal with browser quirks. - if ((ie || webkit) && cm.getOption("lineWrapping")) - builder.addToken = buildTokenSplitSpaces(builder.addToken); - if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line))) - builder.addToken = buildTokenBadBidi(builder.addToken, order); - builder.map = []; - insertLineContent(line, builder, getLineStyles(cm, line)); - if (line.styleClasses) { - if (line.styleClasses.bgClass) - builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || ""); - if (line.styleClasses.textClass) - builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || ""); - } - - // Ensure at least a single node is present, for measuring. - if (builder.map.length == 0) - builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure))); - - // Store the map and a cache object for the current logical line - if (i == 0) { - lineView.measure.map = builder.map; - lineView.measure.cache = {}; - } else { - (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map); - (lineView.measure.caches || (lineView.measure.caches = [])).push({}); - } - } - - signal(cm, "renderLine", cm, lineView.line, builder.pre); - if (builder.pre.className) - builder.textClass = joinClasses(builder.pre.className, builder.textClass || ""); - return builder; - } - - function defaultSpecialCharPlaceholder(ch) { - var token = elt("span", "\u2022", "cm-invalidchar"); - token.title = "\\u" + ch.charCodeAt(0).toString(16); - return token; - } - - // Build up the DOM representation for a single token, and add it to - // the line map. Takes care to render special characters separately. - function buildToken(builder, text, style, startStyle, endStyle, title) { - if (!text) return; - var special = builder.cm.options.specialChars, mustWrap = false; - if (!special.test(text)) { - builder.col += text.length; - var content = document.createTextNode(text); - builder.map.push(builder.pos, builder.pos + text.length, content); - if (ie && ie_version < 9) mustWrap = true; - builder.pos += text.length; - } else { - var content = document.createDocumentFragment(), pos = 0; - while (true) { - special.lastIndex = pos; - var m = special.exec(text); - var skipped = m ? m.index - pos : text.length - pos; - if (skipped) { - var txt = document.createTextNode(text.slice(pos, pos + skipped)); - if (ie && ie_version < 9) content.appendChild(elt("span", [txt])); - else content.appendChild(txt); - builder.map.push(builder.pos, builder.pos + skipped, txt); - builder.col += skipped; - builder.pos += skipped; - } - if (!m) break; - pos += skipped + 1; - if (m[0] == "\t") { - var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize; - var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab")); - builder.col += tabWidth; - } else { - var txt = builder.cm.options.specialCharPlaceholder(m[0]); - if (ie && ie_version < 9) content.appendChild(elt("span", [txt])); - else content.appendChild(txt); - builder.col += 1; - } - builder.map.push(builder.pos, builder.pos + 1, txt); - builder.pos++; - } - } - if (style || startStyle || endStyle || mustWrap) { - var fullStyle = style || ""; - if (startStyle) fullStyle += startStyle; - if (endStyle) fullStyle += endStyle; - var token = elt("span", [content], fullStyle); - if (title) token.title = title; - return builder.content.appendChild(token); - } - builder.content.appendChild(content); - } - - function buildTokenSplitSpaces(inner) { - function split(old) { - var out = " "; - for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0"; - out += " "; - return out; - } - return function(builder, text, style, startStyle, endStyle, title) { - inner(builder, text.replace(/ {3,}/g, split), style, startStyle, endStyle, title); - }; - } - - // Work around nonsense dimensions being reported for stretches of - // right-to-left text. - function buildTokenBadBidi(inner, order) { - return function(builder, text, style, startStyle, endStyle, title) { - style = style ? style + " cm-force-border" : "cm-force-border"; - var start = builder.pos, end = start + text.length; - for (;;) { - // Find the part that overlaps with the start of this text - for (var i = 0; i < order.length; i++) { - var part = order[i]; - if (part.to > start && part.from <= start) break; - } - if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title); - inner(builder, text.slice(0, part.to - start), style, startStyle, null, title); - startStyle = null; - text = text.slice(part.to - start); - start = part.to; - } - }; - } - - function buildCollapsedSpan(builder, size, marker, ignoreWidget) { - var widget = !ignoreWidget && marker.widgetNode; - if (widget) { - builder.map.push(builder.pos, builder.pos + size, widget); - builder.content.appendChild(widget); - } - builder.pos += size; - } - - // Outputs a number of spans to make up a line, taking highlighting - // and marked text into account. - function insertLineContent(line, builder, styles) { - var spans = line.markedSpans, allText = line.text, at = 0; - if (!spans) { - for (var i = 1; i < styles.length; i+=2) - builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options)); - return; - } - - var len = allText.length, pos = 0, i = 1, text = "", style; - var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed; - for (;;) { - if (nextChange == pos) { // Update current marker set - spanStyle = spanEndStyle = spanStartStyle = title = ""; - collapsed = null; nextChange = Infinity; - var foundBookmarks = []; - for (var j = 0; j < spans.length; ++j) { - var sp = spans[j], m = sp.marker; - if (sp.from <= pos && (sp.to == null || sp.to > pos)) { - if (sp.to != null && nextChange > sp.to) { nextChange = sp.to; spanEndStyle = ""; } - if (m.className) spanStyle += " " + m.className; - if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle; - if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle; - if (m.title && !title) title = m.title; - if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0)) - collapsed = sp; - } else if (sp.from > pos && nextChange > sp.from) { - nextChange = sp.from; - } - if (m.type == "bookmark" && sp.from == pos && m.widgetNode) foundBookmarks.push(m); - } - if (collapsed && (collapsed.from || 0) == pos) { - buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos, - collapsed.marker, collapsed.from == null); - if (collapsed.to == null) return; - } - if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j) - buildCollapsedSpan(builder, 0, foundBookmarks[j]); - } - if (pos >= len) break; - - var upto = Math.min(len, nextChange); - while (true) { - if (text) { - var end = pos + text.length; - if (!collapsed) { - var tokenText = end > upto ? text.slice(0, upto - pos) : text; - builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle, - spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title); - } - if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;} - pos = end; - spanStartStyle = ""; - } - text = allText.slice(at, at = styles[i++]); - style = interpretTokenStyle(styles[i++], builder.cm.options); - } - } - } - - // DOCUMENT DATA STRUCTURE - - // By default, updates that start and end at the beginning of a line - // are treated specially, in order to make the association of line - // widgets and marker elements with the text behave more intuitive. - function isWholeLineUpdate(doc, change) { - return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" && - (!doc.cm || doc.cm.options.wholeLineUpdateBefore); - } - - // Perform a change on the document data structure. - function updateDoc(doc, change, markedSpans, estimateHeight) { - function spansFor(n) {return markedSpans ? markedSpans[n] : null;} - function update(line, text, spans) { - updateLine(line, text, spans, estimateHeight); - signalLater(line, "change", line, change); - } - - var from = change.from, to = change.to, text = change.text; - var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line); - var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line; - - // Adjust the line structure - if (isWholeLineUpdate(doc, change)) { - // This is a whole-line replace. Treated specially to make - // sure line objects move the way they are supposed to. - for (var i = 0, added = []; i < text.length - 1; ++i) - added.push(new Line(text[i], spansFor(i), estimateHeight)); - update(lastLine, lastLine.text, lastSpans); - if (nlines) doc.remove(from.line, nlines); - if (added.length) doc.insert(from.line, added); - } else if (firstLine == lastLine) { - if (text.length == 1) { - update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans); - } else { - for (var added = [], i = 1; i < text.length - 1; ++i) - added.push(new Line(text[i], spansFor(i), estimateHeight)); - added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight)); - update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)); - doc.insert(from.line + 1, added); - } - } else if (text.length == 1) { - update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0)); - doc.remove(from.line + 1, nlines); - } else { - update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0)); - update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans); - for (var i = 1, added = []; i < text.length - 1; ++i) - added.push(new Line(text[i], spansFor(i), estimateHeight)); - if (nlines > 1) doc.remove(from.line + 1, nlines - 1); - doc.insert(from.line + 1, added); - } - - signalLater(doc, "change", doc, change); - } - - // The document is represented as a BTree consisting of leaves, with - // chunk of lines in them, and branches, with up to ten leaves or - // other branch nodes below them. The top node is always a branch - // node, and is the document object itself (meaning it has - // additional methods and properties). - // - // All nodes have parent links. The tree is used both to go from - // line numbers to line objects, and to go from objects to numbers. - // It also indexes by height, and is used to convert between height - // and line object, and to find the total height of the document. - // - // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html - - function LeafChunk(lines) { - this.lines = lines; - this.parent = null; - for (var i = 0, height = 0; i < lines.length; ++i) { - lines[i].parent = this; - height += lines[i].height; - } - this.height = height; - } - - LeafChunk.prototype = { - chunkSize: function() { return this.lines.length; }, - // Remove the n lines at offset 'at'. - removeInner: function(at, n) { - for (var i = at, e = at + n; i < e; ++i) { - var line = this.lines[i]; - this.height -= line.height; - cleanUpLine(line); - signalLater(line, "delete"); - } - this.lines.splice(at, n); - }, - // Helper used to collapse a small branch into a single leaf. - collapse: function(lines) { - lines.push.apply(lines, this.lines); - }, - // Insert the given array of lines at offset 'at', count them as - // having the given height. - insertInner: function(at, lines, height) { - this.height += height; - this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at)); - for (var i = 0; i < lines.length; ++i) lines[i].parent = this; - }, - // Used to iterate over a part of the tree. - iterN: function(at, n, op) { - for (var e = at + n; at < e; ++at) - if (op(this.lines[at])) return true; - } - }; - - function BranchChunk(children) { - this.children = children; - var size = 0, height = 0; - for (var i = 0; i < children.length; ++i) { - var ch = children[i]; - size += ch.chunkSize(); height += ch.height; - ch.parent = this; - } - this.size = size; - this.height = height; - this.parent = null; - } - - BranchChunk.prototype = { - chunkSize: function() { return this.size; }, - removeInner: function(at, n) { - this.size -= n; - for (var i = 0; i < this.children.length; ++i) { - var child = this.children[i], sz = child.chunkSize(); - if (at < sz) { - var rm = Math.min(n, sz - at), oldHeight = child.height; - child.removeInner(at, rm); - this.height -= oldHeight - child.height; - if (sz == rm) { this.children.splice(i--, 1); child.parent = null; } - if ((n -= rm) == 0) break; - at = 0; - } else at -= sz; - } - // If the result is smaller than 25 lines, ensure that it is a - // single leaf node. - if (this.size - n < 25 && - (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) { - var lines = []; - this.collapse(lines); - this.children = [new LeafChunk(lines)]; - this.children[0].parent = this; - } - }, - collapse: function(lines) { - for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines); - }, - insertInner: function(at, lines, height) { - this.size += lines.length; - this.height += height; - for (var i = 0; i < this.children.length; ++i) { - var child = this.children[i], sz = child.chunkSize(); - if (at <= sz) { - child.insertInner(at, lines, height); - if (child.lines && child.lines.length > 50) { - while (child.lines.length > 50) { - var spilled = child.lines.splice(child.lines.length - 25, 25); - var newleaf = new LeafChunk(spilled); - child.height -= newleaf.height; - this.children.splice(i + 1, 0, newleaf); - newleaf.parent = this; - } - this.maybeSpill(); - } - break; - } - at -= sz; - } - }, - // When a node has grown, check whether it should be split. - maybeSpill: function() { - if (this.children.length <= 10) return; - var me = this; - do { - var spilled = me.children.splice(me.children.length - 5, 5); - var sibling = new BranchChunk(spilled); - if (!me.parent) { // Become the parent node - var copy = new BranchChunk(me.children); - copy.parent = me; - me.children = [copy, sibling]; - me = copy; - } else { - me.size -= sibling.size; - me.height -= sibling.height; - var myIndex = indexOf(me.parent.children, me); - me.parent.children.splice(myIndex + 1, 0, sibling); - } - sibling.parent = me.parent; - } while (me.children.length > 10); - me.parent.maybeSpill(); - }, - iterN: function(at, n, op) { - for (var i = 0; i < this.children.length; ++i) { - var child = this.children[i], sz = child.chunkSize(); - if (at < sz) { - var used = Math.min(n, sz - at); - if (child.iterN(at, used, op)) return true; - if ((n -= used) == 0) break; - at = 0; - } else at -= sz; - } - } - }; - - var nextDocId = 0; - var Doc = CodeMirror.Doc = function(text, mode, firstLine) { - if (!(this instanceof Doc)) return new Doc(text, mode, firstLine); - if (firstLine == null) firstLine = 0; - - BranchChunk.call(this, [new LeafChunk([new Line("", null)])]); - this.first = firstLine; - this.scrollTop = this.scrollLeft = 0; - this.cantEdit = false; - this.cleanGeneration = 1; - this.frontier = firstLine; - var start = Pos(firstLine, 0); - this.sel = simpleSelection(start); - this.history = new History(null); - this.id = ++nextDocId; - this.modeOption = mode; - - if (typeof text == "string") text = splitLines(text); - updateDoc(this, {from: start, to: start, text: text}); - setSelection(this, simpleSelection(start), sel_dontScroll); - }; - - Doc.prototype = createObj(BranchChunk.prototype, { - constructor: Doc, - // Iterate over the document. Supports two forms -- with only one - // argument, it calls that for each line in the document. With - // three, it iterates over the range given by the first two (with - // the second being non-inclusive). - iter: function(from, to, op) { - if (op) this.iterN(from - this.first, to - from, op); - else this.iterN(this.first, this.first + this.size, from); - }, - - // Non-public interface for adding and removing lines. - insert: function(at, lines) { - var height = 0; - for (var i = 0; i < lines.length; ++i) height += lines[i].height; - this.insertInner(at - this.first, lines, height); - }, - remove: function(at, n) { this.removeInner(at - this.first, n); }, - - // From here, the methods are part of the public interface. Most - // are also available from CodeMirror (editor) instances. - - getValue: function(lineSep) { - var lines = getLines(this, this.first, this.first + this.size); - if (lineSep === false) return lines; - return lines.join(lineSep || "\n"); - }, - setValue: docMethodOp(function(code) { - var top = Pos(this.first, 0), last = this.first + this.size - 1; - makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length), - text: splitLines(code), origin: "setValue"}, true); - setSelection(this, simpleSelection(top)); - }), - replaceRange: function(code, from, to, origin) { - from = clipPos(this, from); - to = to ? clipPos(this, to) : from; - replaceRange(this, code, from, to, origin); - }, - getRange: function(from, to, lineSep) { - var lines = getBetween(this, clipPos(this, from), clipPos(this, to)); - if (lineSep === false) return lines; - return lines.join(lineSep || "\n"); - }, - - getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;}, - - getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);}, - getLineNumber: function(line) {return lineNo(line);}, - - getLineHandleVisualStart: function(line) { - if (typeof line == "number") line = getLine(this, line); - return visualLine(line); - }, - - lineCount: function() {return this.size;}, - firstLine: function() {return this.first;}, - lastLine: function() {return this.first + this.size - 1;}, - - clipPos: function(pos) {return clipPos(this, pos);}, - - getCursor: function(start) { - var range = this.sel.primary(), pos; - if (start == null || start == "head") pos = range.head; - else if (start == "anchor") pos = range.anchor; - else if (start == "end" || start == "to" || start === false) pos = range.to(); - else pos = range.from(); - return pos; - }, - listSelections: function() { return this.sel.ranges; }, - somethingSelected: function() {return this.sel.somethingSelected();}, - - setCursor: docMethodOp(function(line, ch, options) { - setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options); - }), - setSelection: docMethodOp(function(anchor, head, options) { - setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options); - }), - extendSelection: docMethodOp(function(head, other, options) { - extendSelection(this, clipPos(this, head), other && clipPos(this, other), options); - }), - extendSelections: docMethodOp(function(heads, options) { - extendSelections(this, clipPosArray(this, heads, options)); - }), - extendSelectionsBy: docMethodOp(function(f, options) { - extendSelections(this, map(this.sel.ranges, f), options); - }), - setSelections: docMethodOp(function(ranges, primary, options) { - if (!ranges.length) return; - for (var i = 0, out = []; i < ranges.length; i++) - out[i] = new Range(clipPos(this, ranges[i].anchor), - clipPos(this, ranges[i].head)); - if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex); - setSelection(this, normalizeSelection(out, primary), options); - }), - addSelection: docMethodOp(function(anchor, head, options) { - var ranges = this.sel.ranges.slice(0); - ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor))); - setSelection(this, normalizeSelection(ranges, ranges.length - 1), options); - }), - - getSelection: function(lineSep) { - var ranges = this.sel.ranges, lines; - for (var i = 0; i < ranges.length; i++) { - var sel = getBetween(this, ranges[i].from(), ranges[i].to()); - lines = lines ? lines.concat(sel) : sel; - } - if (lineSep === false) return lines; - else return lines.join(lineSep || "\n"); - }, - getSelections: function(lineSep) { - var parts = [], ranges = this.sel.ranges; - for (var i = 0; i < ranges.length; i++) { - var sel = getBetween(this, ranges[i].from(), ranges[i].to()); - if (lineSep !== false) sel = sel.join(lineSep || "\n"); - parts[i] = sel; - } - return parts; - }, - replaceSelection: function(code, collapse, origin) { - var dup = []; - for (var i = 0; i < this.sel.ranges.length; i++) - dup[i] = code; - this.replaceSelections(dup, collapse, origin || "+input"); - }, - replaceSelections: docMethodOp(function(code, collapse, origin) { - var changes = [], sel = this.sel; - for (var i = 0; i < sel.ranges.length; i++) { - var range = sel.ranges[i]; - changes[i] = {from: range.from(), to: range.to(), text: splitLines(code[i]), origin: origin}; - } - var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse); - for (var i = changes.length - 1; i >= 0; i--) - makeChange(this, changes[i]); - if (newSel) setSelectionReplaceHistory(this, newSel); - else if (this.cm) ensureCursorVisible(this.cm); - }), - undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}), - redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}), - undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}), - redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}), - - setExtending: function(val) {this.extend = val;}, - getExtending: function() {return this.extend;}, - - historySize: function() { - var hist = this.history, done = 0, undone = 0; - for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done; - for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone; - return {undo: done, redo: undone}; - }, - clearHistory: function() {this.history = new History(this.history.maxGeneration);}, - - markClean: function() { - this.cleanGeneration = this.changeGeneration(true); - }, - changeGeneration: function(forceSplit) { - if (forceSplit) - this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null; - return this.history.generation; - }, - isClean: function (gen) { - return this.history.generation == (gen || this.cleanGeneration); - }, - - getHistory: function() { - return {done: copyHistoryArray(this.history.done), - undone: copyHistoryArray(this.history.undone)}; - }, - setHistory: function(histData) { - var hist = this.history = new History(this.history.maxGeneration); - hist.done = copyHistoryArray(histData.done.slice(0), null, true); - hist.undone = copyHistoryArray(histData.undone.slice(0), null, true); - }, - - addLineClass: docMethodOp(function(handle, where, cls) { - return changeLine(this, handle, "class", function(line) { - var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass"; - if (!line[prop]) line[prop] = cls; - else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false; - else line[prop] += " " + cls; - return true; - }); - }), - removeLineClass: docMethodOp(function(handle, where, cls) { - return changeLine(this, handle, "class", function(line) { - var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass"; - var cur = line[prop]; - if (!cur) return false; - else if (cls == null) line[prop] = null; - else { - var found = cur.match(new RegExp("(?:^|\\s+)" + cls + "(?:$|\\s+)")); - if (!found) return false; - var end = found.index + found[0].length; - line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null; - } - return true; - }); - }), - - markText: function(from, to, options) { - return markText(this, clipPos(this, from), clipPos(this, to), options, "range"); - }, - setBookmark: function(pos, options) { - var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options), - insertLeft: options && options.insertLeft, - clearWhenEmpty: false, shared: options && options.shared}; - pos = clipPos(this, pos); - return markText(this, pos, pos, realOpts, "bookmark"); - }, - findMarksAt: function(pos) { - pos = clipPos(this, pos); - var markers = [], spans = getLine(this, pos.line).markedSpans; - if (spans) for (var i = 0; i < spans.length; ++i) { - var span = spans[i]; - if ((span.from == null || span.from <= pos.ch) && - (span.to == null || span.to >= pos.ch)) - markers.push(span.marker.parent || span.marker); - } - return markers; - }, - findMarks: function(from, to, filter) { - from = clipPos(this, from); to = clipPos(this, to); - var found = [], lineNo = from.line; - this.iter(from.line, to.line + 1, function(line) { - var spans = line.markedSpans; - if (spans) for (var i = 0; i < spans.length; i++) { - var span = spans[i]; - if (!(lineNo == from.line && from.ch > span.to || - span.from == null && lineNo != from.line|| - lineNo == to.line && span.from > to.ch) && - (!filter || filter(span.marker))) - found.push(span.marker.parent || span.marker); - } - ++lineNo; - }); - return found; - }, - getAllMarks: function() { - var markers = []; - this.iter(function(line) { - var sps = line.markedSpans; - if (sps) for (var i = 0; i < sps.length; ++i) - if (sps[i].from != null) markers.push(sps[i].marker); - }); - return markers; - }, - - posFromIndex: function(off) { - var ch, lineNo = this.first; - this.iter(function(line) { - var sz = line.text.length + 1; - if (sz > off) { ch = off; return true; } - off -= sz; - ++lineNo; - }); - return clipPos(this, Pos(lineNo, ch)); - }, - indexFromPos: function (coords) { - coords = clipPos(this, coords); - var index = coords.ch; - if (coords.line < this.first || coords.ch < 0) return 0; - this.iter(this.first, coords.line, function (line) { - index += line.text.length + 1; - }); - return index; - }, - - copy: function(copyHistory) { - var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first); - doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft; - doc.sel = this.sel; - doc.extend = false; - if (copyHistory) { - doc.history.undoDepth = this.history.undoDepth; - doc.setHistory(this.getHistory()); - } - return doc; - }, - - linkedDoc: function(options) { - if (!options) options = {}; - var from = this.first, to = this.first + this.size; - if (options.from != null && options.from > from) from = options.from; - if (options.to != null && options.to < to) to = options.to; - var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from); - if (options.sharedHist) copy.history = this.history; - (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist}); - copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}]; - copySharedMarkers(copy, findSharedMarkers(this)); - return copy; - }, - unlinkDoc: function(other) { - if (other instanceof CodeMirror) other = other.doc; - if (this.linked) for (var i = 0; i < this.linked.length; ++i) { - var link = this.linked[i]; - if (link.doc != other) continue; - this.linked.splice(i, 1); - other.unlinkDoc(this); - detachSharedMarkers(findSharedMarkers(this)); - break; - } - // If the histories were shared, split them again - if (other.history == this.history) { - var splitIds = [other.id]; - linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true); - other.history = new History(null); - other.history.done = copyHistoryArray(this.history.done, splitIds); - other.history.undone = copyHistoryArray(this.history.undone, splitIds); - } - }, - iterLinkedDocs: function(f) {linkedDocs(this, f);}, - - getMode: function() {return this.mode;}, - getEditor: function() {return this.cm;} - }); - - // Public alias. - Doc.prototype.eachLine = Doc.prototype.iter; - - // Set up methods on CodeMirror's prototype to redirect to the editor's document. - var dontDelegate = "iter insert remove copy getEditor".split(" "); - for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0) - CodeMirror.prototype[prop] = (function(method) { - return function() {return method.apply(this.doc, arguments);}; - })(Doc.prototype[prop]); - - eventMixin(Doc); - - // Call f for all linked documents. - function linkedDocs(doc, f, sharedHistOnly) { - function propagate(doc, skip, sharedHist) { - if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) { - var rel = doc.linked[i]; - if (rel.doc == skip) continue; - var shared = sharedHist && rel.sharedHist; - if (sharedHistOnly && !shared) continue; - f(rel.doc, shared); - propagate(rel.doc, doc, shared); - } - } - propagate(doc, null, true); - } - - // Attach a document to an editor. - function attachDoc(cm, doc) { - if (doc.cm) throw new Error("This document is already in use."); - cm.doc = doc; - doc.cm = cm; - estimateLineHeights(cm); - loadMode(cm); - if (!cm.options.lineWrapping) findMaxLine(cm); - cm.options.mode = doc.modeOption; - regChange(cm); - } - - // LINE UTILITIES - - // Find the line object corresponding to the given line number. - function getLine(doc, n) { - n -= doc.first; - if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document."); - for (var chunk = doc; !chunk.lines;) { - for (var i = 0;; ++i) { - var child = chunk.children[i], sz = child.chunkSize(); - if (n < sz) { chunk = child; break; } - n -= sz; - } - } - return chunk.lines[n]; - } - - // Get the part of a document between two positions, as an array of - // strings. - function getBetween(doc, start, end) { - var out = [], n = start.line; - doc.iter(start.line, end.line + 1, function(line) { - var text = line.text; - if (n == end.line) text = text.slice(0, end.ch); - if (n == start.line) text = text.slice(start.ch); - out.push(text); - ++n; - }); - return out; - } - // Get the lines between from and to, as array of strings. - function getLines(doc, from, to) { - var out = []; - doc.iter(from, to, function(line) { out.push(line.text); }); - return out; - } - - // Update the height of a line, propagating the height change - // upwards to parent nodes. - function updateLineHeight(line, height) { - var diff = height - line.height; - if (diff) for (var n = line; n; n = n.parent) n.height += diff; - } - - // Given a line object, find its line number by walking up through - // its parent links. - function lineNo(line) { - if (line.parent == null) return null; - var cur = line.parent, no = indexOf(cur.lines, line); - for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) { - for (var i = 0;; ++i) { - if (chunk.children[i] == cur) break; - no += chunk.children[i].chunkSize(); - } - } - return no + cur.first; - } - - // Find the line at the given vertical position, using the height - // information in the document tree. - function lineAtHeight(chunk, h) { - var n = chunk.first; - outer: do { - for (var i = 0; i < chunk.children.length; ++i) { - var child = chunk.children[i], ch = child.height; - if (h < ch) { chunk = child; continue outer; } - h -= ch; - n += child.chunkSize(); - } - return n; - } while (!chunk.lines); - for (var i = 0; i < chunk.lines.length; ++i) { - var line = chunk.lines[i], lh = line.height; - if (h < lh) break; - h -= lh; - } - return n + i; - } - - - // Find the height above the given line. - function heightAtLine(lineObj) { - lineObj = visualLine(lineObj); - - var h = 0, chunk = lineObj.parent; - for (var i = 0; i < chunk.lines.length; ++i) { - var line = chunk.lines[i]; - if (line == lineObj) break; - else h += line.height; - } - for (var p = chunk.parent; p; chunk = p, p = chunk.parent) { - for (var i = 0; i < p.children.length; ++i) { - var cur = p.children[i]; - if (cur == chunk) break; - else h += cur.height; - } - } - return h; - } - - // Get the bidi ordering for the given line (and cache it). Returns - // false for lines that are fully left-to-right, and an array of - // BidiSpan objects otherwise. - function getOrder(line) { - var order = line.order; - if (order == null) order = line.order = bidiOrdering(line.text); - return order; - } - - // HISTORY - - function History(startGen) { - // Arrays of change events and selections. Doing something adds an - // event to done and clears undo. Undoing moves events from done - // to undone, redoing moves them in the other direction. - this.done = []; this.undone = []; - this.undoDepth = Infinity; - // Used to track when changes can be merged into a single undo - // event - this.lastModTime = this.lastSelTime = 0; - this.lastOp = this.lastSelOp = null; - this.lastOrigin = this.lastSelOrigin = null; - // Used by the isClean() method - this.generation = this.maxGeneration = startGen || 1; - } - - // Create a history change event from an updateDoc-style change - // object. - function historyChangeFromChange(doc, change) { - var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)}; - attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1); - linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true); - return histChange; - } - - // Pop all selection events off the end of a history array. Stop at - // a change event. - function clearSelectionEvents(array) { - while (array.length) { - var last = lst(array); - if (last.ranges) array.pop(); - else break; - } - } - - // Find the top change event in the history. Pop off selection - // events that are in the way. - function lastChangeEvent(hist, force) { - if (force) { - clearSelectionEvents(hist.done); - return lst(hist.done); - } else if (hist.done.length && !lst(hist.done).ranges) { - return lst(hist.done); - } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) { - hist.done.pop(); - return lst(hist.done); - } - } - - // Register a change in the history. Merges changes that are within - // a single operation, ore are close together with an origin that - // allows merging (starting with "+") into a single event. - function addChangeToHistory(doc, change, selAfter, opId) { - var hist = doc.history; - hist.undone.length = 0; - var time = +new Date, cur; - - if ((hist.lastOp == opId || - hist.lastOrigin == change.origin && change.origin && - ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) || - change.origin.charAt(0) == "*")) && - (cur = lastChangeEvent(hist, hist.lastOp == opId))) { - // Merge this change into the last event - var last = lst(cur.changes); - if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) { - // Optimized case for simple insertion -- don't want to add - // new changesets for every character typed - last.to = changeEnd(change); - } else { - // Add new sub-event - cur.changes.push(historyChangeFromChange(doc, change)); - } - } else { - // Can not be merged, start a new event. - var before = lst(hist.done); - if (!before || !before.ranges) - pushSelectionToHistory(doc.sel, hist.done); - cur = {changes: [historyChangeFromChange(doc, change)], - generation: hist.generation}; - hist.done.push(cur); - while (hist.done.length > hist.undoDepth) { - hist.done.shift(); - if (!hist.done[0].ranges) hist.done.shift(); - } - } - hist.done.push(selAfter); - hist.generation = ++hist.maxGeneration; - hist.lastModTime = hist.lastSelTime = time; - hist.lastOp = hist.lastSelOp = opId; - hist.lastOrigin = hist.lastSelOrigin = change.origin; - - if (!last) signal(doc, "historyAdded"); - } - - function selectionEventCanBeMerged(doc, origin, prev, sel) { - var ch = origin.charAt(0); - return ch == "*" || - ch == "+" && - prev.ranges.length == sel.ranges.length && - prev.somethingSelected() == sel.somethingSelected() && - new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500); - } - - // Called whenever the selection changes, sets the new selection as - // the pending selection in the history, and pushes the old pending - // selection into the 'done' array when it was significantly - // different (in number of selected ranges, emptiness, or time). - function addSelectionToHistory(doc, sel, opId, options) { - var hist = doc.history, origin = options && options.origin; - - // A new event is started when the previous origin does not match - // the current, or the origins don't allow matching. Origins - // starting with * are always merged, those starting with + are - // merged when similar and close together in time. - if (opId == hist.lastSelOp || - (origin && hist.lastSelOrigin == origin && - (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin || - selectionEventCanBeMerged(doc, origin, lst(hist.done), sel)))) - hist.done[hist.done.length - 1] = sel; - else - pushSelectionToHistory(sel, hist.done); - - hist.lastSelTime = +new Date; - hist.lastSelOrigin = origin; - hist.lastSelOp = opId; - if (options && options.clearRedo !== false) - clearSelectionEvents(hist.undone); - } - - function pushSelectionToHistory(sel, dest) { - var top = lst(dest); - if (!(top && top.ranges && top.equals(sel))) - dest.push(sel); - } - - // Used to store marked span information in the history. - function attachLocalSpans(doc, change, from, to) { - var existing = change["spans_" + doc.id], n = 0; - doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) { - if (line.markedSpans) - (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans; - ++n; - }); - } - - // When un/re-doing restores text containing marked spans, those - // that have been explicitly cleared should not be restored. - function removeClearedSpans(spans) { - if (!spans) return null; - for (var i = 0, out; i < spans.length; ++i) { - if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i); } - else if (out) out.push(spans[i]); - } - return !out ? spans : out.length ? out : null; - } - - // Retrieve and filter the old marked spans stored in a change event. - function getOldSpans(doc, change) { - var found = change["spans_" + doc.id]; - if (!found) return null; - for (var i = 0, nw = []; i < change.text.length; ++i) - nw.push(removeClearedSpans(found[i])); - return nw; - } - - // Used both to provide a JSON-safe object in .getHistory, and, when - // detaching a document, to split the history in two - function copyHistoryArray(events, newGroup, instantiateSel) { - for (var i = 0, copy = []; i < events.length; ++i) { - var event = events[i]; - if (event.ranges) { - copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event); - continue; - } - var changes = event.changes, newChanges = []; - copy.push({changes: newChanges}); - for (var j = 0; j < changes.length; ++j) { - var change = changes[j], m; - newChanges.push({from: change.from, to: change.to, text: change.text}); - if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) { - if (indexOf(newGroup, Number(m[1])) > -1) { - lst(newChanges)[prop] = change[prop]; - delete change[prop]; - } - } - } - } - return copy; - } - - // Rebasing/resetting history to deal with externally-sourced changes - - function rebaseHistSelSingle(pos, from, to, diff) { - if (to < pos.line) { - pos.line += diff; - } else if (from < pos.line) { - pos.line = from; - pos.ch = 0; - } - } - - // Tries to rebase an array of history events given a change in the - // document. If the change touches the same lines as the event, the - // event, and everything 'behind' it, is discarded. If the change is - // before the event, the event's positions are updated. Uses a - // copy-on-write scheme for the positions, to avoid having to - // reallocate them all on every rebase, but also avoid problems with - // shared position objects being unsafely updated. - function rebaseHistArray(array, from, to, diff) { - for (var i = 0; i < array.length; ++i) { - var sub = array[i], ok = true; - if (sub.ranges) { - if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; } - for (var j = 0; j < sub.ranges.length; j++) { - rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff); - rebaseHistSelSingle(sub.ranges[j].head, from, to, diff); - } - continue; - } - for (var j = 0; j < sub.changes.length; ++j) { - var cur = sub.changes[j]; - if (to < cur.from.line) { - cur.from = Pos(cur.from.line + diff, cur.from.ch); - cur.to = Pos(cur.to.line + diff, cur.to.ch); - } else if (from <= cur.to.line) { - ok = false; - break; - } - } - if (!ok) { - array.splice(0, i + 1); - i = 0; - } - } - } - - function rebaseHist(hist, change) { - var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1; - rebaseHistArray(hist.done, from, to, diff); - rebaseHistArray(hist.undone, from, to, diff); - } - - // EVENT UTILITIES - - // Due to the fact that we still support jurassic IE versions, some - // compatibility wrappers are needed. - - var e_preventDefault = CodeMirror.e_preventDefault = function(e) { - if (e.preventDefault) e.preventDefault(); - else e.returnValue = false; - }; - var e_stopPropagation = CodeMirror.e_stopPropagation = function(e) { - if (e.stopPropagation) e.stopPropagation(); - else e.cancelBubble = true; - }; - function e_defaultPrevented(e) { - return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false; - } - var e_stop = CodeMirror.e_stop = function(e) {e_preventDefault(e); e_stopPropagation(e);}; - - function e_target(e) {return e.target || e.srcElement;} - function e_button(e) { - var b = e.which; - if (b == null) { - if (e.button & 1) b = 1; - else if (e.button & 2) b = 3; - else if (e.button & 4) b = 2; - } - if (mac && e.ctrlKey && b == 1) b = 3; - return b; - } - - // EVENT HANDLING - - // Lightweight event framework. on/off also work on DOM nodes, - // registering native DOM handlers. - - var on = CodeMirror.on = function(emitter, type, f) { - if (emitter.addEventListener) - emitter.addEventListener(type, f, false); - else if (emitter.attachEvent) - emitter.attachEvent("on" + type, f); - else { - var map = emitter._handlers || (emitter._handlers = {}); - var arr = map[type] || (map[type] = []); - arr.push(f); - } - }; - - var off = CodeMirror.off = function(emitter, type, f) { - if (emitter.removeEventListener) - emitter.removeEventListener(type, f, false); - else if (emitter.detachEvent) - emitter.detachEvent("on" + type, f); - else { - var arr = emitter._handlers && emitter._handlers[type]; - if (!arr) return; - for (var i = 0; i < arr.length; ++i) - if (arr[i] == f) { arr.splice(i, 1); break; } - } - }; - - var signal = CodeMirror.signal = function(emitter, type /*, values...*/) { - var arr = emitter._handlers && emitter._handlers[type]; - if (!arr) return; - var args = Array.prototype.slice.call(arguments, 2); - for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args); - }; - - var orphanDelayedCallbacks = null; - - // Often, we want to signal events at a point where we are in the - // middle of some work, but don't want the handler to start calling - // other methods on the editor, which might be in an inconsistent - // state or simply not expect any other events to happen. - // signalLater looks whether there are any handlers, and schedules - // them to be executed when the last operation ends, or, if no - // operation is active, when a timeout fires. - function signalLater(emitter, type /*, values...*/) { - var arr = emitter._handlers && emitter._handlers[type]; - if (!arr) return; - var args = Array.prototype.slice.call(arguments, 2), list; - if (operationGroup) { - list = operationGroup.delayedCallbacks; - } else if (orphanDelayedCallbacks) { - list = orphanDelayedCallbacks; - } else { - list = orphanDelayedCallbacks = []; - setTimeout(fireOrphanDelayed, 0); - } - function bnd(f) {return function(){f.apply(null, args);};}; - for (var i = 0; i < arr.length; ++i) - list.push(bnd(arr[i])); - } - - function fireOrphanDelayed() { - var delayed = orphanDelayedCallbacks; - orphanDelayedCallbacks = null; - for (var i = 0; i < delayed.length; ++i) delayed[i](); - } - - // The DOM events that CodeMirror handles can be overridden by - // registering a (non-DOM) handler on the editor for the event name, - // and preventDefault-ing the event in that handler. - function signalDOMEvent(cm, e, override) { - signal(cm, override || e.type, cm, e); - return e_defaultPrevented(e) || e.codemirrorIgnore; - } - - function signalCursorActivity(cm) { - var arr = cm._handlers && cm._handlers.cursorActivity; - if (!arr) return; - var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []); - for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1) - set.push(arr[i]); - } - - function hasHandler(emitter, type) { - var arr = emitter._handlers && emitter._handlers[type]; - return arr && arr.length > 0; - } - - // Add on and off methods to a constructor's prototype, to make - // registering events on such objects more convenient. - function eventMixin(ctor) { - ctor.prototype.on = function(type, f) {on(this, type, f);}; - ctor.prototype.off = function(type, f) {off(this, type, f);}; - } - - // MISC UTILITIES - - // Number of pixels added to scroller and sizer to hide scrollbar - var scrollerCutOff = 30; - - // Returned or thrown by various protocols to signal 'I'm not - // handling this'. - var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}}; - - // Reused option objects for setSelection & friends - var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"}; - - function Delayed() {this.id = null;} - Delayed.prototype.set = function(ms, f) { - clearTimeout(this.id); - this.id = setTimeout(f, ms); - }; - - // Counts the column offset in a string, taking tabs into account. - // Used mostly to find indentation. - var countColumn = CodeMirror.countColumn = function(string, end, tabSize, startIndex, startValue) { - if (end == null) { - end = string.search(/[^\s\u00a0]/); - if (end == -1) end = string.length; - } - for (var i = startIndex || 0, n = startValue || 0;;) { - var nextTab = string.indexOf("\t", i); - if (nextTab < 0 || nextTab >= end) - return n + (end - i); - n += nextTab - i; - n += tabSize - (n % tabSize); - i = nextTab + 1; - } - }; - - // The inverse of countColumn -- find the offset that corresponds to - // a particular column. - function findColumn(string, goal, tabSize) { - for (var pos = 0, col = 0;;) { - var nextTab = string.indexOf("\t", pos); - if (nextTab == -1) nextTab = string.length; - var skipped = nextTab - pos; - if (nextTab == string.length || col + skipped >= goal) - return pos + Math.min(skipped, goal - col); - col += nextTab - pos; - col += tabSize - (col % tabSize); - pos = nextTab + 1; - if (col >= goal) return pos; - } - } - - var spaceStrs = [""]; - function spaceStr(n) { - while (spaceStrs.length <= n) - spaceStrs.push(lst(spaceStrs) + " "); - return spaceStrs[n]; - } - - function lst(arr) { return arr[arr.length-1]; } - - var selectInput = function(node) { node.select(); }; - if (ios) // Mobile Safari apparently has a bug where select() is broken. - selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; }; - else if (ie) // Suppress mysterious IE10 errors - selectInput = function(node) { try { node.select(); } catch(_e) {} }; - - function indexOf(array, elt) { - for (var i = 0; i < array.length; ++i) - if (array[i] == elt) return i; - return -1; - } - if ([].indexOf) indexOf = function(array, elt) { return array.indexOf(elt); }; - function map(array, f) { - var out = []; - for (var i = 0; i < array.length; i++) out[i] = f(array[i], i); - return out; - } - if ([].map) map = function(array, f) { return array.map(f); }; - - function createObj(base, props) { - var inst; - if (Object.create) { - inst = Object.create(base); - } else { - var ctor = function() {}; - ctor.prototype = base; - inst = new ctor(); - } - if (props) copyObj(props, inst); - return inst; - }; - - function copyObj(obj, target, overwrite) { - if (!target) target = {}; - for (var prop in obj) - if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop))) - target[prop] = obj[prop]; - return target; - } - - function bind(f) { - var args = Array.prototype.slice.call(arguments, 1); - return function(){return f.apply(null, args);}; - } - - var nonASCIISingleCaseWordChar = /[\u00df\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/; - var isWordCharBasic = CodeMirror.isWordChar = function(ch) { - return /\w/.test(ch) || ch > "\x80" && - (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch)); - }; - function isWordChar(ch, helper) { - if (!helper) return isWordCharBasic(ch); - if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) return true; - return helper.test(ch); - } - - function isEmpty(obj) { - for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false; - return true; - } - - // Extending unicode characters. A series of a non-extending char + - // any number of extending chars is treated as a single unit as far - // as editing and measuring is concerned. This is not fully correct, - // since some scripts/fonts/browsers also treat other configurations - // of code points as a group. - var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/; - function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); } - - // DOM UTILITIES - - function elt(tag, content, className, style) { - var e = document.createElement(tag); - if (className) e.className = className; - if (style) e.style.cssText = style; - if (typeof content == "string") e.appendChild(document.createTextNode(content)); - else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]); - return e; - } - - var range; - if (document.createRange) range = function(node, start, end) { - var r = document.createRange(); - r.setEnd(node, end); - r.setStart(node, start); - return r; - }; - else range = function(node, start, end) { - var r = document.body.createTextRange(); - r.moveToElementText(node.parentNode); - r.collapse(true); - r.moveEnd("character", end); - r.moveStart("character", start); - return r; - }; - - function removeChildren(e) { - for (var count = e.childNodes.length; count > 0; --count) - e.removeChild(e.firstChild); - return e; - } - - function removeChildrenAndAdd(parent, e) { - return removeChildren(parent).appendChild(e); - } - - function contains(parent, child) { - if (parent.contains) - return parent.contains(child); - while (child = child.parentNode) - if (child == parent) return true; - } - - function activeElt() { return document.activeElement; } - // Older versions of IE throws unspecified error when touching - // document.activeElement in some cases (during loading, in iframe) - if (ie && ie_version < 11) activeElt = function() { - try { return document.activeElement; } - catch(e) { return document.body; } - }; - - function classTest(cls) { return new RegExp("\\b" + cls + "\\b\\s*"); } - function rmClass(node, cls) { - var test = classTest(cls); - if (test.test(node.className)) node.className = node.className.replace(test, ""); - } - function addClass(node, cls) { - if (!classTest(cls).test(node.className)) node.className += " " + cls; - } - function joinClasses(a, b) { - var as = a.split(" "); - for (var i = 0; i < as.length; i++) - if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i]; - return b; - } - - // WINDOW-WIDE EVENTS - - // These must be handled carefully, because naively registering a - // handler for each editor will cause the editors to never be - // garbage collected. - - function forEachCodeMirror(f) { - if (!document.body.getElementsByClassName) return; - var byClass = document.body.getElementsByClassName("CodeMirror"); - for (var i = 0; i < byClass.length; i++) { - var cm = byClass[i].CodeMirror; - if (cm) f(cm); - } - } - - var globalsRegistered = false; - function ensureGlobalHandlers() { - if (globalsRegistered) return; - registerGlobalHandlers(); - globalsRegistered = true; - } - function registerGlobalHandlers() { - // When the window resizes, we need to refresh active editors. - var resizeTimer; - on(window, "resize", function() { - if (resizeTimer == null) resizeTimer = setTimeout(function() { - resizeTimer = null; - knownScrollbarWidth = null; - forEachCodeMirror(onResize); - }, 100); - }); - // When the window loses focus, we want to show the editor as blurred - on(window, "blur", function() { - forEachCodeMirror(onBlur); - }); - } - - // FEATURE DETECTION - - // Detect drag-and-drop - var dragAndDrop = function() { - // There is *some* kind of drag-and-drop support in IE6-8, but I - // couldn't get it to work yet. - if (ie && ie_version < 9) return false; - var div = elt('div'); - return "draggable" in div || "dragDrop" in div; - }(); - - var knownScrollbarWidth; - function scrollbarWidth(measure) { - if (knownScrollbarWidth != null) return knownScrollbarWidth; - var test = elt("div", null, null, "width: 50px; height: 50px; overflow-x: scroll"); - removeChildrenAndAdd(measure, test); - if (test.offsetWidth) - knownScrollbarWidth = test.offsetHeight - test.clientHeight; - return knownScrollbarWidth || 0; - } - - var zwspSupported; - function zeroWidthElement(measure) { - if (zwspSupported == null) { - var test = elt("span", "\u200b"); - removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")])); - if (measure.firstChild.offsetHeight != 0) - zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8); - } - if (zwspSupported) return elt("span", "\u200b"); - else return elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px"); - } - - // Feature-detect IE's crummy client rect reporting for bidi text - var badBidiRects; - function hasBadBidiRects(measure) { - if (badBidiRects != null) return badBidiRects; - var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA")); - var r0 = range(txt, 0, 1).getBoundingClientRect(); - if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780) - var r1 = range(txt, 1, 2).getBoundingClientRect(); - return badBidiRects = (r1.right - r0.right < 3); - } - - // See if "".split is the broken IE version, if so, provide an - // alternative way to split lines. - var splitLines = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) { - var pos = 0, result = [], l = string.length; - while (pos <= l) { - var nl = string.indexOf("\n", pos); - if (nl == -1) nl = string.length; - var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl); - var rt = line.indexOf("\r"); - if (rt != -1) { - result.push(line.slice(0, rt)); - pos += rt + 1; - } else { - result.push(line); - pos = nl + 1; - } - } - return result; - } : function(string){return string.split(/\r\n?|\n/);}; - - var hasSelection = window.getSelection ? function(te) { - try { return te.selectionStart != te.selectionEnd; } - catch(e) { return false; } - } : function(te) { - try {var range = te.ownerDocument.selection.createRange();} - catch(e) {} - if (!range || range.parentElement() != te) return false; - return range.compareEndPoints("StartToEnd", range) != 0; - }; - - var hasCopyEvent = (function() { - var e = elt("div"); - if ("oncopy" in e) return true; - e.setAttribute("oncopy", "return;"); - return typeof e.oncopy == "function"; - })(); - - var badZoomedRects = null; - function hasBadZoomedRects(measure) { - if (badZoomedRects != null) return badZoomedRects; - var node = removeChildrenAndAdd(measure, elt("span", "x")); - var normal = node.getBoundingClientRect(); - var fromRange = range(node, 0, 1).getBoundingClientRect(); - return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1; - } - - // KEY NAMES - - var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt", - 19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End", - 36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert", - 46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod", 107: "=", 109: "-", 127: "Delete", - 173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\", - 221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete", - 63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"}; - CodeMirror.keyNames = keyNames; - (function() { - // Number keys - for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i); - // Alphabetic keys - for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i); - // Function keys - for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i; - })(); - - // BIDI HELPERS - - function iterateBidiSections(order, from, to, f) { - if (!order) return f(from, to, "ltr"); - var found = false; - for (var i = 0; i < order.length; ++i) { - var part = order[i]; - if (part.from < to && part.to > from || from == to && part.to == from) { - f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr"); - found = true; - } - } - if (!found) f(from, to, "ltr"); - } - - function bidiLeft(part) { return part.level % 2 ? part.to : part.from; } - function bidiRight(part) { return part.level % 2 ? part.from : part.to; } - - function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; } - function lineRight(line) { - var order = getOrder(line); - if (!order) return line.text.length; - return bidiRight(lst(order)); - } - - function lineStart(cm, lineN) { - var line = getLine(cm.doc, lineN); - var visual = visualLine(line); - if (visual != line) lineN = lineNo(visual); - var order = getOrder(visual); - var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual); - return Pos(lineN, ch); - } - function lineEnd(cm, lineN) { - var merged, line = getLine(cm.doc, lineN); - while (merged = collapsedSpanAtEnd(line)) { - line = merged.find(1, true).line; - lineN = null; - } - var order = getOrder(line); - var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line); - return Pos(lineN == null ? lineNo(line) : lineN, ch); - } - function lineStartSmart(cm, pos) { - var start = lineStart(cm, pos.line); - var line = getLine(cm.doc, start.line); - var order = getOrder(line); - if (!order || order[0].level == 0) { - var firstNonWS = Math.max(0, line.text.search(/\S/)); - var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch; - return Pos(start.line, inWS ? 0 : firstNonWS); - } - return start; - } - - function compareBidiLevel(order, a, b) { - var linedir = order[0].level; - if (a == linedir) return true; - if (b == linedir) return false; - return a < b; - } - var bidiOther; - function getBidiPartAt(order, pos) { - bidiOther = null; - for (var i = 0, found; i < order.length; ++i) { - var cur = order[i]; - if (cur.from < pos && cur.to > pos) return i; - if ((cur.from == pos || cur.to == pos)) { - if (found == null) { - found = i; - } else if (compareBidiLevel(order, cur.level, order[found].level)) { - if (cur.from != cur.to) bidiOther = found; - return i; - } else { - if (cur.from != cur.to) bidiOther = i; - return found; - } - } - } - return found; - } - - function moveInLine(line, pos, dir, byUnit) { - if (!byUnit) return pos + dir; - do pos += dir; - while (pos > 0 && isExtendingChar(line.text.charAt(pos))); - return pos; - } - - // This is needed in order to move 'visually' through bi-directional - // text -- i.e., pressing left should make the cursor go left, even - // when in RTL text. The tricky part is the 'jumps', where RTL and - // LTR text touch each other. This often requires the cursor offset - // to move more than one unit, in order to visually move one unit. - function moveVisually(line, start, dir, byUnit) { - var bidi = getOrder(line); - if (!bidi) return moveLogically(line, start, dir, byUnit); - var pos = getBidiPartAt(bidi, start), part = bidi[pos]; - var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit); - - for (;;) { - if (target > part.from && target < part.to) return target; - if (target == part.from || target == part.to) { - if (getBidiPartAt(bidi, target) == pos) return target; - part = bidi[pos += dir]; - return (dir > 0) == part.level % 2 ? part.to : part.from; - } else { - part = bidi[pos += dir]; - if (!part) return null; - if ((dir > 0) == part.level % 2) - target = moveInLine(line, part.to, -1, byUnit); - else - target = moveInLine(line, part.from, 1, byUnit); - } - } - } - - function moveLogically(line, start, dir, byUnit) { - var target = start + dir; - if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir; - return target < 0 || target > line.text.length ? null : target; - } - - // Bidirectional ordering algorithm - // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm - // that this (partially) implements. - - // One-char codes used for character types: - // L (L): Left-to-Right - // R (R): Right-to-Left - // r (AL): Right-to-Left Arabic - // 1 (EN): European Number - // + (ES): European Number Separator - // % (ET): European Number Terminator - // n (AN): Arabic Number - // , (CS): Common Number Separator - // m (NSM): Non-Spacing Mark - // b (BN): Boundary Neutral - // s (B): Paragraph Separator - // t (S): Segment Separator - // w (WS): Whitespace - // N (ON): Other Neutrals - - // Returns null if characters are ordered as they appear - // (left-to-right), or an array of sections ({from, to, level} - // objects) in the order in which they occur visually. - var bidiOrdering = (function() { - // Character types for codepoints 0 to 0xff - var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN"; - // Character types for codepoints 0x600 to 0x6ff - var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm"; - function charType(code) { - if (code <= 0xf7) return lowTypes.charAt(code); - else if (0x590 <= code && code <= 0x5f4) return "R"; - else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600); - else if (0x6ee <= code && code <= 0x8ac) return "r"; - else if (0x2000 <= code && code <= 0x200b) return "w"; - else if (code == 0x200c) return "b"; - else return "L"; - } - - var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/; - var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/; - // Browsers seem to always treat the boundaries of block elements as being L. - var outerType = "L"; - - function BidiSpan(level, from, to) { - this.level = level; - this.from = from; this.to = to; - } - - return function(str) { - if (!bidiRE.test(str)) return false; - var len = str.length, types = []; - for (var i = 0, type; i < len; ++i) - types.push(type = charType(str.charCodeAt(i))); - - // W1. Examine each non-spacing mark (NSM) in the level run, and - // change the type of the NSM to the type of the previous - // character. If the NSM is at the start of the level run, it will - // get the type of sor. - for (var i = 0, prev = outerType; i < len; ++i) { - var type = types[i]; - if (type == "m") types[i] = prev; - else prev = type; - } - - // W2. Search backwards from each instance of a European number - // until the first strong type (R, L, AL, or sor) is found. If an - // AL is found, change the type of the European number to Arabic - // number. - // W3. Change all ALs to R. - for (var i = 0, cur = outerType; i < len; ++i) { - var type = types[i]; - if (type == "1" && cur == "r") types[i] = "n"; - else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R"; } - } - - // W4. A single European separator between two European numbers - // changes to a European number. A single common separator between - // two numbers of the same type changes to that type. - for (var i = 1, prev = types[0]; i < len - 1; ++i) { - var type = types[i]; - if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1"; - else if (type == "," && prev == types[i+1] && - (prev == "1" || prev == "n")) types[i] = prev; - prev = type; - } - - // W5. A sequence of European terminators adjacent to European - // numbers changes to all European numbers. - // W6. Otherwise, separators and terminators change to Other - // Neutral. - for (var i = 0; i < len; ++i) { - var type = types[i]; - if (type == ",") types[i] = "N"; - else if (type == "%") { - for (var end = i + 1; end < len && types[end] == "%"; ++end) {} - var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N"; - for (var j = i; j < end; ++j) types[j] = replace; - i = end - 1; - } - } - - // W7. Search backwards from each instance of a European number - // until the first strong type (R, L, or sor) is found. If an L is - // found, then change the type of the European number to L. - for (var i = 0, cur = outerType; i < len; ++i) { - var type = types[i]; - if (cur == "L" && type == "1") types[i] = "L"; - else if (isStrong.test(type)) cur = type; - } - - // N1. A sequence of neutrals takes the direction of the - // surrounding strong text if the text on both sides has the same - // direction. European and Arabic numbers act as if they were R in - // terms of their influence on neutrals. Start-of-level-run (sor) - // and end-of-level-run (eor) are used at level run boundaries. - // N2. Any remaining neutrals take the embedding direction. - for (var i = 0; i < len; ++i) { - if (isNeutral.test(types[i])) { - for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {} - var before = (i ? types[i-1] : outerType) == "L"; - var after = (end < len ? types[end] : outerType) == "L"; - var replace = before || after ? "L" : "R"; - for (var j = i; j < end; ++j) types[j] = replace; - i = end - 1; - } - } - - // Here we depart from the documented algorithm, in order to avoid - // building up an actual levels array. Since there are only three - // levels (0, 1, 2) in an implementation that doesn't take - // explicit embedding into account, we can build up the order on - // the fly, without following the level-based algorithm. - var order = [], m; - for (var i = 0; i < len;) { - if (countsAsLeft.test(types[i])) { - var start = i; - for (++i; i < len && countsAsLeft.test(types[i]); ++i) {} - order.push(new BidiSpan(0, start, i)); - } else { - var pos = i, at = order.length; - for (++i; i < len && types[i] != "L"; ++i) {} - for (var j = pos; j < i;) { - if (countsAsNum.test(types[j])) { - if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j)); - var nstart = j; - for (++j; j < i && countsAsNum.test(types[j]); ++j) {} - order.splice(at, 0, new BidiSpan(2, nstart, j)); - pos = j; - } else ++j; - } - if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i)); - } - } - if (order[0].level == 1 && (m = str.match(/^\s+/))) { - order[0].from = m[0].length; - order.unshift(new BidiSpan(0, 0, m[0].length)); - } - if (lst(order).level == 1 && (m = str.match(/\s+$/))) { - lst(order).to -= m[0].length; - order.push(new BidiSpan(0, len - m[0].length, len)); - } - if (order[0].level != lst(order).level) - order.push(new BidiSpan(order[0].level, len, len)); - - return order; - }; - })(); - - // THE END - - CodeMirror.version = "4.7.0"; - - return CodeMirror; -}); diff --git a/kallithea/public/codemirror/mode/apl/apl.js b/kallithea/public/codemirror/mode/apl/apl.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/apl/apl.js +++ /dev/null @@ -1,175 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("apl", function() { - var builtInOps = { - ".": "innerProduct", - "\\": "scan", - "/": "reduce", - "⌿": "reduce1Axis", - "⍀": "scan1Axis", - "¨": "each", - "⍣": "power" - }; - var builtInFuncs = { - "+": ["conjugate", "add"], - "−": ["negate", "subtract"], - "×": ["signOf", "multiply"], - "÷": ["reciprocal", "divide"], - "⌈": ["ceiling", "greaterOf"], - "⌊": ["floor", "lesserOf"], - "∣": ["absolute", "residue"], - "⍳": ["indexGenerate", "indexOf"], - "?": ["roll", "deal"], - "⋆": ["exponentiate", "toThePowerOf"], - "⍟": ["naturalLog", "logToTheBase"], - "○": ["piTimes", "circularFuncs"], - "!": ["factorial", "binomial"], - "⌹": ["matrixInverse", "matrixDivide"], - "<": [null, "lessThan"], - "≤": [null, "lessThanOrEqual"], - "=": [null, "equals"], - ">": [null, "greaterThan"], - "≥": [null, "greaterThanOrEqual"], - "≠": [null, "notEqual"], - "≡": ["depth", "match"], - "≢": [null, "notMatch"], - "∈": ["enlist", "membership"], - "⍷": [null, "find"], - "∪": ["unique", "union"], - "∩": [null, "intersection"], - "∼": ["not", "without"], - "∨": [null, "or"], - "∧": [null, "and"], - "⍱": [null, "nor"], - "⍲": [null, "nand"], - "⍴": ["shapeOf", "reshape"], - ",": ["ravel", "catenate"], - "⍪": [null, "firstAxisCatenate"], - "⌽": ["reverse", "rotate"], - "⊖": ["axis1Reverse", "axis1Rotate"], - "⍉": ["transpose", null], - "↑": ["first", "take"], - "↓": [null, "drop"], - "⊂": ["enclose", "partitionWithAxis"], - "⊃": ["diclose", "pick"], - "⌷": [null, "index"], - "⍋": ["gradeUp", null], - "⍒": ["gradeDown", null], - "⊤": ["encode", null], - "⊥": ["decode", null], - "⍕": ["format", "formatByExample"], - "⍎": ["execute", null], - "⊣": ["stop", "left"], - "⊢": ["pass", "right"] - }; - - var isOperator = /[\.\/⌿⍀¨⍣]/; - var isNiladic = /⍬/; - var isFunction = /[\+−×÷⌈⌊∣⍳\?⋆⍟○!⌹<≤=>≥≠≡≢∈⍷∪∩∼∨∧⍱⍲⍴,⍪⌽⊖⍉↑↓⊂⊃⌷⍋⍒⊤⊥⍕⍎⊣⊢]/; - var isArrow = /←/; - var isComment = /[⍝#].*$/; - - var stringEater = function(type) { - var prev; - prev = false; - return function(c) { - prev = c; - if (c === type) { - return prev === "\\"; - } - return true; - }; - }; - return { - startState: function() { - return { - prev: false, - func: false, - op: false, - string: false, - escape: false - }; - }, - token: function(stream, state) { - var ch, funcName, word; - if (stream.eatSpace()) { - return null; - } - ch = stream.next(); - if (ch === '"' || ch === "'") { - stream.eatWhile(stringEater(ch)); - stream.next(); - state.prev = true; - return "string"; - } - if (/[\[{\(]/.test(ch)) { - state.prev = false; - return null; - } - if (/[\]}\)]/.test(ch)) { - state.prev = true; - return null; - } - if (isNiladic.test(ch)) { - state.prev = false; - return "niladic"; - } - if (/[¯\d]/.test(ch)) { - if (state.func) { - state.func = false; - state.prev = false; - } else { - state.prev = true; - } - stream.eatWhile(/[\w\.]/); - return "number"; - } - if (isOperator.test(ch)) { - return "operator apl-" + builtInOps[ch]; - } - if (isArrow.test(ch)) { - return "apl-arrow"; - } - if (isFunction.test(ch)) { - funcName = "apl-"; - if (builtInFuncs[ch] != null) { - if (state.prev) { - funcName += builtInFuncs[ch][1]; - } else { - funcName += builtInFuncs[ch][0]; - } - } - state.func = true; - state.prev = false; - return "function " + funcName; - } - if (isComment.test(ch)) { - stream.skipToEnd(); - return "comment"; - } - if (ch === "∘" && stream.peek() === ".") { - stream.next(); - return "function jot-dot"; - } - stream.eatWhile(/[\w\$_]/); - word = stream.current(); - state.prev = true; - return "keyword"; - } - }; -}); - -CodeMirror.defineMIME("text/apl", "apl"); - -}); diff --git a/kallithea/public/codemirror/mode/asterisk/asterisk.js b/kallithea/public/codemirror/mode/asterisk/asterisk.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/asterisk/asterisk.js +++ /dev/null @@ -1,198 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/* - * ===================================================================================== - * - * Filename: mode/asterisk/asterisk.js - * - * Description: CodeMirror mode for Asterisk dialplan - * - * Created: 05/17/2012 09:20:25 PM - * Revision: none - * - * Author: Stas Kobzar (stas@modulis.ca), - * Company: Modulis.ca Inc. - * - * ===================================================================================== - */ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("asterisk", function() { - var atoms = ["exten", "same", "include","ignorepat","switch"], - dpcmd = ["#include","#exec"], - apps = [ - "addqueuemember","adsiprog","aelsub","agentlogin","agentmonitoroutgoing","agi", - "alarmreceiver","amd","answer","authenticate","background","backgrounddetect", - "bridge","busy","callcompletioncancel","callcompletionrequest","celgenuserevent", - "changemonitor","chanisavail","channelredirect","chanspy","clearhash","confbridge", - "congestion","continuewhile","controlplayback","dahdiacceptr2call","dahdibarge", - "dahdiras","dahdiscan","dahdisendcallreroutingfacility","dahdisendkeypadfacility", - "datetime","dbdel","dbdeltree","deadagi","dial","dictate","directory","disa", - "dumpchan","eagi","echo","endwhile","exec","execif","execiftime","exitwhile","extenspy", - "externalivr","festival","flash","followme","forkcdr","getcpeid","gosub","gosubif", - "goto","gotoif","gotoiftime","hangup","iax2provision","ices","importvar","incomplete", - "ivrdemo","jabberjoin","jabberleave","jabbersend","jabbersendgroup","jabberstatus", - "jack","log","macro","macroexclusive","macroexit","macroif","mailboxexists","meetme", - "meetmeadmin","meetmechanneladmin","meetmecount","milliwatt","minivmaccmess","minivmdelete", - "minivmgreet","minivmmwi","minivmnotify","minivmrecord","mixmonitor","monitor","morsecode", - "mp3player","mset","musiconhold","nbscat","nocdr","noop","odbc","odbc","odbcfinish", - "originate","ospauth","ospfinish","osplookup","ospnext","page","park","parkandannounce", - "parkedcall","pausemonitor","pausequeuemember","pickup","pickupchan","playback","playtones", - "privacymanager","proceeding","progress","queue","queuelog","raiseexception","read","readexten", - "readfile","receivefax","receivefax","receivefax","record","removequeuemember", - "resetcdr","retrydial","return","ringing","sayalpha","saycountedadj","saycountednoun", - "saycountpl","saydigits","saynumber","sayphonetic","sayunixtime","senddtmf","sendfax", - "sendfax","sendfax","sendimage","sendtext","sendurl","set","setamaflags", - "setcallerpres","setmusiconhold","sipaddheader","sipdtmfmode","sipremoveheader","skel", - "slastation","slatrunk","sms","softhangup","speechactivategrammar","speechbackground", - "speechcreate","speechdeactivategrammar","speechdestroy","speechloadgrammar","speechprocessingsound", - "speechstart","speechunloadgrammar","stackpop","startmusiconhold","stopmixmonitor","stopmonitor", - "stopmusiconhold","stopplaytones","system","testclient","testserver","transfer","tryexec", - "trysystem","unpausemonitor","unpausequeuemember","userevent","verbose","vmauthenticate", - "vmsayname","voicemail","voicemailmain","wait","waitexten","waitfornoise","waitforring", - "waitforsilence","waitmusiconhold","waituntil","while","zapateller" - ]; - - function basicToken(stream,state){ - var cur = ''; - var ch = ''; - ch = stream.next(); - // comment - if(ch == ";") { - stream.skipToEnd(); - return "comment"; - } - // context - if(ch == '[') { - stream.skipTo(']'); - stream.eat(']'); - return "header"; - } - // string - if(ch == '"') { - stream.skipTo('"'); - return "string"; - } - if(ch == "'") { - stream.skipTo("'"); - return "string-2"; - } - // dialplan commands - if(ch == '#') { - stream.eatWhile(/\w/); - cur = stream.current(); - if(dpcmd.indexOf(cur) !== -1) { - stream.skipToEnd(); - return "strong"; - } - } - // application args - if(ch == '$'){ - var ch1 = stream.peek(); - if(ch1 == '{'){ - stream.skipTo('}'); - stream.eat('}'); - return "variable-3"; - } - } - // extension - stream.eatWhile(/\w/); - cur = stream.current(); - if(atoms.indexOf(cur) !== -1) { - state.extenStart = true; - switch(cur) { - case 'same': state.extenSame = true; break; - case 'include': - case 'switch': - case 'ignorepat': - state.extenInclude = true;break; - default:break; - } - return "atom"; - } - } - - return { - startState: function() { - return { - extenStart: false, - extenSame: false, - extenInclude: false, - extenExten: false, - extenPriority: false, - extenApplication: false - }; - }, - token: function(stream, state) { - - var cur = ''; - var ch = ''; - if(stream.eatSpace()) return null; - // extension started - if(state.extenStart){ - stream.eatWhile(/[^\s]/); - cur = stream.current(); - if(/^=>?$/.test(cur)){ - state.extenExten = true; - state.extenStart = false; - return "strong"; - } else { - state.extenStart = false; - stream.skipToEnd(); - return "error"; - } - } else if(state.extenExten) { - // set exten and priority - state.extenExten = false; - state.extenPriority = true; - stream.eatWhile(/[^,]/); - if(state.extenInclude) { - stream.skipToEnd(); - state.extenPriority = false; - state.extenInclude = false; - } - if(state.extenSame) { - state.extenPriority = false; - state.extenSame = false; - state.extenApplication = true; - } - return "tag"; - } else if(state.extenPriority) { - state.extenPriority = false; - state.extenApplication = true; - ch = stream.next(); // get comma - if(state.extenSame) return null; - stream.eatWhile(/[^,]/); - return "number"; - } else if(state.extenApplication) { - stream.eatWhile(/,/); - cur = stream.current(); - if(cur === ',') return null; - stream.eatWhile(/\w/); - cur = stream.current().toLowerCase(); - state.extenApplication = false; - if(apps.indexOf(cur) !== -1){ - return "def strong"; - } - } else{ - return basicToken(stream,state); - } - - return null; - } - }; -}); - -CodeMirror.defineMIME("text/x-asterisk", "asterisk"); - -}); diff --git a/kallithea/public/codemirror/mode/clike/clike.js b/kallithea/public/codemirror/mode/clike/clike.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/clike/clike.js +++ /dev/null @@ -1,474 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("clike", function(config, parserConfig) { - var indentUnit = config.indentUnit, - statementIndentUnit = parserConfig.statementIndentUnit || indentUnit, - dontAlignCalls = parserConfig.dontAlignCalls, - keywords = parserConfig.keywords || {}, - builtin = parserConfig.builtin || {}, - blockKeywords = parserConfig.blockKeywords || {}, - atoms = parserConfig.atoms || {}, - hooks = parserConfig.hooks || {}, - multiLineStrings = parserConfig.multiLineStrings, - indentStatements = parserConfig.indentStatements !== false; - var isOperatorChar = /[+\-*&%=<>!?|\/]/; - - var curPunc; - - function tokenBase(stream, state) { - var ch = stream.next(); - if (hooks[ch]) { - var result = hooks[ch](stream, state); - if (result !== false) return result; - } - if (ch == '"' || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } - if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - curPunc = ch; - return null; - } - if (/\d/.test(ch)) { - stream.eatWhile(/[\w\.]/); - return "number"; - } - if (ch == "/") { - if (stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } - if (stream.eat("/")) { - stream.skipToEnd(); - return "comment"; - } - } - if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return "operator"; - } - stream.eatWhile(/[\w\$_\xa1-\uffff]/); - var cur = stream.current(); - if (keywords.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "keyword"; - } - if (builtin.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "builtin"; - } - if (atoms.propertyIsEnumerable(cur)) return "atom"; - return "variable"; - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next, end = false; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) {end = true; break;} - escaped = !escaped && next == "\\"; - } - if (end || !(escaped || multiLineStrings)) - state.tokenize = null; - return "string"; - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = null; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function Context(indented, column, type, align, prev) { - this.indented = indented; - this.column = column; - this.type = type; - this.align = align; - this.prev = prev; - } - function pushContext(state, col, type) { - var indent = state.indented; - if (state.context && state.context.type == "statement") - indent = state.context.indented; - return state.context = new Context(indent, col, type, null, state.context); - } - function popContext(state) { - var t = state.context.type; - if (t == ")" || t == "]" || t == "}") - state.indented = state.context.indented; - return state.context = state.context.prev; - } - - // Interface - - return { - startState: function(basecolumn) { - return { - tokenize: null, - context: new Context((basecolumn || 0) - indentUnit, 0, "top", false), - indented: 0, - startOfLine: true - }; - }, - - token: function(stream, state) { - var ctx = state.context; - if (stream.sol()) { - if (ctx.align == null) ctx.align = false; - state.indented = stream.indentation(); - state.startOfLine = true; - } - if (stream.eatSpace()) return null; - curPunc = null; - var style = (state.tokenize || tokenBase)(stream, state); - if (style == "comment" || style == "meta") return style; - if (ctx.align == null) ctx.align = true; - - if ((curPunc == ";" || curPunc == ":" || curPunc == ",") && ctx.type == "statement") popContext(state); - else if (curPunc == "{") pushContext(state, stream.column(), "}"); - else if (curPunc == "[") pushContext(state, stream.column(), "]"); - else if (curPunc == "(") pushContext(state, stream.column(), ")"); - else if (curPunc == "}") { - while (ctx.type == "statement") ctx = popContext(state); - if (ctx.type == "}") ctx = popContext(state); - while (ctx.type == "statement") ctx = popContext(state); - } - else if (curPunc == ctx.type) popContext(state); - else if (indentStatements && - (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') || - (ctx.type == "statement" && curPunc == "newstatement"))) - pushContext(state, stream.column(), "statement"); - state.startOfLine = false; - return style; - }, - - indent: function(state, textAfter) { - if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass; - var ctx = state.context, firstChar = textAfter && textAfter.charAt(0); - if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev; - var closing = firstChar == ctx.type; - if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit); - else if (ctx.align && (!dontAlignCalls || ctx.type != ")")) return ctx.column + (closing ? 0 : 1); - else if (ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit; - else return ctx.indented + (closing ? 0 : indentUnit); - }, - - electricChars: "{}", - blockCommentStart: "/*", - blockCommentEnd: "*/", - lineComment: "//", - fold: "brace" - }; -}); - - function words(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - var cKeywords = "auto if break int case long char register continue return default short do sizeof " + - "double static else struct entry switch extern typedef float union for unsigned " + - "goto while enum void const signed volatile"; - - function cppHook(stream, state) { - if (!state.startOfLine) return false; - for (;;) { - if (stream.skipTo("\\")) { - stream.next(); - if (stream.eol()) { - state.tokenize = cppHook; - break; - } - } else { - stream.skipToEnd(); - state.tokenize = null; - break; - } - } - return "meta"; - } - - function cpp11StringHook(stream, state) { - stream.backUp(1); - // Raw strings. - if (stream.match(/(R|u8R|uR|UR|LR)/)) { - var match = stream.match(/"([^\s\\()]{0,16})\(/); - if (!match) { - return false; - } - state.cpp11RawStringDelim = match[1]; - state.tokenize = tokenRawString; - return tokenRawString(stream, state); - } - // Unicode strings/chars. - if (stream.match(/(u8|u|U|L)/)) { - if (stream.match(/["']/, /* eat */ false)) { - return "string"; - } - return false; - } - // Ignore this hook. - stream.next(); - return false; - } - - // C#-style strings where "" escapes a quote. - function tokenAtString(stream, state) { - var next; - while ((next = stream.next()) != null) { - if (next == '"' && !stream.eat('"')) { - state.tokenize = null; - break; - } - } - return "string"; - } - - // C++11 raw string literal is "( anything )", where - // can be a string up to 16 characters long. - function tokenRawString(stream, state) { - // Escape characters that have special regex meanings. - var delim = state.cpp11RawStringDelim.replace(/[^\w\s]/g, '\\$&'); - var match = stream.match(new RegExp(".*?\\)" + delim + '"')); - if (match) - state.tokenize = null; - else - stream.skipToEnd(); - return "string"; - } - - function def(mimes, mode) { - if (typeof mimes == "string") mimes = [mimes]; - var words = []; - function add(obj) { - if (obj) for (var prop in obj) if (obj.hasOwnProperty(prop)) - words.push(prop); - } - add(mode.keywords); - add(mode.builtin); - add(mode.atoms); - if (words.length) { - mode.helperType = mimes[0]; - CodeMirror.registerHelper("hintWords", mimes[0], words); - } - - for (var i = 0; i < mimes.length; ++i) - CodeMirror.defineMIME(mimes[i], mode); - } - - def(["text/x-csrc", "text/x-c", "text/x-chdr"], { - name: "clike", - keywords: words(cKeywords), - blockKeywords: words("case do else for if switch while struct"), - atoms: words("null"), - hooks: {"#": cppHook}, - modeProps: {fold: ["brace", "include"]} - }); - - def(["text/x-c++src", "text/x-c++hdr"], { - name: "clike", - keywords: words(cKeywords + " asm dynamic_cast namespace reinterpret_cast try bool explicit new " + - "static_cast typeid catch operator template typename class friend private " + - "this using const_cast inline public throw virtual delete mutable protected " + - "wchar_t alignas alignof constexpr decltype nullptr noexcept thread_local final " + - "static_assert override"), - blockKeywords: words("catch class do else finally for if struct switch try while"), - atoms: words("true false null"), - hooks: { - "#": cppHook, - "u": cpp11StringHook, - "U": cpp11StringHook, - "L": cpp11StringHook, - "R": cpp11StringHook - }, - modeProps: {fold: ["brace", "include"]} - }); - - def("text/x-java", { - name: "clike", - keywords: words("abstract assert boolean break byte case catch char class const continue default " + - "do double else enum extends final finally float for goto if implements import " + - "instanceof int interface long native new package private protected public " + - "return short static strictfp super switch synchronized this throw throws transient " + - "try void volatile while"), - blockKeywords: words("catch class do else finally for if switch try while"), - atoms: words("true false null"), - hooks: { - "@": function(stream) { - stream.eatWhile(/[\w\$_]/); - return "meta"; - } - }, - modeProps: {fold: ["brace", "import"]} - }); - - def("text/x-csharp", { - name: "clike", - keywords: words("abstract as base break case catch checked class const continue" + - " default delegate do else enum event explicit extern finally fixed for" + - " foreach goto if implicit in interface internal is lock namespace new" + - " operator out override params private protected public readonly ref return sealed" + - " sizeof stackalloc static struct switch this throw try typeof unchecked" + - " unsafe using virtual void volatile while add alias ascending descending dynamic from get" + - " global group into join let orderby partial remove select set value var yield"), - blockKeywords: words("catch class do else finally for foreach if struct switch try while"), - builtin: words("Boolean Byte Char DateTime DateTimeOffset Decimal Double" + - " Guid Int16 Int32 Int64 Object SByte Single String TimeSpan UInt16 UInt32" + - " UInt64 bool byte char decimal double short int long object" + - " sbyte float string ushort uint ulong"), - atoms: words("true false null"), - hooks: { - "@": function(stream, state) { - if (stream.eat('"')) { - state.tokenize = tokenAtString; - return tokenAtString(stream, state); - } - stream.eatWhile(/[\w\$_]/); - return "meta"; - } - } - }); - - function tokenTripleString(stream, state) { - var escaped = false; - while (!stream.eol()) { - if (!escaped && stream.match('"""')) { - state.tokenize = null; - break; - } - escaped = stream.next() != "\\" && !escaped; - } - return "string"; - } - - def("text/x-scala", { - name: "clike", - keywords: words( - - /* scala */ - "abstract case catch class def do else extends false final finally for forSome if " + - "implicit import lazy match new null object override package private protected return " + - "sealed super this throw trait try trye type val var while with yield _ : = => <- <: " + - "<% >: # @ " + - - /* package scala */ - "assert assume require print println printf readLine readBoolean readByte readShort " + - "readChar readInt readLong readFloat readDouble " + - - "AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either " + - "Enumeration Equiv Error Exception Fractional Function IndexedSeq Integral Iterable " + - "Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering " + - "Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder " + - "StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector :: #:: " + - - /* package java.lang */ - "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " + - "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " + - "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " + - "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void" - ), - multiLineStrings: true, - blockKeywords: words("catch class do else finally for forSome if match switch try while"), - atoms: words("true false null"), - indentStatements: false, - hooks: { - "@": function(stream) { - stream.eatWhile(/[\w\$_]/); - return "meta"; - }, - '"': function(stream, state) { - if (!stream.match('""')) return false; - state.tokenize = tokenTripleString; - return state.tokenize(stream, state); - } - } - }); - - def(["x-shader/x-vertex", "x-shader/x-fragment"], { - name: "clike", - keywords: words("float int bool void " + - "vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 " + - "mat2 mat3 mat4 " + - "sampler1D sampler2D sampler3D samplerCube " + - "sampler1DShadow sampler2DShadow" + - "const attribute uniform varying " + - "break continue discard return " + - "for while do if else struct " + - "in out inout"), - blockKeywords: words("for while do if else struct"), - builtin: words("radians degrees sin cos tan asin acos atan " + - "pow exp log exp2 sqrt inversesqrt " + - "abs sign floor ceil fract mod min max clamp mix step smootstep " + - "length distance dot cross normalize ftransform faceforward " + - "reflect refract matrixCompMult " + - "lessThan lessThanEqual greaterThan greaterThanEqual " + - "equal notEqual any all not " + - "texture1D texture1DProj texture1DLod texture1DProjLod " + - "texture2D texture2DProj texture2DLod texture2DProjLod " + - "texture3D texture3DProj texture3DLod texture3DProjLod " + - "textureCube textureCubeLod " + - "shadow1D shadow2D shadow1DProj shadow2DProj " + - "shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod " + - "dFdx dFdy fwidth " + - "noise1 noise2 noise3 noise4"), - atoms: words("true false " + - "gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex " + - "gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 " + - "gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 " + - "gl_FogCoord " + - "gl_Position gl_PointSize gl_ClipVertex " + - "gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor " + - "gl_TexCoord gl_FogFragCoord " + - "gl_FragCoord gl_FrontFacing " + - "gl_FragColor gl_FragData gl_FragDepth " + - "gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix " + - "gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse " + - "gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse " + - "gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose " + - "gl_ProjectionMatrixInverseTranspose " + - "gl_ModelViewProjectionMatrixInverseTranspose " + - "gl_TextureMatrixInverseTranspose " + - "gl_NormalScale gl_DepthRange gl_ClipPlane " + - "gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel " + - "gl_FrontLightModelProduct gl_BackLightModelProduct " + - "gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ " + - "gl_FogParameters " + - "gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords " + - "gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats " + - "gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits " + - "gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits " + - "gl_MaxDrawBuffers"), - hooks: {"#": cppHook}, - modeProps: {fold: ["brace", "include"]} - }); - - def("text/x-nesc", { - name: "clike", - keywords: words(cKeywords + "as atomic async call command component components configuration event generic " + - "implementation includes interface module new norace nx_struct nx_union post provides " + - "signal task uses abstract extends"), - blockKeywords: words("case do else for if switch while struct"), - atoms: words("null"), - hooks: {"#": cppHook}, - modeProps: {fold: ["brace", "include"]} - }); - -}); diff --git a/kallithea/public/codemirror/mode/clojure/clojure.js b/kallithea/public/codemirror/mode/clojure/clojure.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/clojure/clojure.js +++ /dev/null @@ -1,243 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/** - * Author: Hans Engel - * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun) - */ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("clojure", function (options) { - var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2", - ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword", VAR = "variable"; - var INDENT_WORD_SKIP = options.indentUnit || 2; - var NORMAL_INDENT_UNIT = options.indentUnit || 2; - - function makeKeywords(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - var atoms = makeKeywords("true false nil"); - - var keywords = makeKeywords( - "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars binding gen-class gen-and-load-class gen-and-save-class handler-case handle"); - - var builtins = makeKeywords( - "* *' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *compiler-options* *data-readers* *e *err* *file* *flush-on-newline* *fn-loader* *in* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> ->> ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE accessor aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* bound? butlast byte byte-array bytes case cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? declare default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash hash-combine hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc inc' init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep keep-indexed key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext nthrest num number? numerator object-array odd? or parents partial partition partition-all partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int rand-nth range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string realized? reduce reduce-kv reductions ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? seque sequence sequential? set set-error-handler! set-error-mode! set-validator! set? short short-array shorts shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap *default-data-reader-fn* as-> cond-> cond->> reduced reduced? send-via set-agent-send-executor! set-agent-send-off-executor! some-> some->>"); - - var indentKeys = makeKeywords( - // Built-ins - "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type try catch " + - - // Binding forms - "let letfn binding loop for doseq dotimes when-let if-let " + - - // Data structures - "defstruct struct-map assoc " + - - // clojure.test - "testing deftest " + - - // contrib - "handler-case handle dotrace deftrace"); - - var tests = { - digit: /\d/, - digit_or_colon: /[\d:]/, - hex: /[0-9a-f]/i, - sign: /[+-]/, - exponent: /e/i, - keyword_char: /[^\s\(\[\;\)\]]/, - symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/ - }; - - function stateStack(indent, type, prev) { // represents a state stack object - this.indent = indent; - this.type = type; - this.prev = prev; - } - - function pushStack(state, indent, type) { - state.indentStack = new stateStack(indent, type, state.indentStack); - } - - function popStack(state) { - state.indentStack = state.indentStack.prev; - } - - function isNumber(ch, stream){ - // hex - if ( ch === '0' && stream.eat(/x/i) ) { - stream.eatWhile(tests.hex); - return true; - } - - // leading sign - if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) { - stream.eat(tests.sign); - ch = stream.next(); - } - - if ( tests.digit.test(ch) ) { - stream.eat(ch); - stream.eatWhile(tests.digit); - - if ( '.' == stream.peek() ) { - stream.eat('.'); - stream.eatWhile(tests.digit); - } - - if ( stream.eat(tests.exponent) ) { - stream.eat(tests.sign); - stream.eatWhile(tests.digit); - } - - return true; - } - - return false; - } - - // Eat character that starts after backslash \ - function eatCharacter(stream) { - var first = stream.next(); - // Read special literals: backspace, newline, space, return. - // Just read all lowercase letters. - if (first && first.match(/[a-z]/) && stream.match(/[a-z]+/, true)) { - return; - } - // Read unicode character: \u1000 \uA0a1 - if (first === "u") { - stream.match(/[0-9a-z]{4}/i, true); - } - } - - return { - startState: function () { - return { - indentStack: null, - indentation: 0, - mode: false - }; - }, - - token: function (stream, state) { - if (state.indentStack == null && stream.sol()) { - // update indentation, but only if indentStack is empty - state.indentation = stream.indentation(); - } - - // skip spaces - if (stream.eatSpace()) { - return null; - } - var returnType = null; - - switch(state.mode){ - case "string": // multi-line string parsing mode - var next, escaped = false; - while ((next = stream.next()) != null) { - if (next == "\"" && !escaped) { - - state.mode = false; - break; - } - escaped = !escaped && next == "\\"; - } - returnType = STRING; // continue on in string mode - break; - default: // default parsing mode - var ch = stream.next(); - - if (ch == "\"") { - state.mode = "string"; - returnType = STRING; - } else if (ch == "\\") { - eatCharacter(stream); - returnType = CHARACTER; - } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) { - returnType = ATOM; - } else if (ch == ";") { // comment - stream.skipToEnd(); // rest of the line is a comment - returnType = COMMENT; - } else if (isNumber(ch,stream)){ - returnType = NUMBER; - } else if (ch == "(" || ch == "[" || ch == "{" ) { - var keyWord = '', indentTemp = stream.column(), letter; - /** - Either - (indent-word .. - (non-indent-word .. - (;something else, bracket, etc. - */ - - if (ch == "(") while ((letter = stream.eat(tests.keyword_char)) != null) { - keyWord += letter; - } - - if (keyWord.length > 0 && (indentKeys.propertyIsEnumerable(keyWord) || - /^(?:def|with)/.test(keyWord))) { // indent-word - pushStack(state, indentTemp + INDENT_WORD_SKIP, ch); - } else { // non-indent word - // we continue eating the spaces - stream.eatSpace(); - if (stream.eol() || stream.peek() == ";") { - // nothing significant after - // we restart indentation the user defined spaces after - pushStack(state, indentTemp + NORMAL_INDENT_UNIT, ch); - } else { - pushStack(state, indentTemp + stream.current().length, ch); // else we match - } - } - stream.backUp(stream.current().length - 1); // undo all the eating - - returnType = BRACKET; - } else if (ch == ")" || ch == "]" || ch == "}") { - returnType = BRACKET; - if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : (ch == "]" ? "[" :"{"))) { - popStack(state); - } - } else if ( ch == ":" ) { - stream.eatWhile(tests.symbol); - return ATOM; - } else { - stream.eatWhile(tests.symbol); - - if (keywords && keywords.propertyIsEnumerable(stream.current())) { - returnType = KEYWORD; - } else if (builtins && builtins.propertyIsEnumerable(stream.current())) { - returnType = BUILTIN; - } else if (atoms && atoms.propertyIsEnumerable(stream.current())) { - returnType = ATOM; - } else { - returnType = VAR; - } - } - } - - return returnType; - }, - - indent: function (state) { - if (state.indentStack == null) return state.indentation; - return state.indentStack.indent; - }, - - lineComment: ";;" - }; -}); - -CodeMirror.defineMIME("text/x-clojure", "clojure"); - -}); diff --git a/kallithea/public/codemirror/mode/cobol/cobol.js b/kallithea/public/codemirror/mode/cobol/cobol.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/cobol/cobol.js +++ /dev/null @@ -1,255 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/** - * Author: Gautam Mehta - * Branched from CodeMirror's Scheme mode - */ -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("cobol", function () { - var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", - ATOM = "atom", NUMBER = "number", KEYWORD = "keyword", MODTAG = "header", - COBOLLINENUM = "def", PERIOD = "link"; - function makeKeywords(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - var atoms = makeKeywords("TRUE FALSE ZEROES ZEROS ZERO SPACES SPACE LOW-VALUE LOW-VALUES "); - var keywords = makeKeywords( - "ACCEPT ACCESS ACQUIRE ADD ADDRESS " + - "ADVANCING AFTER ALIAS ALL ALPHABET " + - "ALPHABETIC ALPHABETIC-LOWER ALPHABETIC-UPPER ALPHANUMERIC ALPHANUMERIC-EDITED " + - "ALSO ALTER ALTERNATE AND ANY " + - "ARE AREA AREAS ARITHMETIC ASCENDING " + - "ASSIGN AT ATTRIBUTE AUTHOR AUTO " + - "AUTO-SKIP AUTOMATIC B-AND B-EXOR B-LESS " + - "B-NOT B-OR BACKGROUND-COLOR BACKGROUND-COLOUR BEEP " + - "BEFORE BELL BINARY BIT BITS " + - "BLANK BLINK BLOCK BOOLEAN BOTTOM " + - "BY CALL CANCEL CD CF " + - "CH CHARACTER CHARACTERS CLASS CLOCK-UNITS " + - "CLOSE COBOL CODE CODE-SET COL " + - "COLLATING COLUMN COMMA COMMIT COMMITMENT " + - "COMMON COMMUNICATION COMP COMP-0 COMP-1 " + - "COMP-2 COMP-3 COMP-4 COMP-5 COMP-6 " + - "COMP-7 COMP-8 COMP-9 COMPUTATIONAL COMPUTATIONAL-0 " + - "COMPUTATIONAL-1 COMPUTATIONAL-2 COMPUTATIONAL-3 COMPUTATIONAL-4 COMPUTATIONAL-5 " + - "COMPUTATIONAL-6 COMPUTATIONAL-7 COMPUTATIONAL-8 COMPUTATIONAL-9 COMPUTE " + - "CONFIGURATION CONNECT CONSOLE CONTAINED CONTAINS " + - "CONTENT CONTINUE CONTROL CONTROL-AREA CONTROLS " + - "CONVERTING COPY CORR CORRESPONDING COUNT " + - "CRT CRT-UNDER CURRENCY CURRENT CURSOR " + - "DATA DATE DATE-COMPILED DATE-WRITTEN DAY " + - "DAY-OF-WEEK DB DB-ACCESS-CONTROL-KEY DB-DATA-NAME DB-EXCEPTION " + - "DB-FORMAT-NAME DB-RECORD-NAME DB-SET-NAME DB-STATUS DBCS " + - "DBCS-EDITED DE DEBUG-CONTENTS DEBUG-ITEM DEBUG-LINE " + - "DEBUG-NAME DEBUG-SUB-1 DEBUG-SUB-2 DEBUG-SUB-3 DEBUGGING " + - "DECIMAL-POINT DECLARATIVES DEFAULT DELETE DELIMITED " + - "DELIMITER DEPENDING DESCENDING DESCRIBED DESTINATION " + - "DETAIL DISABLE DISCONNECT DISPLAY DISPLAY-1 " + - "DISPLAY-2 DISPLAY-3 DISPLAY-4 DISPLAY-5 DISPLAY-6 " + - "DISPLAY-7 DISPLAY-8 DISPLAY-9 DIVIDE DIVISION " + - "DOWN DROP DUPLICATE DUPLICATES DYNAMIC " + - "EBCDIC EGI EJECT ELSE EMI " + - "EMPTY EMPTY-CHECK ENABLE END END. END-ACCEPT END-ACCEPT. " + - "END-ADD END-CALL END-COMPUTE END-DELETE END-DISPLAY " + - "END-DIVIDE END-EVALUATE END-IF END-INVOKE END-MULTIPLY " + - "END-OF-PAGE END-PERFORM END-READ END-RECEIVE END-RETURN " + - "END-REWRITE END-SEARCH END-START END-STRING END-SUBTRACT " + - "END-UNSTRING END-WRITE END-XML ENTER ENTRY " + - "ENVIRONMENT EOP EQUAL EQUALS ERASE " + - "ERROR ESI EVALUATE EVERY EXCEEDS " + - "EXCEPTION EXCLUSIVE EXIT EXTEND EXTERNAL " + - "EXTERNALLY-DESCRIBED-KEY FD FETCH FILE FILE-CONTROL " + - "FILE-STREAM FILES FILLER FINAL FIND " + - "FINISH FIRST FOOTING FOR FOREGROUND-COLOR " + - "FOREGROUND-COLOUR FORMAT FREE FROM FULL " + - "FUNCTION GENERATE GET GIVING GLOBAL " + - "GO GOBACK GREATER GROUP HEADING " + - "HIGH-VALUE HIGH-VALUES HIGHLIGHT I-O I-O-CONTROL " + - "ID IDENTIFICATION IF IN INDEX " + - "INDEX-1 INDEX-2 INDEX-3 INDEX-4 INDEX-5 " + - "INDEX-6 INDEX-7 INDEX-8 INDEX-9 INDEXED " + - "INDIC INDICATE INDICATOR INDICATORS INITIAL " + - "INITIALIZE INITIATE INPUT INPUT-OUTPUT INSPECT " + - "INSTALLATION INTO INVALID INVOKE IS " + - "JUST JUSTIFIED KANJI KEEP KEY " + - "LABEL LAST LD LEADING LEFT " + - "LEFT-JUSTIFY LENGTH LENGTH-CHECK LESS LIBRARY " + - "LIKE LIMIT LIMITS LINAGE LINAGE-COUNTER " + - "LINE LINE-COUNTER LINES LINKAGE LOCAL-STORAGE " + - "LOCALE LOCALLY LOCK " + - "MEMBER MEMORY MERGE MESSAGE METACLASS " + - "MODE MODIFIED MODIFY MODULES MOVE " + - "MULTIPLE MULTIPLY NATIONAL NATIVE NEGATIVE " + - "NEXT NO NO-ECHO NONE NOT " + - "NULL NULL-KEY-MAP NULL-MAP NULLS NUMBER " + - "NUMERIC NUMERIC-EDITED OBJECT OBJECT-COMPUTER OCCURS " + - "OF OFF OMITTED ON ONLY " + - "OPEN OPTIONAL OR ORDER ORGANIZATION " + - "OTHER OUTPUT OVERFLOW OWNER PACKED-DECIMAL " + - "PADDING PAGE PAGE-COUNTER PARSE PERFORM " + - "PF PH PIC PICTURE PLUS " + - "POINTER POSITION POSITIVE PREFIX PRESENT " + - "PRINTING PRIOR PROCEDURE PROCEDURE-POINTER PROCEDURES " + - "PROCEED PROCESS PROCESSING PROGRAM PROGRAM-ID " + - "PROMPT PROTECTED PURGE QUEUE QUOTE " + - "QUOTES RANDOM RD READ READY " + - "REALM RECEIVE RECONNECT RECORD RECORD-NAME " + - "RECORDS RECURSIVE REDEFINES REEL REFERENCE " + - "REFERENCE-MONITOR REFERENCES RELATION RELATIVE RELEASE " + - "REMAINDER REMOVAL RENAMES REPEATED REPLACE " + - "REPLACING REPORT REPORTING REPORTS REPOSITORY " + - "REQUIRED RERUN RESERVE RESET RETAINING " + - "RETRIEVAL RETURN RETURN-CODE RETURNING REVERSE-VIDEO " + - "REVERSED REWIND REWRITE RF RH " + - "RIGHT RIGHT-JUSTIFY ROLLBACK ROLLING ROUNDED " + - "RUN SAME SCREEN SD SEARCH " + - "SECTION SECURE SECURITY SEGMENT SEGMENT-LIMIT " + - "SELECT SEND SENTENCE SEPARATE SEQUENCE " + - "SEQUENTIAL SET SHARED SIGN SIZE " + - "SKIP1 SKIP2 SKIP3 SORT SORT-MERGE " + - "SORT-RETURN SOURCE SOURCE-COMPUTER SPACE-FILL " + - "SPECIAL-NAMES STANDARD STANDARD-1 STANDARD-2 " + - "START STARTING STATUS STOP STORE " + - "STRING SUB-QUEUE-1 SUB-QUEUE-2 SUB-QUEUE-3 SUB-SCHEMA " + - "SUBFILE SUBSTITUTE SUBTRACT SUM SUPPRESS " + - "SYMBOLIC SYNC SYNCHRONIZED SYSIN SYSOUT " + - "TABLE TALLYING TAPE TENANT TERMINAL " + - "TERMINATE TEST TEXT THAN THEN " + - "THROUGH THRU TIME TIMES TITLE " + - "TO TOP TRAILING TRAILING-SIGN TRANSACTION " + - "TYPE TYPEDEF UNDERLINE UNEQUAL UNIT " + - "UNSTRING UNTIL UP UPDATE UPON " + - "USAGE USAGE-MODE USE USING VALID " + - "VALIDATE VALUE VALUES VARYING VLR " + - "WAIT WHEN WHEN-COMPILED WITH WITHIN " + - "WORDS WORKING-STORAGE WRITE XML XML-CODE " + - "XML-EVENT XML-NTEXT XML-TEXT ZERO ZERO-FILL " ); - - var builtins = makeKeywords("- * ** / + < <= = > >= "); - var tests = { - digit: /\d/, - digit_or_colon: /[\d:]/, - hex: /[0-9a-f]/i, - sign: /[+-]/, - exponent: /e/i, - keyword_char: /[^\s\(\[\;\)\]]/, - symbol: /[\w*+\-]/ - }; - function isNumber(ch, stream){ - // hex - if ( ch === '0' && stream.eat(/x/i) ) { - stream.eatWhile(tests.hex); - return true; - } - // leading sign - if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) { - stream.eat(tests.sign); - ch = stream.next(); - } - if ( tests.digit.test(ch) ) { - stream.eat(ch); - stream.eatWhile(tests.digit); - if ( '.' == stream.peek()) { - stream.eat('.'); - stream.eatWhile(tests.digit); - } - if ( stream.eat(tests.exponent) ) { - stream.eat(tests.sign); - stream.eatWhile(tests.digit); - } - return true; - } - return false; - } - return { - startState: function () { - return { - indentStack: null, - indentation: 0, - mode: false - }; - }, - token: function (stream, state) { - if (state.indentStack == null && stream.sol()) { - // update indentation, but only if indentStack is empty - state.indentation = 6 ; //stream.indentation(); - } - // skip spaces - if (stream.eatSpace()) { - return null; - } - var returnType = null; - switch(state.mode){ - case "string": // multi-line string parsing mode - var next = false; - while ((next = stream.next()) != null) { - if (next == "\"" || next == "\'") { - state.mode = false; - break; - } - } - returnType = STRING; // continue on in string mode - break; - default: // default parsing mode - var ch = stream.next(); - var col = stream.column(); - if (col >= 0 && col <= 5) { - returnType = COBOLLINENUM; - } else if (col >= 72 && col <= 79) { - stream.skipToEnd(); - returnType = MODTAG; - } else if (ch == "*" && col == 6) { // comment - stream.skipToEnd(); // rest of the line is a comment - returnType = COMMENT; - } else if (ch == "\"" || ch == "\'") { - state.mode = "string"; - returnType = STRING; - } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) { - returnType = ATOM; - } else if (ch == ".") { - returnType = PERIOD; - } else if (isNumber(ch,stream)){ - returnType = NUMBER; - } else { - if (stream.current().match(tests.symbol)) { - while (col < 71) { - if (stream.eat(tests.symbol) === undefined) { - break; - } else { - col++; - } - } - } - if (keywords && keywords.propertyIsEnumerable(stream.current().toUpperCase())) { - returnType = KEYWORD; - } else if (builtins && builtins.propertyIsEnumerable(stream.current().toUpperCase())) { - returnType = BUILTIN; - } else if (atoms && atoms.propertyIsEnumerable(stream.current().toUpperCase())) { - returnType = ATOM; - } else returnType = null; - } - } - return returnType; - }, - indent: function (state) { - if (state.indentStack == null) return state.indentation; - return state.indentStack.indent; - } - }; -}); - -CodeMirror.defineMIME("text/x-cobol", "cobol"); - -}); diff --git a/kallithea/public/codemirror/mode/coffeescript/coffeescript.js b/kallithea/public/codemirror/mode/coffeescript/coffeescript.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/coffeescript/coffeescript.js +++ /dev/null @@ -1,369 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/** - * Link to the project's GitHub page: - * https://github.com/pickhardt/coffeescript-codemirror-mode - */ -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("coffeescript", function(conf) { - var ERRORCLASS = "error"; - - function wordRegexp(words) { - return new RegExp("^((" + words.join(")|(") + "))\\b"); - } - - var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/; - var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/; - var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/; - var properties = /^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/; - - var wordOperators = wordRegexp(["and", "or", "not", - "is", "isnt", "in", - "instanceof", "typeof"]); - var indentKeywords = ["for", "while", "loop", "if", "unless", "else", - "switch", "try", "catch", "finally", "class"]; - var commonKeywords = ["break", "by", "continue", "debugger", "delete", - "do", "in", "of", "new", "return", "then", - "this", "@", "throw", "when", "until", "extends"]; - - var keywords = wordRegexp(indentKeywords.concat(commonKeywords)); - - indentKeywords = wordRegexp(indentKeywords); - - - var stringPrefixes = /^('{3}|\"{3}|['\"])/; - var regexPrefixes = /^(\/{3}|\/)/; - var commonConstants = ["Infinity", "NaN", "undefined", "null", "true", "false", "on", "off", "yes", "no"]; - var constants = wordRegexp(commonConstants); - - // Tokenizers - function tokenBase(stream, state) { - // Handle scope changes - if (stream.sol()) { - if (state.scope.align === null) state.scope.align = false; - var scopeOffset = state.scope.offset; - if (stream.eatSpace()) { - var lineOffset = stream.indentation(); - if (lineOffset > scopeOffset && state.scope.type == "coffee") { - return "indent"; - } else if (lineOffset < scopeOffset) { - return "dedent"; - } - return null; - } else { - if (scopeOffset > 0) { - dedent(stream, state); - } - } - } - if (stream.eatSpace()) { - return null; - } - - var ch = stream.peek(); - - // Handle docco title comment (single line) - if (stream.match("####")) { - stream.skipToEnd(); - return "comment"; - } - - // Handle multi line comments - if (stream.match("###")) { - state.tokenize = longComment; - return state.tokenize(stream, state); - } - - // Single line comment - if (ch === "#") { - stream.skipToEnd(); - return "comment"; - } - - // Handle number literals - if (stream.match(/^-?[0-9\.]/, false)) { - var floatLiteral = false; - // Floats - if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)) { - floatLiteral = true; - } - if (stream.match(/^-?\d+\.\d*/)) { - floatLiteral = true; - } - if (stream.match(/^-?\.\d+/)) { - floatLiteral = true; - } - - if (floatLiteral) { - // prevent from getting extra . on 1.. - if (stream.peek() == "."){ - stream.backUp(1); - } - return "number"; - } - // Integers - var intLiteral = false; - // Hex - if (stream.match(/^-?0x[0-9a-f]+/i)) { - intLiteral = true; - } - // Decimal - if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)) { - intLiteral = true; - } - // Zero by itself with no other piece of number. - if (stream.match(/^-?0(?![\dx])/i)) { - intLiteral = true; - } - if (intLiteral) { - return "number"; - } - } - - // Handle strings - if (stream.match(stringPrefixes)) { - state.tokenize = tokenFactory(stream.current(), false, "string"); - return state.tokenize(stream, state); - } - // Handle regex literals - if (stream.match(regexPrefixes)) { - if (stream.current() != "/" || stream.match(/^.*\//, false)) { // prevent highlight of division - state.tokenize = tokenFactory(stream.current(), true, "string-2"); - return state.tokenize(stream, state); - } else { - stream.backUp(1); - } - } - - // Handle operators and delimiters - if (stream.match(operators) || stream.match(wordOperators)) { - return "operator"; - } - if (stream.match(delimiters)) { - return "punctuation"; - } - - if (stream.match(constants)) { - return "atom"; - } - - if (stream.match(keywords)) { - return "keyword"; - } - - if (stream.match(identifiers)) { - return "variable"; - } - - if (stream.match(properties)) { - return "property"; - } - - // Handle non-detected items - stream.next(); - return ERRORCLASS; - } - - function tokenFactory(delimiter, singleline, outclass) { - return function(stream, state) { - while (!stream.eol()) { - stream.eatWhile(/[^'"\/\\]/); - if (stream.eat("\\")) { - stream.next(); - if (singleline && stream.eol()) { - return outclass; - } - } else if (stream.match(delimiter)) { - state.tokenize = tokenBase; - return outclass; - } else { - stream.eat(/['"\/]/); - } - } - if (singleline) { - if (conf.mode.singleLineStringErrors) { - outclass = ERRORCLASS; - } else { - state.tokenize = tokenBase; - } - } - return outclass; - }; - } - - function longComment(stream, state) { - while (!stream.eol()) { - stream.eatWhile(/[^#]/); - if (stream.match("###")) { - state.tokenize = tokenBase; - break; - } - stream.eatWhile("#"); - } - return "comment"; - } - - function indent(stream, state, type) { - type = type || "coffee"; - var offset = 0, align = false, alignOffset = null; - for (var scope = state.scope; scope; scope = scope.prev) { - if (scope.type === "coffee" || scope.type == "}") { - offset = scope.offset + conf.indentUnit; - break; - } - } - if (type !== "coffee") { - align = null; - alignOffset = stream.column() + stream.current().length; - } else if (state.scope.align) { - state.scope.align = false; - } - state.scope = { - offset: offset, - type: type, - prev: state.scope, - align: align, - alignOffset: alignOffset - }; - } - - function dedent(stream, state) { - if (!state.scope.prev) return; - if (state.scope.type === "coffee") { - var _indent = stream.indentation(); - var matched = false; - for (var scope = state.scope; scope; scope = scope.prev) { - if (_indent === scope.offset) { - matched = true; - break; - } - } - if (!matched) { - return true; - } - while (state.scope.prev && state.scope.offset !== _indent) { - state.scope = state.scope.prev; - } - return false; - } else { - state.scope = state.scope.prev; - return false; - } - } - - function tokenLexer(stream, state) { - var style = state.tokenize(stream, state); - var current = stream.current(); - - // Handle "." connected identifiers - if (current === ".") { - style = state.tokenize(stream, state); - current = stream.current(); - if (/^\.[\w$]+$/.test(current)) { - return "variable"; - } else { - return ERRORCLASS; - } - } - - // Handle scope changes. - if (current === "return") { - state.dedent = true; - } - if (((current === "->" || current === "=>") && - !state.lambda && - !stream.peek()) - || style === "indent") { - indent(stream, state); - } - var delimiter_index = "[({".indexOf(current); - if (delimiter_index !== -1) { - indent(stream, state, "])}".slice(delimiter_index, delimiter_index+1)); - } - if (indentKeywords.exec(current)){ - indent(stream, state); - } - if (current == "then"){ - dedent(stream, state); - } - - - if (style === "dedent") { - if (dedent(stream, state)) { - return ERRORCLASS; - } - } - delimiter_index = "])}".indexOf(current); - if (delimiter_index !== -1) { - while (state.scope.type == "coffee" && state.scope.prev) - state.scope = state.scope.prev; - if (state.scope.type == current) - state.scope = state.scope.prev; - } - if (state.dedent && stream.eol()) { - if (state.scope.type == "coffee" && state.scope.prev) - state.scope = state.scope.prev; - state.dedent = false; - } - - return style; - } - - var external = { - startState: function(basecolumn) { - return { - tokenize: tokenBase, - scope: {offset:basecolumn || 0, type:"coffee", prev: null, align: false}, - lastToken: null, - lambda: false, - dedent: 0 - }; - }, - - token: function(stream, state) { - var fillAlign = state.scope.align === null && state.scope; - if (fillAlign && stream.sol()) fillAlign.align = false; - - var style = tokenLexer(stream, state); - if (fillAlign && style && style != "comment") fillAlign.align = true; - - state.lastToken = {style:style, content: stream.current()}; - - if (stream.eol() && stream.lambda) { - state.lambda = false; - } - - return style; - }, - - indent: function(state, text) { - if (state.tokenize != tokenBase) return 0; - var scope = state.scope; - var closer = text && "])}".indexOf(text.charAt(0)) > -1; - if (closer) while (scope.type == "coffee" && scope.prev) scope = scope.prev; - var closes = closer && scope.type === text.charAt(0); - if (scope.align) - return scope.alignOffset - (closes ? 1 : 0); - else - return (closes ? scope.prev : scope).offset; - }, - - lineComment: "#", - fold: "indent" - }; - return external; -}); - -CodeMirror.defineMIME("text/x-coffeescript", "coffeescript"); - -}); diff --git a/kallithea/public/codemirror/mode/commonlisp/commonlisp.js b/kallithea/public/codemirror/mode/commonlisp/commonlisp.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/commonlisp/commonlisp.js +++ /dev/null @@ -1,120 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("commonlisp", function (config) { - var assumeBody = /^with|^def|^do|^prog|case$|^cond$|bind$|when$|unless$/; - var numLiteral = /^(?:[+\-]?(?:\d+|\d*\.\d+)(?:[efd][+\-]?\d+)?|[+\-]?\d+(?:\/[+\-]?\d+)?|#b[+\-]?[01]+|#o[+\-]?[0-7]+|#x[+\-]?[\da-f]+)/; - var symbol = /[^\s'`,@()\[\]";]/; - var type; - - function readSym(stream) { - var ch; - while (ch = stream.next()) { - if (ch == "\\") stream.next(); - else if (!symbol.test(ch)) { stream.backUp(1); break; } - } - return stream.current(); - } - - function base(stream, state) { - if (stream.eatSpace()) {type = "ws"; return null;} - if (stream.match(numLiteral)) return "number"; - var ch = stream.next(); - if (ch == "\\") ch = stream.next(); - - if (ch == '"') return (state.tokenize = inString)(stream, state); - else if (ch == "(") { type = "open"; return "bracket"; } - else if (ch == ")" || ch == "]") { type = "close"; return "bracket"; } - else if (ch == ";") { stream.skipToEnd(); type = "ws"; return "comment"; } - else if (/['`,@]/.test(ch)) return null; - else if (ch == "|") { - if (stream.skipTo("|")) { stream.next(); return "symbol"; } - else { stream.skipToEnd(); return "error"; } - } else if (ch == "#") { - var ch = stream.next(); - if (ch == "[") { type = "open"; return "bracket"; } - else if (/[+\-=\.']/.test(ch)) return null; - else if (/\d/.test(ch) && stream.match(/^\d*#/)) return null; - else if (ch == "|") return (state.tokenize = inComment)(stream, state); - else if (ch == ":") { readSym(stream); return "meta"; } - else return "error"; - } else { - var name = readSym(stream); - if (name == ".") return null; - type = "symbol"; - if (name == "nil" || name == "t") return "atom"; - if (name.charAt(0) == ":") return "keyword"; - if (name.charAt(0) == "&") return "variable-2"; - return "variable"; - } - } - - function inString(stream, state) { - var escaped = false, next; - while (next = stream.next()) { - if (next == '"' && !escaped) { state.tokenize = base; break; } - escaped = !escaped && next == "\\"; - } - return "string"; - } - - function inComment(stream, state) { - var next, last; - while (next = stream.next()) { - if (next == "#" && last == "|") { state.tokenize = base; break; } - last = next; - } - type = "ws"; - return "comment"; - } - - return { - startState: function () { - return {ctx: {prev: null, start: 0, indentTo: 0}, tokenize: base}; - }, - - token: function (stream, state) { - if (stream.sol() && typeof state.ctx.indentTo != "number") - state.ctx.indentTo = state.ctx.start + 1; - - type = null; - var style = state.tokenize(stream, state); - if (type != "ws") { - if (state.ctx.indentTo == null) { - if (type == "symbol" && assumeBody.test(stream.current())) - state.ctx.indentTo = state.ctx.start + config.indentUnit; - else - state.ctx.indentTo = "next"; - } else if (state.ctx.indentTo == "next") { - state.ctx.indentTo = stream.column(); - } - } - if (type == "open") state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null}; - else if (type == "close") state.ctx = state.ctx.prev || state.ctx; - return style; - }, - - indent: function (state, _textAfter) { - var i = state.ctx.indentTo; - return typeof i == "number" ? i : state.ctx.start + 1; - }, - - lineComment: ";;", - blockCommentStart: "#|", - blockCommentEnd: "|#" - }; -}); - -CodeMirror.defineMIME("text/x-common-lisp", "commonlisp"); - -}); diff --git a/kallithea/public/codemirror/mode/css/css.js b/kallithea/public/codemirror/mode/css/css.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/css/css.js +++ /dev/null @@ -1,717 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("css", function(config, parserConfig) { - if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css"); - - var indentUnit = config.indentUnit, - tokenHooks = parserConfig.tokenHooks, - mediaTypes = parserConfig.mediaTypes || {}, - mediaFeatures = parserConfig.mediaFeatures || {}, - propertyKeywords = parserConfig.propertyKeywords || {}, - nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {}, - colorKeywords = parserConfig.colorKeywords || {}, - valueKeywords = parserConfig.valueKeywords || {}, - fontProperties = parserConfig.fontProperties || {}, - allowNested = parserConfig.allowNested; - - var type, override; - function ret(style, tp) { type = tp; return style; } - - // Tokenizers - - function tokenBase(stream, state) { - var ch = stream.next(); - if (tokenHooks[ch]) { - var result = tokenHooks[ch](stream, state); - if (result !== false) return result; - } - if (ch == "@") { - stream.eatWhile(/[\w\\\-]/); - return ret("def", stream.current()); - } else if (ch == "=" || (ch == "~" || ch == "|") && stream.eat("=")) { - return ret(null, "compare"); - } else if (ch == "\"" || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } else if (ch == "#") { - stream.eatWhile(/[\w\\\-]/); - return ret("atom", "hash"); - } else if (ch == "!") { - stream.match(/^\s*\w*/); - return ret("keyword", "important"); - } else if (/\d/.test(ch) || ch == "." && stream.eat(/\d/)) { - stream.eatWhile(/[\w.%]/); - return ret("number", "unit"); - } else if (ch === "-") { - if (/[\d.]/.test(stream.peek())) { - stream.eatWhile(/[\w.%]/); - return ret("number", "unit"); - } else if (stream.match(/^\w+-/)) { - return ret("meta", "meta"); - } - } else if (/[,+>*\/]/.test(ch)) { - return ret(null, "select-op"); - } else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) { - return ret("qualifier", "qualifier"); - } else if (/[:;{}\[\]\(\)]/.test(ch)) { - return ret(null, ch); - } else if (ch == "u" && stream.match("rl(")) { - stream.backUp(1); - state.tokenize = tokenParenthesized; - return ret("property", "word"); - } else if (/[\w\\\-]/.test(ch)) { - stream.eatWhile(/[\w\\\-]/); - return ret("property", "word"); - } else { - return ret(null, null); - } - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == quote && !escaped) { - if (quote == ")") stream.backUp(1); - break; - } - escaped = !escaped && ch == "\\"; - } - if (ch == quote || !escaped && quote != ")") state.tokenize = null; - return ret("string", "string"); - }; - } - - function tokenParenthesized(stream, state) { - stream.next(); // Must be '(' - if (!stream.match(/\s*[\"\')]/, false)) - state.tokenize = tokenString(")"); - else - state.tokenize = null; - return ret(null, "("); - } - - // Context management - - function Context(type, indent, prev) { - this.type = type; - this.indent = indent; - this.prev = prev; - } - - function pushContext(state, stream, type) { - state.context = new Context(type, stream.indentation() + indentUnit, state.context); - return type; - } - - function popContext(state) { - state.context = state.context.prev; - return state.context.type; - } - - function pass(type, stream, state) { - return states[state.context.type](type, stream, state); - } - function popAndPass(type, stream, state, n) { - for (var i = n || 1; i > 0; i--) - state.context = state.context.prev; - return pass(type, stream, state); - } - - // Parser - - function wordAsValue(stream) { - var word = stream.current().toLowerCase(); - if (valueKeywords.hasOwnProperty(word)) - override = "atom"; - else if (colorKeywords.hasOwnProperty(word)) - override = "keyword"; - else - override = "variable"; - } - - var states = {}; - - states.top = function(type, stream, state) { - if (type == "{") { - return pushContext(state, stream, "block"); - } else if (type == "}" && state.context.prev) { - return popContext(state); - } else if (type == "@media") { - return pushContext(state, stream, "media"); - } else if (type == "@font-face") { - return "font_face_before"; - } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) { - return "keyframes"; - } else if (type && type.charAt(0) == "@") { - return pushContext(state, stream, "at"); - } else if (type == "hash") { - override = "builtin"; - } else if (type == "word") { - override = "tag"; - } else if (type == "variable-definition") { - return "maybeprop"; - } else if (type == "interpolation") { - return pushContext(state, stream, "interpolation"); - } else if (type == ":") { - return "pseudo"; - } else if (allowNested && type == "(") { - return pushContext(state, stream, "parens"); - } - return state.context.type; - }; - - states.block = function(type, stream, state) { - if (type == "word") { - var word = stream.current().toLowerCase(); - if (propertyKeywords.hasOwnProperty(word)) { - override = "property"; - return "maybeprop"; - } else if (nonStandardPropertyKeywords.hasOwnProperty(word)) { - override = "string-2"; - return "maybeprop"; - } else if (allowNested) { - override = stream.match(/^\s*:/, false) ? "property" : "tag"; - return "block"; - } else { - override += " error"; - return "maybeprop"; - } - } else if (type == "meta") { - return "block"; - } else if (!allowNested && (type == "hash" || type == "qualifier")) { - override = "error"; - return "block"; - } else { - return states.top(type, stream, state); - } - }; - - states.maybeprop = function(type, stream, state) { - if (type == ":") return pushContext(state, stream, "prop"); - return pass(type, stream, state); - }; - - states.prop = function(type, stream, state) { - if (type == ";") return popContext(state); - if (type == "{" && allowNested) return pushContext(state, stream, "propBlock"); - if (type == "}" || type == "{") return popAndPass(type, stream, state); - if (type == "(") return pushContext(state, stream, "parens"); - - if (type == "hash" && !/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) { - override += " error"; - } else if (type == "word") { - wordAsValue(stream); - } else if (type == "interpolation") { - return pushContext(state, stream, "interpolation"); - } - return "prop"; - }; - - states.propBlock = function(type, _stream, state) { - if (type == "}") return popContext(state); - if (type == "word") { override = "property"; return "maybeprop"; } - return state.context.type; - }; - - states.parens = function(type, stream, state) { - if (type == "{" || type == "}") return popAndPass(type, stream, state); - if (type == ")") return popContext(state); - if (type == "(") return pushContext(state, stream, "parens"); - if (type == "word") wordAsValue(stream); - return "parens"; - }; - - states.pseudo = function(type, stream, state) { - if (type == "word") { - override = "variable-3"; - return state.context.type; - } - return pass(type, stream, state); - }; - - states.media = function(type, stream, state) { - if (type == "(") return pushContext(state, stream, "media_parens"); - if (type == "}") return popAndPass(type, stream, state); - if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top"); - - if (type == "word") { - var word = stream.current().toLowerCase(); - if (word == "only" || word == "not" || word == "and") - override = "keyword"; - else if (mediaTypes.hasOwnProperty(word)) - override = "attribute"; - else if (mediaFeatures.hasOwnProperty(word)) - override = "property"; - else - override = "error"; - } - return state.context.type; - }; - - states.media_parens = function(type, stream, state) { - if (type == ")") return popContext(state); - if (type == "{" || type == "}") return popAndPass(type, stream, state, 2); - return states.media(type, stream, state); - }; - - states.font_face_before = function(type, stream, state) { - if (type == "{") - return pushContext(state, stream, "font_face"); - return pass(type, stream, state); - }; - - states.font_face = function(type, stream, state) { - if (type == "}") return popContext(state); - if (type == "word") { - if (!fontProperties.hasOwnProperty(stream.current().toLowerCase())) - override = "error"; - else - override = "property"; - return "maybeprop"; - } - return "font_face"; - }; - - states.keyframes = function(type, stream, state) { - if (type == "word") { override = "variable"; return "keyframes"; } - if (type == "{") return pushContext(state, stream, "top"); - return pass(type, stream, state); - }; - - states.at = function(type, stream, state) { - if (type == ";") return popContext(state); - if (type == "{" || type == "}") return popAndPass(type, stream, state); - if (type == "word") override = "tag"; - else if (type == "hash") override = "builtin"; - return "at"; - }; - - states.interpolation = function(type, stream, state) { - if (type == "}") return popContext(state); - if (type == "{" || type == ";") return popAndPass(type, stream, state); - if (type != "variable") override = "error"; - return "interpolation"; - }; - - return { - startState: function(base) { - return {tokenize: null, - state: "top", - context: new Context("top", base || 0, null)}; - }, - - token: function(stream, state) { - if (!state.tokenize && stream.eatSpace()) return null; - var style = (state.tokenize || tokenBase)(stream, state); - if (style && typeof style == "object") { - type = style[1]; - style = style[0]; - } - override = style; - state.state = states[state.state](type, stream, state); - return override; - }, - - indent: function(state, textAfter) { - var cx = state.context, ch = textAfter && textAfter.charAt(0); - var indent = cx.indent; - if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev; - if (cx.prev && - (ch == "}" && (cx.type == "block" || cx.type == "top" || cx.type == "interpolation" || cx.type == "font_face") || - ch == ")" && (cx.type == "parens" || cx.type == "media_parens") || - ch == "{" && (cx.type == "at" || cx.type == "media"))) { - indent = cx.indent - indentUnit; - cx = cx.prev; - } - return indent; - }, - - electricChars: "}", - blockCommentStart: "/*", - blockCommentEnd: "*/", - fold: "brace" - }; -}); - - function keySet(array) { - var keys = {}; - for (var i = 0; i < array.length; ++i) { - keys[array[i]] = true; - } - return keys; - } - - var mediaTypes_ = [ - "all", "aural", "braille", "handheld", "print", "projection", "screen", - "tty", "tv", "embossed" - ], mediaTypes = keySet(mediaTypes_); - - var mediaFeatures_ = [ - "width", "min-width", "max-width", "height", "min-height", "max-height", - "device-width", "min-device-width", "max-device-width", "device-height", - "min-device-height", "max-device-height", "aspect-ratio", - "min-aspect-ratio", "max-aspect-ratio", "device-aspect-ratio", - "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color", - "max-color", "color-index", "min-color-index", "max-color-index", - "monochrome", "min-monochrome", "max-monochrome", "resolution", - "min-resolution", "max-resolution", "scan", "grid" - ], mediaFeatures = keySet(mediaFeatures_); - - var propertyKeywords_ = [ - "align-content", "align-items", "align-self", "alignment-adjust", - "alignment-baseline", "anchor-point", "animation", "animation-delay", - "animation-direction", "animation-duration", "animation-fill-mode", - "animation-iteration-count", "animation-name", "animation-play-state", - "animation-timing-function", "appearance", "azimuth", "backface-visibility", - "background", "background-attachment", "background-clip", "background-color", - "background-image", "background-origin", "background-position", - "background-repeat", "background-size", "baseline-shift", "binding", - "bleed", "bookmark-label", "bookmark-level", "bookmark-state", - "bookmark-target", "border", "border-bottom", "border-bottom-color", - "border-bottom-left-radius", "border-bottom-right-radius", - "border-bottom-style", "border-bottom-width", "border-collapse", - "border-color", "border-image", "border-image-outset", - "border-image-repeat", "border-image-slice", "border-image-source", - "border-image-width", "border-left", "border-left-color", - "border-left-style", "border-left-width", "border-radius", "border-right", - "border-right-color", "border-right-style", "border-right-width", - "border-spacing", "border-style", "border-top", "border-top-color", - "border-top-left-radius", "border-top-right-radius", "border-top-style", - "border-top-width", "border-width", "bottom", "box-decoration-break", - "box-shadow", "box-sizing", "break-after", "break-before", "break-inside", - "caption-side", "clear", "clip", "color", "color-profile", "column-count", - "column-fill", "column-gap", "column-rule", "column-rule-color", - "column-rule-style", "column-rule-width", "column-span", "column-width", - "columns", "content", "counter-increment", "counter-reset", "crop", "cue", - "cue-after", "cue-before", "cursor", "direction", "display", - "dominant-baseline", "drop-initial-after-adjust", - "drop-initial-after-align", "drop-initial-before-adjust", - "drop-initial-before-align", "drop-initial-size", "drop-initial-value", - "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis", - "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap", - "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings", - "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust", - "font-stretch", "font-style", "font-synthesis", "font-variant", - "font-variant-alternates", "font-variant-caps", "font-variant-east-asian", - "font-variant-ligatures", "font-variant-numeric", "font-variant-position", - "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow", - "grid-auto-position", "grid-auto-rows", "grid-column", "grid-column-end", - "grid-column-start", "grid-row", "grid-row-end", "grid-row-start", - "grid-template", "grid-template-areas", "grid-template-columns", - "grid-template-rows", "hanging-punctuation", "height", "hyphens", - "icon", "image-orientation", "image-rendering", "image-resolution", - "inline-box-align", "justify-content", "left", "letter-spacing", - "line-break", "line-height", "line-stacking", "line-stacking-ruby", - "line-stacking-shift", "line-stacking-strategy", "list-style", - "list-style-image", "list-style-position", "list-style-type", "margin", - "margin-bottom", "margin-left", "margin-right", "margin-top", - "marker-offset", "marks", "marquee-direction", "marquee-loop", - "marquee-play-count", "marquee-speed", "marquee-style", "max-height", - "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index", - "nav-left", "nav-right", "nav-up", "object-fit", "object-position", - "opacity", "order", "orphans", "outline", - "outline-color", "outline-offset", "outline-style", "outline-width", - "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y", - "padding", "padding-bottom", "padding-left", "padding-right", "padding-top", - "page", "page-break-after", "page-break-before", "page-break-inside", - "page-policy", "pause", "pause-after", "pause-before", "perspective", - "perspective-origin", "pitch", "pitch-range", "play-during", "position", - "presentation-level", "punctuation-trim", "quotes", "region-break-after", - "region-break-before", "region-break-inside", "region-fragment", - "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness", - "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang", - "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin", - "shape-outside", "size", "speak", "speak-as", "speak-header", - "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set", - "tab-size", "table-layout", "target", "target-name", "target-new", - "target-position", "text-align", "text-align-last", "text-decoration", - "text-decoration-color", "text-decoration-line", "text-decoration-skip", - "text-decoration-style", "text-emphasis", "text-emphasis-color", - "text-emphasis-position", "text-emphasis-style", "text-height", - "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow", - "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position", - "text-wrap", "top", "transform", "transform-origin", "transform-style", - "transition", "transition-delay", "transition-duration", - "transition-property", "transition-timing-function", "unicode-bidi", - "vertical-align", "visibility", "voice-balance", "voice-duration", - "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress", - "voice-volume", "volume", "white-space", "widows", "width", "word-break", - "word-spacing", "word-wrap", "z-index", - // SVG-specific - "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color", - "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events", - "color-interpolation", "color-interpolation-filters", - "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering", - "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke", - "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", - "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering", - "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal", - "glyph-orientation-vertical", "text-anchor", "writing-mode" - ], propertyKeywords = keySet(propertyKeywords_); - - var nonStandardPropertyKeywords_ = [ - "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color", - "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color", - "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside", - "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button", - "searchfield-results-decoration", "zoom" - ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_); - - var colorKeywords_ = [ - "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige", - "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown", - "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue", - "cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod", - "darkgray", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen", - "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen", - "darkslateblue", "darkslategray", "darkturquoise", "darkviolet", - "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick", - "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite", - "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew", - "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender", - "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral", - "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink", - "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", - "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta", - "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple", - "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise", - "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin", - "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered", - "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred", - "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue", - "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown", - "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue", - "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan", - "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white", - "whitesmoke", "yellow", "yellowgreen" - ], colorKeywords = keySet(colorKeywords_); - - var valueKeywords_ = [ - "above", "absolute", "activeborder", "activecaption", "afar", - "after-white-space", "ahead", "alias", "all", "all-scroll", "alternate", - "always", "amharic", "amharic-abegede", "antialiased", "appworkspace", - "arabic-indic", "armenian", "asterisks", "auto", "avoid", "avoid-column", "avoid-page", - "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary", - "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box", - "both", "bottom", "break", "break-all", "break-word", "button", "button-bevel", - "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "cambodian", - "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret", - "cell", "center", "checkbox", "circle", "cjk-earthly-branch", - "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote", - "col-resize", "collapse", "column", "compact", "condensed", "contain", "content", - "content-box", "context-menu", "continuous", "copy", "cover", "crop", - "cross", "crosshair", "currentcolor", "cursive", "dashed", "decimal", - "decimal-leading-zero", "default", "default-button", "destination-atop", - "destination-in", "destination-out", "destination-over", "devanagari", - "disc", "discard", "document", "dot-dash", "dot-dot-dash", "dotted", - "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out", - "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede", - "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er", - "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er", - "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et", - "ethiopic-halehame-gez", "ethiopic-halehame-om-et", - "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et", - "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", - "ethiopic-halehame-tig", "ew-resize", "expanded", "extra-condensed", - "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "footnotes", - "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove", - "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew", - "help", "hidden", "hide", "higher", "highlight", "highlighttext", - "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore", - "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite", - "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis", - "inline-block", "inline-table", "inset", "inside", "intrinsic", "invert", - "italic", "justify", "kannada", "katakana", "katakana-iroha", "keep-all", "khmer", - "landscape", "lao", "large", "larger", "left", "level", "lighter", - "line-through", "linear", "lines", "list-item", "listbox", "listitem", - "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian", - "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian", - "lower-roman", "lowercase", "ltr", "malayalam", "match", - "media-controls-background", "media-current-time-display", - "media-fullscreen-button", "media-mute-button", "media-play-button", - "media-return-to-realtime-button", "media-rewind-button", - "media-seek-back-button", "media-seek-forward-button", "media-slider", - "media-sliderthumb", "media-time-remaining-display", "media-volume-slider", - "media-volume-slider-container", "media-volume-sliderthumb", "medium", - "menu", "menulist", "menulist-button", "menulist-text", - "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic", - "mix", "mongolian", "monospace", "move", "multiple", "myanmar", "n-resize", - "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop", - "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap", - "ns-resize", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote", - "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset", - "outside", "outside-shape", "overlay", "overline", "padding", "padding-box", - "painted", "page", "paused", "persian", "plus-darker", "plus-lighter", "pointer", - "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d", "progress", "push-button", - "radio", "read-only", "read-write", "read-write-plaintext-only", "rectangle", "region", - "relative", "repeat", "repeat-x", "repeat-y", "reset", "reverse", "rgb", "rgba", - "ridge", "right", "round", "row-resize", "rtl", "run-in", "running", - "s-resize", "sans-serif", "scroll", "scrollbar", "se-resize", "searchfield", - "searchfield-cancel-button", "searchfield-decoration", - "searchfield-results-button", "searchfield-results-decoration", - "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama", - "single", "skip-white-space", "slide", "slider-horizontal", - "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow", - "small", "small-caps", "small-caption", "smaller", "solid", "somali", - "source-atop", "source-in", "source-out", "source-over", "space", "square", - "square-button", "start", "static", "status-bar", "stretch", "stroke", - "sub", "subpixel-antialiased", "super", "sw-resize", "table", - "table-caption", "table-cell", "table-column", "table-column-group", - "table-footer-group", "table-header-group", "table-row", "table-row-group", - "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai", - "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight", - "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er", - "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top", - "transparent", "ultra-condensed", "ultra-expanded", "underline", "up", - "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal", - "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url", - "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted", - "visibleStroke", "visual", "w-resize", "wait", "wave", "wider", - "window", "windowframe", "windowtext", "x-large", "x-small", "xor", - "xx-large", "xx-small" - ], valueKeywords = keySet(valueKeywords_); - - var fontProperties_ = [ - "font-family", "src", "unicode-range", "font-variant", "font-feature-settings", - "font-stretch", "font-weight", "font-style" - ], fontProperties = keySet(fontProperties_); - - var allWords = mediaTypes_.concat(mediaFeatures_).concat(propertyKeywords_) - .concat(nonStandardPropertyKeywords_).concat(colorKeywords_).concat(valueKeywords_); - CodeMirror.registerHelper("hintWords", "css", allWords); - - function tokenCComment(stream, state) { - var maybeEnd = false, ch; - while ((ch = stream.next()) != null) { - if (maybeEnd && ch == "/") { - state.tokenize = null; - break; - } - maybeEnd = (ch == "*"); - } - return ["comment", "comment"]; - } - - function tokenSGMLComment(stream, state) { - if (stream.skipTo("-->")) { - stream.match("-->"); - state.tokenize = null; - } else { - stream.skipToEnd(); - } - return ["comment", "comment"]; - } - - CodeMirror.defineMIME("text/css", { - mediaTypes: mediaTypes, - mediaFeatures: mediaFeatures, - propertyKeywords: propertyKeywords, - nonStandardPropertyKeywords: nonStandardPropertyKeywords, - colorKeywords: colorKeywords, - valueKeywords: valueKeywords, - fontProperties: fontProperties, - tokenHooks: { - "<": function(stream, state) { - if (!stream.match("!--")) return false; - state.tokenize = tokenSGMLComment; - return tokenSGMLComment(stream, state); - }, - "/": function(stream, state) { - if (!stream.eat("*")) return false; - state.tokenize = tokenCComment; - return tokenCComment(stream, state); - } - }, - name: "css" - }); - - CodeMirror.defineMIME("text/x-scss", { - mediaTypes: mediaTypes, - mediaFeatures: mediaFeatures, - propertyKeywords: propertyKeywords, - nonStandardPropertyKeywords: nonStandardPropertyKeywords, - colorKeywords: colorKeywords, - valueKeywords: valueKeywords, - fontProperties: fontProperties, - allowNested: true, - tokenHooks: { - "/": function(stream, state) { - if (stream.eat("/")) { - stream.skipToEnd(); - return ["comment", "comment"]; - } else if (stream.eat("*")) { - state.tokenize = tokenCComment; - return tokenCComment(stream, state); - } else { - return ["operator", "operator"]; - } - }, - ":": function(stream) { - if (stream.match(/\s*\{/)) - return [null, "{"]; - return false; - }, - "$": function(stream) { - stream.match(/^[\w-]+/); - if (stream.match(/^\s*:/, false)) - return ["variable-2", "variable-definition"]; - return ["variable-2", "variable"]; - }, - "#": function(stream) { - if (!stream.eat("{")) return false; - return [null, "interpolation"]; - } - }, - name: "css", - helperType: "scss" - }); - - CodeMirror.defineMIME("text/x-less", { - mediaTypes: mediaTypes, - mediaFeatures: mediaFeatures, - propertyKeywords: propertyKeywords, - nonStandardPropertyKeywords: nonStandardPropertyKeywords, - colorKeywords: colorKeywords, - valueKeywords: valueKeywords, - fontProperties: fontProperties, - allowNested: true, - tokenHooks: { - "/": function(stream, state) { - if (stream.eat("/")) { - stream.skipToEnd(); - return ["comment", "comment"]; - } else if (stream.eat("*")) { - state.tokenize = tokenCComment; - return tokenCComment(stream, state); - } else { - return ["operator", "operator"]; - } - }, - "@": function(stream) { - if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/, false)) return false; - stream.eatWhile(/[\w\\\-]/); - if (stream.match(/^\s*:/, false)) - return ["variable-2", "variable-definition"]; - return ["variable-2", "variable"]; - }, - "&": function() { - return ["atom", "atom"]; - } - }, - name: "css", - helperType: "less" - }); - -}); diff --git a/kallithea/public/codemirror/mode/css/less_test.js b/kallithea/public/codemirror/mode/css/less_test.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/css/less_test.js +++ /dev/null @@ -1,51 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function() { - "use strict"; - - var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-less"); - function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "less"); } - - MT("variable", - "[variable-2 @base]: [atom #f04615];", - "[qualifier .class] {", - " [property width]: [variable percentage]([number 0.5]); [comment // returns `50%`]", - " [property color]: [variable saturate]([variable-2 @base], [number 5%]);", - "}"); - - MT("amp", - "[qualifier .child], [qualifier .sibling] {", - " [qualifier .parent] [atom &] {", - " [property color]: [keyword black];", - " }", - " [atom &] + [atom &] {", - " [property color]: [keyword red];", - " }", - "}"); - - MT("mixin", - "[qualifier .mixin] ([variable dark]; [variable-2 @color]) {", - " [property color]: [variable darken]([variable-2 @color], [number 10%]);", - "}", - "[qualifier .mixin] ([variable light]; [variable-2 @color]) {", - " [property color]: [variable lighten]([variable-2 @color], [number 10%]);", - "}", - "[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {", - " [property display]: [atom block];", - "}", - "[variable-2 @switch]: [variable light];", - "[qualifier .class] {", - " [qualifier .mixin]([variable-2 @switch]; [atom #888]);", - "}"); - - MT("nest", - "[qualifier .one] {", - " [def @media] ([property width]: [number 400px]) {", - " [property font-size]: [number 1.2em];", - " [def @media] [attribute print] [keyword and] [property color] {", - " [property color]: [keyword blue];", - " }", - " }", - "}"); -})(); diff --git a/kallithea/public/codemirror/mode/css/scss_test.js b/kallithea/public/codemirror/mode/css/scss_test.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/css/scss_test.js +++ /dev/null @@ -1,110 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function() { - var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss"); - function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); } - - MT('url_with_quotation', - "[tag foo] { [property background]:[atom url]([string test.jpg]) }"); - - MT('url_with_double_quotes', - "[tag foo] { [property background]:[atom url]([string \"test.jpg\"]) }"); - - MT('url_with_single_quotes', - "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) }"); - - MT('string', - "[def @import] [string \"compass/css3\"]"); - - MT('important_keyword', - "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) [keyword !important] }"); - - MT('variable', - "[variable-2 $blue]:[atom #333]"); - - MT('variable_as_attribute', - "[tag foo] { [property color]:[variable-2 $blue] }"); - - MT('numbers', - "[tag foo] { [property padding]:[number 10px] [number 10] [number 10em] [number 8in] }"); - - MT('number_percentage', - "[tag foo] { [property width]:[number 80%] }"); - - MT('selector', - "[builtin #hello][qualifier .world]{}"); - - MT('singleline_comment', - "[comment // this is a comment]"); - - MT('multiline_comment', - "[comment /*foobar*/]"); - - MT('attribute_with_hyphen', - "[tag foo] { [property font-size]:[number 10px] }"); - - MT('string_after_attribute', - "[tag foo] { [property content]:[string \"::\"] }"); - - MT('directives', - "[def @include] [qualifier .mixin]"); - - MT('basic_structure', - "[tag p] { [property background]:[keyword red]; }"); - - MT('nested_structure', - "[tag p] { [tag a] { [property color]:[keyword red]; } }"); - - MT('mixin', - "[def @mixin] [tag table-base] {}"); - - MT('number_without_semicolon', - "[tag p] {[property width]:[number 12]}", - "[tag a] {[property color]:[keyword red];}"); - - MT('atom_in_nested_block', - "[tag p] { [tag a] { [property color]:[atom #000]; } }"); - - MT('interpolation_in_property', - "[tag foo] { #{[variable-2 $hello]}:[number 2]; }"); - - MT('interpolation_in_selector', - "[tag foo]#{[variable-2 $hello]} { [property color]:[atom #000]; }"); - - MT('interpolation_error', - "[tag foo]#{[error foo]} { [property color]:[atom #000]; }"); - - MT("divide_operator", - "[tag foo] { [property width]:[number 4] [operator /] [number 2] }"); - - MT('nested_structure_with_id_selector', - "[tag p] { [builtin #hello] { [property color]:[keyword red]; } }"); - - MT('indent_mixin', - "[def @mixin] [tag container] (", - " [variable-2 $a]: [number 10],", - " [variable-2 $b]: [number 10])", - "{}"); - - MT('indent_nested', - "[tag foo] {", - " [tag bar] {", - " }", - "}"); - - MT('indent_parentheses', - "[tag foo] {", - " [property color]: [variable darken]([variable-2 $blue],", - " [number 9%]);", - "}"); - - MT('indent_vardef', - "[variable-2 $name]:", - " [string 'val'];", - "[tag tag] {", - " [tag inner] {", - " [property margin]: [number 3px];", - " }", - "}"); -})(); diff --git a/kallithea/public/codemirror/mode/cypher/cypher.js b/kallithea/public/codemirror/mode/cypher/cypher.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/cypher/cypher.js +++ /dev/null @@ -1,146 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// By the Neo4j Team and contributors. -// https://github.com/neo4j-contrib/CodeMirror - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - var wordRegexp = function(words) { - return new RegExp("^(?:" + words.join("|") + ")$", "i"); - }; - - CodeMirror.defineMode("cypher", function(config) { - var tokenBase = function(stream/*, state*/) { - var ch = stream.next(), curPunc = null; - if (ch === "\"" || ch === "'") { - stream.match(/.+?["']/); - return "string"; - } - if (/[{}\(\),\.;\[\]]/.test(ch)) { - curPunc = ch; - return "node"; - } else if (ch === "/" && stream.eat("/")) { - stream.skipToEnd(); - return "comment"; - } else if (operatorChars.test(ch)) { - stream.eatWhile(operatorChars); - return null; - } else { - stream.eatWhile(/[_\w\d]/); - if (stream.eat(":")) { - stream.eatWhile(/[\w\d_\-]/); - return "atom"; - } - var word = stream.current(); - if (funcs.test(word)) return "builtin"; - if (preds.test(word)) return "def"; - if (keywords.test(word)) return "keyword"; - return "variable"; - } - }; - var pushContext = function(state, type, col) { - return state.context = { - prev: state.context, - indent: state.indent, - col: col, - type: type - }; - }; - var popContext = function(state) { - state.indent = state.context.indent; - return state.context = state.context.prev; - }; - var indentUnit = config.indentUnit; - var curPunc; - var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]); - var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor"]); - var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]); - var operatorChars = /[*+\-<>=&|~%^]/; - - return { - startState: function(/*base*/) { - return { - tokenize: tokenBase, - context: null, - indent: 0, - col: 0 - }; - }, - token: function(stream, state) { - if (stream.sol()) { - if (state.context && (state.context.align == null)) { - state.context.align = false; - } - state.indent = stream.indentation(); - } - if (stream.eatSpace()) { - return null; - } - var style = state.tokenize(stream, state); - if (style !== "comment" && state.context && (state.context.align == null) && state.context.type !== "pattern") { - state.context.align = true; - } - if (curPunc === "(") { - pushContext(state, ")", stream.column()); - } else if (curPunc === "[") { - pushContext(state, "]", stream.column()); - } else if (curPunc === "{") { - pushContext(state, "}", stream.column()); - } else if (/[\]\}\)]/.test(curPunc)) { - while (state.context && state.context.type === "pattern") { - popContext(state); - } - if (state.context && curPunc === state.context.type) { - popContext(state); - } - } else if (curPunc === "." && state.context && state.context.type === "pattern") { - popContext(state); - } else if (/atom|string|variable/.test(style) && state.context) { - if (/[\}\]]/.test(state.context.type)) { - pushContext(state, "pattern", stream.column()); - } else if (state.context.type === "pattern" && !state.context.align) { - state.context.align = true; - state.context.col = stream.column(); - } - } - return style; - }, - indent: function(state, textAfter) { - var firstChar = textAfter && textAfter.charAt(0); - var context = state.context; - if (/[\]\}]/.test(firstChar)) { - while (context && context.type === "pattern") { - context = context.prev; - } - } - var closing = context && firstChar === context.type; - if (!context) return 0; - if (context.type === "keywords") return CodeMirror.commands.newlineAndIndent; - if (context.align) return context.col + (closing ? 0 : 1); - return context.indent + (closing ? 0 : indentUnit); - } - }; - }); - - CodeMirror.modeExtensions["cypher"] = { - autoFormatLineBreaks: function(text) { - var i, lines, reProcessedPortion; - var lines = text.split("\n"); - var reProcessedPortion = /\s+\b(return|where|order by|match|with|skip|limit|create|delete|set)\b\s/g; - for (var i = 0; i < lines.length; i++) - lines[i] = lines[i].replace(reProcessedPortion, " \n$1 ").trim(); - return lines.join("\n"); - } - }; - - CodeMirror.defineMIME("application/x-cypher-query", "cypher"); - -}); diff --git a/kallithea/public/codemirror/mode/d/d.js b/kallithea/public/codemirror/mode/d/d.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/d/d.js +++ /dev/null @@ -1,218 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("d", function(config, parserConfig) { - var indentUnit = config.indentUnit, - statementIndentUnit = parserConfig.statementIndentUnit || indentUnit, - keywords = parserConfig.keywords || {}, - builtin = parserConfig.builtin || {}, - blockKeywords = parserConfig.blockKeywords || {}, - atoms = parserConfig.atoms || {}, - hooks = parserConfig.hooks || {}, - multiLineStrings = parserConfig.multiLineStrings; - var isOperatorChar = /[+\-*&%=<>!?|\/]/; - - var curPunc; - - function tokenBase(stream, state) { - var ch = stream.next(); - if (hooks[ch]) { - var result = hooks[ch](stream, state); - if (result !== false) return result; - } - if (ch == '"' || ch == "'" || ch == "`") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } - if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - curPunc = ch; - return null; - } - if (/\d/.test(ch)) { - stream.eatWhile(/[\w\.]/); - return "number"; - } - if (ch == "/") { - if (stream.eat("+")) { - state.tokenize = tokenComment; - return tokenNestedComment(stream, state); - } - if (stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } - if (stream.eat("/")) { - stream.skipToEnd(); - return "comment"; - } - } - if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return "operator"; - } - stream.eatWhile(/[\w\$_\xa1-\uffff]/); - var cur = stream.current(); - if (keywords.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "keyword"; - } - if (builtin.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "builtin"; - } - if (atoms.propertyIsEnumerable(cur)) return "atom"; - return "variable"; - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next, end = false; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) {end = true; break;} - escaped = !escaped && next == "\\"; - } - if (end || !(escaped || multiLineStrings)) - state.tokenize = null; - return "string"; - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = null; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function tokenNestedComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = null; - break; - } - maybeEnd = (ch == "+"); - } - return "comment"; - } - - function Context(indented, column, type, align, prev) { - this.indented = indented; - this.column = column; - this.type = type; - this.align = align; - this.prev = prev; - } - function pushContext(state, col, type) { - var indent = state.indented; - if (state.context && state.context.type == "statement") - indent = state.context.indented; - return state.context = new Context(indent, col, type, null, state.context); - } - function popContext(state) { - var t = state.context.type; - if (t == ")" || t == "]" || t == "}") - state.indented = state.context.indented; - return state.context = state.context.prev; - } - - // Interface - - return { - startState: function(basecolumn) { - return { - tokenize: null, - context: new Context((basecolumn || 0) - indentUnit, 0, "top", false), - indented: 0, - startOfLine: true - }; - }, - - token: function(stream, state) { - var ctx = state.context; - if (stream.sol()) { - if (ctx.align == null) ctx.align = false; - state.indented = stream.indentation(); - state.startOfLine = true; - } - if (stream.eatSpace()) return null; - curPunc = null; - var style = (state.tokenize || tokenBase)(stream, state); - if (style == "comment" || style == "meta") return style; - if (ctx.align == null) ctx.align = true; - - if ((curPunc == ";" || curPunc == ":" || curPunc == ",") && ctx.type == "statement") popContext(state); - else if (curPunc == "{") pushContext(state, stream.column(), "}"); - else if (curPunc == "[") pushContext(state, stream.column(), "]"); - else if (curPunc == "(") pushContext(state, stream.column(), ")"); - else if (curPunc == "}") { - while (ctx.type == "statement") ctx = popContext(state); - if (ctx.type == "}") ctx = popContext(state); - while (ctx.type == "statement") ctx = popContext(state); - } - else if (curPunc == ctx.type) popContext(state); - else if (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') || (ctx.type == "statement" && curPunc == "newstatement")) - pushContext(state, stream.column(), "statement"); - state.startOfLine = false; - return style; - }, - - indent: function(state, textAfter) { - if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass; - var ctx = state.context, firstChar = textAfter && textAfter.charAt(0); - if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev; - var closing = firstChar == ctx.type; - if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit); - else if (ctx.align) return ctx.column + (closing ? 0 : 1); - else return ctx.indented + (closing ? 0 : indentUnit); - }, - - electricChars: "{}" - }; -}); - - function words(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - var blockKeywords = "body catch class do else enum for foreach foreach_reverse if in interface mixin " + - "out scope struct switch try union unittest version while with"; - - CodeMirror.defineMIME("text/x-d", { - name: "d", - keywords: words("abstract alias align asm assert auto break case cast cdouble cent cfloat const continue " + - "debug default delegate delete deprecated export extern final finally function goto immutable " + - "import inout invariant is lazy macro module new nothrow override package pragma private " + - "protected public pure ref return shared short static super synchronized template this " + - "throw typedef typeid typeof volatile __FILE__ __LINE__ __gshared __traits __vector __parameters " + - blockKeywords), - blockKeywords: words(blockKeywords), - builtin: words("bool byte char creal dchar double float idouble ifloat int ireal long real short ubyte " + - "ucent uint ulong ushort wchar wstring void size_t sizediff_t"), - atoms: words("exit failure success true false null"), - hooks: { - "@": function(stream, _state) { - stream.eatWhile(/[\w\$_]/); - return "meta"; - } - } - }); - -}); diff --git a/kallithea/public/codemirror/mode/diff/diff.js b/kallithea/public/codemirror/mode/diff/diff.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/diff/diff.js +++ /dev/null @@ -1,47 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("diff", function() { - - var TOKEN_NAMES = { - '+': 'positive', - '-': 'negative', - '@': 'meta' - }; - - return { - token: function(stream) { - var tw_pos = stream.string.search(/[\t ]+?$/); - - if (!stream.sol() || tw_pos === 0) { - stream.skipToEnd(); - return ("error " + ( - TOKEN_NAMES[stream.string.charAt(0)] || '')).replace(/ $/, ''); - } - - var token_name = TOKEN_NAMES[stream.peek()] || stream.skipToEnd(); - - if (tw_pos === -1) { - stream.skipToEnd(); - } else { - stream.pos = tw_pos; - } - - return token_name; - } - }; -}); - -CodeMirror.defineMIME("text/x-diff", "diff"); - -}); diff --git a/kallithea/public/codemirror/mode/django/django.js b/kallithea/public/codemirror/mode/django/django.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/django/django.js +++ /dev/null @@ -1,67 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), - require("../../addon/mode/overlay")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../htmlmixed/htmlmixed", - "../../addon/mode/overlay"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - CodeMirror.defineMode("django:inner", function() { - var keywords = ["block", "endblock", "for", "endfor", "in", "true", "false", - "loop", "none", "self", "super", "if", "endif", "as", "not", "and", - "else", "import", "with", "endwith", "without", "context", "ifequal", "endifequal", - "ifnotequal", "endifnotequal", "extends", "include", "load", "length", "comment", - "endcomment", "empty"]; - keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b"); - - function tokenBase (stream, state) { - stream.eatWhile(/[^\{]/); - var ch = stream.next(); - if (ch == "{") { - if (ch = stream.eat(/\{|%|#/)) { - state.tokenize = inTag(ch); - return "tag"; - } - } - } - function inTag (close) { - if (close == "{") { - close = "}"; - } - return function (stream, state) { - var ch = stream.next(); - if ((ch == close) && stream.eat("}")) { - state.tokenize = tokenBase; - return "tag"; - } - if (stream.match(keywords)) { - return "keyword"; - } - return close == "#" ? "comment" : "string"; - }; - } - return { - startState: function () { - return {tokenize: tokenBase}; - }, - token: function (stream, state) { - return state.tokenize(stream, state); - } - }; - }); - - CodeMirror.defineMode("django", function(config) { - var htmlBase = CodeMirror.getMode(config, "text/html"); - var djangoInner = CodeMirror.getMode(config, "django:inner"); - return CodeMirror.overlayMode(htmlBase, djangoInner); - }); - - CodeMirror.defineMIME("text/x-django", "django"); -}); diff --git a/kallithea/public/codemirror/mode/dtd/dtd.js b/kallithea/public/codemirror/mode/dtd/dtd.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/dtd/dtd.js +++ /dev/null @@ -1,142 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/* - DTD mode - Ported to CodeMirror by Peter Kroon - Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues - GitHub: @peterkroon -*/ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("dtd", function(config) { - var indentUnit = config.indentUnit, type; - function ret(style, tp) {type = tp; return style;} - - function tokenBase(stream, state) { - var ch = stream.next(); - - if (ch == "<" && stream.eat("!") ) { - if (stream.eatWhile(/[\-]/)) { - state.tokenize = tokenSGMLComment; - return tokenSGMLComment(stream, state); - } else if (stream.eatWhile(/[\w]/)) return ret("keyword", "doindent"); - } else if (ch == "<" && stream.eat("?")) { //xml declaration - state.tokenize = inBlock("meta", "?>"); - return ret("meta", ch); - } else if (ch == "#" && stream.eatWhile(/[\w]/)) return ret("atom", "tag"); - else if (ch == "|") return ret("keyword", "seperator"); - else if (ch.match(/[\(\)\[\]\-\.,\+\?>]/)) return ret(null, ch);//if(ch === ">") return ret(null, "endtag"); else - else if (ch.match(/[\[\]]/)) return ret("rule", ch); - else if (ch == "\"" || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } else if (stream.eatWhile(/[a-zA-Z\?\+\d]/)) { - var sc = stream.current(); - if( sc.substr(sc.length-1,sc.length).match(/\?|\+/) !== null )stream.backUp(1); - return ret("tag", "tag"); - } else if (ch == "%" || ch == "*" ) return ret("number", "number"); - else { - stream.eatWhile(/[\w\\\-_%.{,]/); - return ret(null, null); - } - } - - function tokenSGMLComment(stream, state) { - var dashes = 0, ch; - while ((ch = stream.next()) != null) { - if (dashes >= 2 && ch == ">") { - state.tokenize = tokenBase; - break; - } - dashes = (ch == "-") ? dashes + 1 : 0; - } - return ret("comment", "comment"); - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == quote && !escaped) { - state.tokenize = tokenBase; - break; - } - escaped = !escaped && ch == "\\"; - } - return ret("string", "tag"); - }; - } - - function inBlock(style, terminator) { - return function(stream, state) { - while (!stream.eol()) { - if (stream.match(terminator)) { - state.tokenize = tokenBase; - break; - } - stream.next(); - } - return style; - }; - } - - return { - startState: function(base) { - return {tokenize: tokenBase, - baseIndent: base || 0, - stack: []}; - }, - - token: function(stream, state) { - if (stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - - var context = state.stack[state.stack.length-1]; - if (stream.current() == "[" || type === "doindent" || type == "[") state.stack.push("rule"); - else if (type === "endtag") state.stack[state.stack.length-1] = "endtag"; - else if (stream.current() == "]" || type == "]" || (type == ">" && context == "rule")) state.stack.pop(); - else if (type == "[") state.stack.push("["); - return style; - }, - - indent: function(state, textAfter) { - var n = state.stack.length; - - if( textAfter.match(/\]\s+|\]/) )n=n-1; - else if(textAfter.substr(textAfter.length-1, textAfter.length) === ">"){ - if(textAfter.substr(0,1) === "<")n; - else if( type == "doindent" && textAfter.length > 1 )n; - else if( type == "doindent")n--; - else if( type == ">" && textAfter.length > 1)n; - else if( type == "tag" && textAfter !== ">")n; - else if( type == "tag" && state.stack[state.stack.length-1] == "rule")n--; - else if( type == "tag")n++; - else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule" && type === ">")n--; - else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule")n; - else if( textAfter.substr(0,1) !== "<" && textAfter.substr(0,1) === ">" )n=n-1; - else if( textAfter === ">")n; - else n=n-1; - //over rule them all - if(type == null || type == "]")n--; - } - - return state.baseIndent + n * indentUnit; - }, - - electricChars: "]>" - }; -}); - -CodeMirror.defineMIME("application/xml-dtd", "dtd"); - -}); diff --git a/kallithea/public/codemirror/mode/dylan/dylan.js b/kallithea/public/codemirror/mode/dylan/dylan.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/dylan/dylan.js +++ /dev/null @@ -1,299 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("dylan", function(_config) { - // Words - var words = { - // Words that introduce unnamed definitions like "define interface" - unnamedDefinition: ["interface"], - - // Words that introduce simple named definitions like "define library" - namedDefinition: ["module", "library", "macro", - "C-struct", "C-union", - "C-function", "C-callable-wrapper" - ], - - // Words that introduce type definitions like "define class". - // These are also parameterized like "define method" and are - // appended to otherParameterizedDefinitionWords - typeParameterizedDefinition: ["class", "C-subtype", "C-mapped-subtype"], - - // Words that introduce trickier definitions like "define method". - // These require special definitions to be added to startExpressions - otherParameterizedDefinition: ["method", "function", - "C-variable", "C-address" - ], - - // Words that introduce module constant definitions. - // These must also be simple definitions and are - // appended to otherSimpleDefinitionWords - constantSimpleDefinition: ["constant"], - - // Words that introduce module variable definitions. - // These must also be simple definitions and are - // appended to otherSimpleDefinitionWords - variableSimpleDefinition: ["variable"], - - // Other words that introduce simple definitions - // (without implicit bodies). - otherSimpleDefinition: ["generic", "domain", - "C-pointer-type", - "table" - ], - - // Words that begin statements with implicit bodies. - statement: ["if", "block", "begin", "method", "case", - "for", "select", "when", "unless", "until", - "while", "iterate", "profiling", "dynamic-bind" - ], - - // Patterns that act as separators in compound statements. - // This may include any general pattern that must be indented - // specially. - separator: ["finally", "exception", "cleanup", "else", - "elseif", "afterwards" - ], - - // Keywords that do not require special indentation handling, - // but which should be highlighted - other: ["above", "below", "by", "from", "handler", "in", - "instance", "let", "local", "otherwise", "slot", - "subclass", "then", "to", "keyed-by", "virtual" - ], - - // Condition signaling function calls - signalingCalls: ["signal", "error", "cerror", - "break", "check-type", "abort" - ] - }; - - words["otherDefinition"] = - words["unnamedDefinition"] - .concat(words["namedDefinition"]) - .concat(words["otherParameterizedDefinition"]); - - words["definition"] = - words["typeParameterizedDefinition"] - .concat(words["otherDefinition"]); - - words["parameterizedDefinition"] = - words["typeParameterizedDefinition"] - .concat(words["otherParameterizedDefinition"]); - - words["simpleDefinition"] = - words["constantSimpleDefinition"] - .concat(words["variableSimpleDefinition"]) - .concat(words["otherSimpleDefinition"]); - - words["keyword"] = - words["statement"] - .concat(words["separator"]) - .concat(words["other"]); - - // Patterns - var symbolPattern = "[-_a-zA-Z?!*@<>$%]+"; - var symbol = new RegExp("^" + symbolPattern); - var patterns = { - // Symbols with special syntax - symbolKeyword: symbolPattern + ":", - symbolClass: "<" + symbolPattern + ">", - symbolGlobal: "\\*" + symbolPattern + "\\*", - symbolConstant: "\\$" + symbolPattern - }; - var patternStyles = { - symbolKeyword: "atom", - symbolClass: "tag", - symbolGlobal: "variable-2", - symbolConstant: "variable-3" - }; - - // Compile all patterns to regular expressions - for (var patternName in patterns) - if (patterns.hasOwnProperty(patternName)) - patterns[patternName] = new RegExp("^" + patterns[patternName]); - - // Names beginning "with-" and "without-" are commonly - // used as statement macro - patterns["keyword"] = [/^with(?:out)?-[-_a-zA-Z?!*@<>$%]+/]; - - var styles = {}; - styles["keyword"] = "keyword"; - styles["definition"] = "def"; - styles["simpleDefinition"] = "def"; - styles["signalingCalls"] = "builtin"; - - // protected words lookup table - var wordLookup = {}; - var styleLookup = {}; - - [ - "keyword", - "definition", - "simpleDefinition", - "signalingCalls" - ].forEach(function(type) { - words[type].forEach(function(word) { - wordLookup[word] = type; - styleLookup[word] = styles[type]; - }); - }); - - - function chain(stream, state, f) { - state.tokenize = f; - return f(stream, state); - } - - var type, content; - - function ret(_type, style, _content) { - type = _type; - content = _content; - return style; - } - - function tokenBase(stream, state) { - // String - var ch = stream.peek(); - if (ch == "'" || ch == '"') { - stream.next(); - return chain(stream, state, tokenString(ch, "string", "string")); - } - // Comment - else if (ch == "/") { - stream.next(); - if (stream.eat("*")) { - return chain(stream, state, tokenComment); - } else if (stream.eat("/")) { - stream.skipToEnd(); - return ret("comment", "comment"); - } else { - stream.skipTo(" "); - return ret("operator", "operator"); - } - } - // Decimal - else if (/\d/.test(ch)) { - stream.match(/^\d*(?:\.\d*)?(?:e[+\-]?\d+)?/); - return ret("number", "number"); - } - // Hash - else if (ch == "#") { - stream.next(); - // Symbol with string syntax - ch = stream.peek(); - if (ch == '"') { - stream.next(); - return chain(stream, state, tokenString('"', "symbol", "string-2")); - } - // Binary number - else if (ch == "b") { - stream.next(); - stream.eatWhile(/[01]/); - return ret("number", "number"); - } - // Hex number - else if (ch == "x") { - stream.next(); - stream.eatWhile(/[\da-f]/i); - return ret("number", "number"); - } - // Octal number - else if (ch == "o") { - stream.next(); - stream.eatWhile(/[0-7]/); - return ret("number", "number"); - } - // Hash symbol - else { - stream.eatWhile(/[-a-zA-Z]/); - return ret("hash", "keyword"); - } - } else if (stream.match("end")) { - return ret("end", "keyword"); - } - for (var name in patterns) { - if (patterns.hasOwnProperty(name)) { - var pattern = patterns[name]; - if ((pattern instanceof Array && pattern.some(function(p) { - return stream.match(p); - })) || stream.match(pattern)) - return ret(name, patternStyles[name], stream.current()); - } - } - if (stream.match("define")) { - return ret("definition", "def"); - } else { - stream.eatWhile(/[\w\-]/); - // Keyword - if (wordLookup[stream.current()]) { - return ret(wordLookup[stream.current()], styleLookup[stream.current()], stream.current()); - } else if (stream.current().match(symbol)) { - return ret("variable", "variable"); - } else { - stream.next(); - return ret("other", "variable-2"); - } - } - } - - function tokenComment(stream, state) { - var maybeEnd = false, - ch; - while ((ch = stream.next())) { - if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return ret("comment", "comment"); - } - - function tokenString(quote, type, style) { - return function(stream, state) { - var next, end = false; - while ((next = stream.next()) != null) { - if (next == quote) { - end = true; - break; - } - } - if (end) - state.tokenize = tokenBase; - return ret(type, style); - }; - } - - // Interface - return { - startState: function() { - return { - tokenize: tokenBase, - currentIndent: 0 - }; - }, - token: function(stream, state) { - if (stream.eatSpace()) - return null; - var style = state.tokenize(stream, state); - return style; - }, - blockCommentStart: "/*", - blockCommentEnd: "*/" - }; -}); - -CodeMirror.defineMIME("text/x-dylan", "dylan"); - -}); diff --git a/kallithea/public/codemirror/mode/ecl/ecl.js b/kallithea/public/codemirror/mode/ecl/ecl.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/ecl/ecl.js +++ /dev/null @@ -1,207 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("ecl", function(config) { - - function words(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - function metaHook(stream, state) { - if (!state.startOfLine) return false; - stream.skipToEnd(); - return "meta"; - } - - var indentUnit = config.indentUnit; - var keyword = words("abs acos allnodes ascii asin asstring atan atan2 ave case choose choosen choosesets clustersize combine correlation cos cosh count covariance cron dataset dedup define denormalize distribute distributed distribution ebcdic enth error evaluate event eventextra eventname exists exp failcode failmessage fetch fromunicode getisvalid global graph group hash hash32 hash64 hashcrc hashmd5 having if index intformat isvalid iterate join keyunicode length library limit ln local log loop map matched matchlength matchposition matchtext matchunicode max merge mergejoin min nolocal nonempty normalize parse pipe power preload process project pull random range rank ranked realformat recordof regexfind regexreplace regroup rejected rollup round roundup row rowdiff sample set sin sinh sizeof soapcall sort sorted sqrt stepped stored sum table tan tanh thisnode topn tounicode transfer trim truncate typeof ungroup unicodeorder variance which workunit xmldecode xmlencode xmltext xmlunicode"); - var variable = words("apply assert build buildindex evaluate fail keydiff keypatch loadxml nothor notify output parallel sequential soapcall wait"); - var variable_2 = words("__compressed__ all and any as atmost before beginc++ best between case const counter csv descend encrypt end endc++ endmacro except exclusive expire export extend false few first flat from full function group header heading hole ifblock import in interface joined keep keyed last left limit load local locale lookup macro many maxcount maxlength min skew module named nocase noroot noscan nosort not of only opt or outer overwrite packed partition penalty physicallength pipe quote record relationship repeat return right scan self separator service shared skew skip sql store terminator thor threshold token transform trim true type unicodeorder unsorted validate virtual whole wild within xml xpath"); - var variable_3 = words("ascii big_endian boolean data decimal ebcdic integer pattern qstring real record rule set of string token udecimal unicode unsigned varstring varunicode"); - var builtin = words("checkpoint deprecated failcode failmessage failure global independent onwarning persist priority recovery stored success wait when"); - var blockKeywords = words("catch class do else finally for if switch try while"); - var atoms = words("true false null"); - var hooks = {"#": metaHook}; - var multiLineStrings; - var isOperatorChar = /[+\-*&%=<>!?|\/]/; - - var curPunc; - - function tokenBase(stream, state) { - var ch = stream.next(); - if (hooks[ch]) { - var result = hooks[ch](stream, state); - if (result !== false) return result; - } - if (ch == '"' || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } - if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - curPunc = ch; - return null; - } - if (/\d/.test(ch)) { - stream.eatWhile(/[\w\.]/); - return "number"; - } - if (ch == "/") { - if (stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } - if (stream.eat("/")) { - stream.skipToEnd(); - return "comment"; - } - } - if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return "operator"; - } - stream.eatWhile(/[\w\$_]/); - var cur = stream.current().toLowerCase(); - if (keyword.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "keyword"; - } else if (variable.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "variable"; - } else if (variable_2.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "variable-2"; - } else if (variable_3.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "variable-3"; - } else if (builtin.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "builtin"; - } else { //Data types are of from KEYWORD## - var i = cur.length - 1; - while(i >= 0 && (!isNaN(cur[i]) || cur[i] == '_')) - --i; - - if (i > 0) { - var cur2 = cur.substr(0, i + 1); - if (variable_3.propertyIsEnumerable(cur2)) { - if (blockKeywords.propertyIsEnumerable(cur2)) curPunc = "newstatement"; - return "variable-3"; - } - } - } - if (atoms.propertyIsEnumerable(cur)) return "atom"; - return null; - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next, end = false; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) {end = true; break;} - escaped = !escaped && next == "\\"; - } - if (end || !(escaped || multiLineStrings)) - state.tokenize = tokenBase; - return "string"; - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function Context(indented, column, type, align, prev) { - this.indented = indented; - this.column = column; - this.type = type; - this.align = align; - this.prev = prev; - } - function pushContext(state, col, type) { - return state.context = new Context(state.indented, col, type, null, state.context); - } - function popContext(state) { - var t = state.context.type; - if (t == ")" || t == "]" || t == "}") - state.indented = state.context.indented; - return state.context = state.context.prev; - } - - // Interface - - return { - startState: function(basecolumn) { - return { - tokenize: null, - context: new Context((basecolumn || 0) - indentUnit, 0, "top", false), - indented: 0, - startOfLine: true - }; - }, - - token: function(stream, state) { - var ctx = state.context; - if (stream.sol()) { - if (ctx.align == null) ctx.align = false; - state.indented = stream.indentation(); - state.startOfLine = true; - } - if (stream.eatSpace()) return null; - curPunc = null; - var style = (state.tokenize || tokenBase)(stream, state); - if (style == "comment" || style == "meta") return style; - if (ctx.align == null) ctx.align = true; - - if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state); - else if (curPunc == "{") pushContext(state, stream.column(), "}"); - else if (curPunc == "[") pushContext(state, stream.column(), "]"); - else if (curPunc == "(") pushContext(state, stream.column(), ")"); - else if (curPunc == "}") { - while (ctx.type == "statement") ctx = popContext(state); - if (ctx.type == "}") ctx = popContext(state); - while (ctx.type == "statement") ctx = popContext(state); - } - else if (curPunc == ctx.type) popContext(state); - else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement")) - pushContext(state, stream.column(), "statement"); - state.startOfLine = false; - return style; - }, - - indent: function(state, textAfter) { - if (state.tokenize != tokenBase && state.tokenize != null) return 0; - var ctx = state.context, firstChar = textAfter && textAfter.charAt(0); - if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev; - var closing = firstChar == ctx.type; - if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : indentUnit); - else if (ctx.align) return ctx.column + (closing ? 0 : 1); - else return ctx.indented + (closing ? 0 : indentUnit); - }, - - electricChars: "{}" - }; -}); - -CodeMirror.defineMIME("text/x-ecl", "ecl"); - -}); diff --git a/kallithea/public/codemirror/mode/eiffel/eiffel.js b/kallithea/public/codemirror/mode/eiffel/eiffel.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/eiffel/eiffel.js +++ /dev/null @@ -1,162 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("eiffel", function() { - function wordObj(words) { - var o = {}; - for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true; - return o; - } - var keywords = wordObj([ - 'note', - 'across', - 'when', - 'variant', - 'until', - 'unique', - 'undefine', - 'then', - 'strip', - 'select', - 'retry', - 'rescue', - 'require', - 'rename', - 'reference', - 'redefine', - 'prefix', - 'once', - 'old', - 'obsolete', - 'loop', - 'local', - 'like', - 'is', - 'inspect', - 'infix', - 'include', - 'if', - 'frozen', - 'from', - 'external', - 'export', - 'ensure', - 'end', - 'elseif', - 'else', - 'do', - 'creation', - 'create', - 'check', - 'alias', - 'agent', - 'separate', - 'invariant', - 'inherit', - 'indexing', - 'feature', - 'expanded', - 'deferred', - 'class', - 'Void', - 'True', - 'Result', - 'Precursor', - 'False', - 'Current', - 'create', - 'attached', - 'detachable', - 'as', - 'and', - 'implies', - 'not', - 'or' - ]); - var operators = wordObj([":=", "and then","and", "or","<<",">>"]); - var curPunc; - - function chain(newtok, stream, state) { - state.tokenize.push(newtok); - return newtok(stream, state); - } - - function tokenBase(stream, state) { - curPunc = null; - if (stream.eatSpace()) return null; - var ch = stream.next(); - if (ch == '"'||ch == "'") { - return chain(readQuoted(ch, "string"), stream, state); - } else if (ch == "-"&&stream.eat("-")) { - stream.skipToEnd(); - return "comment"; - } else if (ch == ":"&&stream.eat("=")) { - return "operator"; - } else if (/[0-9]/.test(ch)) { - stream.eatWhile(/[xXbBCc0-9\.]/); - stream.eat(/[\?\!]/); - return "ident"; - } else if (/[a-zA-Z_0-9]/.test(ch)) { - stream.eatWhile(/[a-zA-Z_0-9]/); - stream.eat(/[\?\!]/); - return "ident"; - } else if (/[=+\-\/*^%<>~]/.test(ch)) { - stream.eatWhile(/[=+\-\/*^%<>~]/); - return "operator"; - } else { - return null; - } - } - - function readQuoted(quote, style, unescaped) { - return function(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == quote && (unescaped || !escaped)) { - state.tokenize.pop(); - break; - } - escaped = !escaped && ch == "%"; - } - return style; - }; - } - - return { - startState: function() { - return {tokenize: [tokenBase]}; - }, - - token: function(stream, state) { - var style = state.tokenize[state.tokenize.length-1](stream, state); - if (style == "ident") { - var word = stream.current(); - style = keywords.propertyIsEnumerable(stream.current()) ? "keyword" - : operators.propertyIsEnumerable(stream.current()) ? "operator" - : /^[A-Z][A-Z_0-9]*$/g.test(word) ? "tag" - : /^0[bB][0-1]+$/g.test(word) ? "number" - : /^0[cC][0-7]+$/g.test(word) ? "number" - : /^0[xX][a-fA-F0-9]+$/g.test(word) ? "number" - : /^([0-9]+\.[0-9]*)|([0-9]*\.[0-9]+)$/g.test(word) ? "number" - : /^[0-9]+$/g.test(word) ? "number" - : "variable"; - } - return style; - }, - lineComment: "--" - }; -}); - -CodeMirror.defineMIME("text/x-eiffel", "eiffel"); - -}); diff --git a/kallithea/public/codemirror/mode/erlang/erlang.js b/kallithea/public/codemirror/mode/erlang/erlang.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/erlang/erlang.js +++ /dev/null @@ -1,622 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/*jshint unused:true, eqnull:true, curly:true, bitwise:true */ -/*jshint undef:true, latedef:true, trailing:true */ -/*global CodeMirror:true */ - -// erlang mode. -// tokenizer -> token types -> CodeMirror styles -// tokenizer maintains a parse stack -// indenter uses the parse stack - -// TODO indenter: -// bit syntax -// old guard/bif/conversion clashes (e.g. "float/1") -// type/spec/opaque - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMIME("text/x-erlang", "erlang"); - -CodeMirror.defineMode("erlang", function(cmCfg) { - "use strict"; - -///////////////////////////////////////////////////////////////////////////// -// constants - - var typeWords = [ - "-type", "-spec", "-export_type", "-opaque"]; - - var keywordWords = [ - "after","begin","catch","case","cond","end","fun","if", - "let","of","query","receive","try","when"]; - - var separatorRE = /[\->,;]/; - var separatorWords = [ - "->",";",","]; - - var operatorAtomWords = [ - "and","andalso","band","bnot","bor","bsl","bsr","bxor", - "div","not","or","orelse","rem","xor"]; - - var operatorSymbolRE = /[\+\-\*\/<>=\|:!]/; - var operatorSymbolWords = [ - "=","+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-","!"]; - - var openParenRE = /[<\(\[\{]/; - var openParenWords = [ - "<<","(","[","{"]; - - var closeParenRE = /[>\)\]\}]/; - var closeParenWords = [ - "}","]",")",">>"]; - - var guardWords = [ - "is_atom","is_binary","is_bitstring","is_boolean","is_float", - "is_function","is_integer","is_list","is_number","is_pid", - "is_port","is_record","is_reference","is_tuple", - "atom","binary","bitstring","boolean","function","integer","list", - "number","pid","port","record","reference","tuple"]; - - var bifWords = [ - "abs","adler32","adler32_combine","alive","apply","atom_to_binary", - "atom_to_list","binary_to_atom","binary_to_existing_atom", - "binary_to_list","binary_to_term","bit_size","bitstring_to_list", - "byte_size","check_process_code","contact_binary","crc32", - "crc32_combine","date","decode_packet","delete_module", - "disconnect_node","element","erase","exit","float","float_to_list", - "garbage_collect","get","get_keys","group_leader","halt","hd", - "integer_to_list","internal_bif","iolist_size","iolist_to_binary", - "is_alive","is_atom","is_binary","is_bitstring","is_boolean", - "is_float","is_function","is_integer","is_list","is_number","is_pid", - "is_port","is_process_alive","is_record","is_reference","is_tuple", - "length","link","list_to_atom","list_to_binary","list_to_bitstring", - "list_to_existing_atom","list_to_float","list_to_integer", - "list_to_pid","list_to_tuple","load_module","make_ref","module_loaded", - "monitor_node","node","node_link","node_unlink","nodes","notalive", - "now","open_port","pid_to_list","port_close","port_command", - "port_connect","port_control","pre_loaded","process_flag", - "process_info","processes","purge_module","put","register", - "registered","round","self","setelement","size","spawn","spawn_link", - "spawn_monitor","spawn_opt","split_binary","statistics", - "term_to_binary","time","throw","tl","trunc","tuple_size", - "tuple_to_list","unlink","unregister","whereis"]; - -// upper case: [A-Z] [Ø-Þ] [À-Ö] -// lower case: [a-z] [ß-ö] [ø-ÿ] - var anumRE = /[\w@Ø-ÞÀ-Öß-öø-ÿ]/; - var escapesRE = - /[0-7]{1,3}|[bdefnrstv\\"']|\^[a-zA-Z]|x[0-9a-zA-Z]{2}|x{[0-9a-zA-Z]+}/; - -///////////////////////////////////////////////////////////////////////////// -// tokenizer - - function tokenizer(stream,state) { - // in multi-line string - if (state.in_string) { - state.in_string = (!doubleQuote(stream)); - return rval(state,stream,"string"); - } - - // in multi-line atom - if (state.in_atom) { - state.in_atom = (!singleQuote(stream)); - return rval(state,stream,"atom"); - } - - // whitespace - if (stream.eatSpace()) { - return rval(state,stream,"whitespace"); - } - - // attributes and type specs - if (!peekToken(state) && - stream.match(/-\s*[a-zß-öø-ÿ][\wØ-ÞÀ-Öß-öø-ÿ]*/)) { - if (is_member(stream.current(),typeWords)) { - return rval(state,stream,"type"); - }else{ - return rval(state,stream,"attribute"); - } - } - - var ch = stream.next(); - - // comment - if (ch == '%') { - stream.skipToEnd(); - return rval(state,stream,"comment"); - } - - // colon - if (ch == ":") { - return rval(state,stream,"colon"); - } - - // macro - if (ch == '?') { - stream.eatSpace(); - stream.eatWhile(anumRE); - return rval(state,stream,"macro"); - } - - // record - if (ch == "#") { - stream.eatSpace(); - stream.eatWhile(anumRE); - return rval(state,stream,"record"); - } - - // dollar escape - if (ch == "$") { - if (stream.next() == "\\" && !stream.match(escapesRE)) { - return rval(state,stream,"error"); - } - return rval(state,stream,"number"); - } - - // dot - if (ch == ".") { - return rval(state,stream,"dot"); - } - - // quoted atom - if (ch == '\'') { - if (!(state.in_atom = (!singleQuote(stream)))) { - if (stream.match(/\s*\/\s*[0-9]/,false)) { - stream.match(/\s*\/\s*[0-9]/,true); - return rval(state,stream,"fun"); // 'f'/0 style fun - } - if (stream.match(/\s*\(/,false) || stream.match(/\s*:/,false)) { - return rval(state,stream,"function"); - } - } - return rval(state,stream,"atom"); - } - - // string - if (ch == '"') { - state.in_string = (!doubleQuote(stream)); - return rval(state,stream,"string"); - } - - // variable - if (/[A-Z_Ø-ÞÀ-Ö]/.test(ch)) { - stream.eatWhile(anumRE); - return rval(state,stream,"variable"); - } - - // atom/keyword/BIF/function - if (/[a-z_ß-öø-ÿ]/.test(ch)) { - stream.eatWhile(anumRE); - - if (stream.match(/\s*\/\s*[0-9]/,false)) { - stream.match(/\s*\/\s*[0-9]/,true); - return rval(state,stream,"fun"); // f/0 style fun - } - - var w = stream.current(); - - if (is_member(w,keywordWords)) { - return rval(state,stream,"keyword"); - }else if (is_member(w,operatorAtomWords)) { - return rval(state,stream,"operator"); - }else if (stream.match(/\s*\(/,false)) { - // 'put' and 'erlang:put' are bifs, 'foo:put' is not - if (is_member(w,bifWords) && - ((peekToken(state).token != ":") || - (peekToken(state,2).token == "erlang"))) { - return rval(state,stream,"builtin"); - }else if (is_member(w,guardWords)) { - return rval(state,stream,"guard"); - }else{ - return rval(state,stream,"function"); - } - }else if (is_member(w,operatorAtomWords)) { - return rval(state,stream,"operator"); - }else if (lookahead(stream) == ":") { - if (w == "erlang") { - return rval(state,stream,"builtin"); - } else { - return rval(state,stream,"function"); - } - }else if (is_member(w,["true","false"])) { - return rval(state,stream,"boolean"); - }else if (is_member(w,["true","false"])) { - return rval(state,stream,"boolean"); - }else{ - return rval(state,stream,"atom"); - } - } - - // number - var digitRE = /[0-9]/; - var radixRE = /[0-9a-zA-Z]/; // 36#zZ style int - if (digitRE.test(ch)) { - stream.eatWhile(digitRE); - if (stream.eat('#')) { // 36#aZ style integer - if (!stream.eatWhile(radixRE)) { - stream.backUp(1); //"36#" - syntax error - } - } else if (stream.eat('.')) { // float - if (!stream.eatWhile(digitRE)) { - stream.backUp(1); // "3." - probably end of function - } else { - if (stream.eat(/[eE]/)) { // float with exponent - if (stream.eat(/[-+]/)) { - if (!stream.eatWhile(digitRE)) { - stream.backUp(2); // "2e-" - syntax error - } - } else { - if (!stream.eatWhile(digitRE)) { - stream.backUp(1); // "2e" - syntax error - } - } - } - } - } - return rval(state,stream,"number"); // normal integer - } - - // open parens - if (nongreedy(stream,openParenRE,openParenWords)) { - return rval(state,stream,"open_paren"); - } - - // close parens - if (nongreedy(stream,closeParenRE,closeParenWords)) { - return rval(state,stream,"close_paren"); - } - - // separators - if (greedy(stream,separatorRE,separatorWords)) { - return rval(state,stream,"separator"); - } - - // operators - if (greedy(stream,operatorSymbolRE,operatorSymbolWords)) { - return rval(state,stream,"operator"); - } - - return rval(state,stream,null); - } - -///////////////////////////////////////////////////////////////////////////// -// utilities - function nongreedy(stream,re,words) { - if (stream.current().length == 1 && re.test(stream.current())) { - stream.backUp(1); - while (re.test(stream.peek())) { - stream.next(); - if (is_member(stream.current(),words)) { - return true; - } - } - stream.backUp(stream.current().length-1); - } - return false; - } - - function greedy(stream,re,words) { - if (stream.current().length == 1 && re.test(stream.current())) { - while (re.test(stream.peek())) { - stream.next(); - } - while (0 < stream.current().length) { - if (is_member(stream.current(),words)) { - return true; - }else{ - stream.backUp(1); - } - } - stream.next(); - } - return false; - } - - function doubleQuote(stream) { - return quote(stream, '"', '\\'); - } - - function singleQuote(stream) { - return quote(stream,'\'','\\'); - } - - function quote(stream,quoteChar,escapeChar) { - while (!stream.eol()) { - var ch = stream.next(); - if (ch == quoteChar) { - return true; - }else if (ch == escapeChar) { - stream.next(); - } - } - return false; - } - - function lookahead(stream) { - var m = stream.match(/([\n\s]+|%[^\n]*\n)*(.)/,false); - return m ? m.pop() : ""; - } - - function is_member(element,list) { - return (-1 < list.indexOf(element)); - } - - function rval(state,stream,type) { - - // parse stack - pushToken(state,realToken(type,stream)); - - // map erlang token type to CodeMirror style class - // erlang -> CodeMirror tag - switch (type) { - case "atom": return "atom"; - case "attribute": return "attribute"; - case "boolean": return "atom"; - case "builtin": return "builtin"; - case "close_paren": return null; - case "colon": return null; - case "comment": return "comment"; - case "dot": return null; - case "error": return "error"; - case "fun": return "meta"; - case "function": return "tag"; - case "guard": return "property"; - case "keyword": return "keyword"; - case "macro": return "variable-2"; - case "number": return "number"; - case "open_paren": return null; - case "operator": return "operator"; - case "record": return "bracket"; - case "separator": return null; - case "string": return "string"; - case "type": return "def"; - case "variable": return "variable"; - default: return null; - } - } - - function aToken(tok,col,ind,typ) { - return {token: tok, - column: col, - indent: ind, - type: typ}; - } - - function realToken(type,stream) { - return aToken(stream.current(), - stream.column(), - stream.indentation(), - type); - } - - function fakeToken(type) { - return aToken(type,0,0,type); - } - - function peekToken(state,depth) { - var len = state.tokenStack.length; - var dep = (depth ? depth : 1); - - if (len < dep) { - return false; - }else{ - return state.tokenStack[len-dep]; - } - } - - function pushToken(state,token) { - - if (!(token.type == "comment" || token.type == "whitespace")) { - state.tokenStack = maybe_drop_pre(state.tokenStack,token); - state.tokenStack = maybe_drop_post(state.tokenStack); - } - } - - function maybe_drop_pre(s,token) { - var last = s.length-1; - - if (0 < last && s[last].type === "record" && token.type === "dot") { - s.pop(); - }else if (0 < last && s[last].type === "group") { - s.pop(); - s.push(token); - }else{ - s.push(token); - } - return s; - } - - function maybe_drop_post(s) { - var last = s.length-1; - - if (s[last].type === "dot") { - return []; - } - if (s[last].type === "fun" && s[last-1].token === "fun") { - return s.slice(0,last-1); - } - switch (s[s.length-1].token) { - case "}": return d(s,{g:["{"]}); - case "]": return d(s,{i:["["]}); - case ")": return d(s,{i:["("]}); - case ">>": return d(s,{i:["<<"]}); - case "end": return d(s,{i:["begin","case","fun","if","receive","try"]}); - case ",": return d(s,{e:["begin","try","when","->", - ",","(","[","{","<<"]}); - case "->": return d(s,{r:["when"], - m:["try","if","case","receive"]}); - case ";": return d(s,{E:["case","fun","if","receive","try","when"]}); - case "catch":return d(s,{e:["try"]}); - case "of": return d(s,{e:["case"]}); - case "after":return d(s,{e:["receive","try"]}); - default: return s; - } - } - - function d(stack,tt) { - // stack is a stack of Token objects. - // tt is an object; {type:tokens} - // type is a char, tokens is a list of token strings. - // The function returns (possibly truncated) stack. - // It will descend the stack, looking for a Token such that Token.token - // is a member of tokens. If it does not find that, it will normally (but - // see "E" below) return stack. If it does find a match, it will remove - // all the Tokens between the top and the matched Token. - // If type is "m", that is all it does. - // If type is "i", it will also remove the matched Token and the top Token. - // If type is "g", like "i", but add a fake "group" token at the top. - // If type is "r", it will remove the matched Token, but not the top Token. - // If type is "e", it will keep the matched Token but not the top Token. - // If type is "E", it behaves as for type "e", except if there is no match, - // in which case it will return an empty stack. - - for (var type in tt) { - var len = stack.length-1; - var tokens = tt[type]; - for (var i = len-1; -1 < i ; i--) { - if (is_member(stack[i].token,tokens)) { - var ss = stack.slice(0,i); - switch (type) { - case "m": return ss.concat(stack[i]).concat(stack[len]); - case "r": return ss.concat(stack[len]); - case "i": return ss; - case "g": return ss.concat(fakeToken("group")); - case "E": return ss.concat(stack[i]); - case "e": return ss.concat(stack[i]); - } - } - } - } - return (type == "E" ? [] : stack); - } - -///////////////////////////////////////////////////////////////////////////// -// indenter - - function indenter(state,textAfter) { - var t; - var unit = cmCfg.indentUnit; - var wordAfter = wordafter(textAfter); - var currT = peekToken(state,1); - var prevT = peekToken(state,2); - - if (state.in_string || state.in_atom) { - return CodeMirror.Pass; - }else if (!prevT) { - return 0; - }else if (currT.token == "when") { - return currT.column+unit; - }else if (wordAfter === "when" && prevT.type === "function") { - return prevT.indent+unit; - }else if (wordAfter === "(" && currT.token === "fun") { - return currT.column+3; - }else if (wordAfter === "catch" && (t = getToken(state,["try"]))) { - return t.column; - }else if (is_member(wordAfter,["end","after","of"])) { - t = getToken(state,["begin","case","fun","if","receive","try"]); - return t ? t.column : CodeMirror.Pass; - }else if (is_member(wordAfter,closeParenWords)) { - t = getToken(state,openParenWords); - return t ? t.column : CodeMirror.Pass; - }else if (is_member(currT.token,[",","|","||"]) || - is_member(wordAfter,[",","|","||"])) { - t = postcommaToken(state); - return t ? t.column+t.token.length : unit; - }else if (currT.token == "->") { - if (is_member(prevT.token, ["receive","case","if","try"])) { - return prevT.column+unit+unit; - }else{ - return prevT.column+unit; - } - }else if (is_member(currT.token,openParenWords)) { - return currT.column+currT.token.length; - }else{ - t = defaultToken(state); - return truthy(t) ? t.column+unit : 0; - } - } - - function wordafter(str) { - var m = str.match(/,|[a-z]+|\}|\]|\)|>>|\|+|\(/); - - return truthy(m) && (m.index === 0) ? m[0] : ""; - } - - function postcommaToken(state) { - var objs = state.tokenStack.slice(0,-1); - var i = getTokenIndex(objs,"type",["open_paren"]); - - return truthy(objs[i]) ? objs[i] : false; - } - - function defaultToken(state) { - var objs = state.tokenStack; - var stop = getTokenIndex(objs,"type",["open_paren","separator","keyword"]); - var oper = getTokenIndex(objs,"type",["operator"]); - - if (truthy(stop) && truthy(oper) && stop < oper) { - return objs[stop+1]; - } else if (truthy(stop)) { - return objs[stop]; - } else { - return false; - } - } - - function getToken(state,tokens) { - var objs = state.tokenStack; - var i = getTokenIndex(objs,"token",tokens); - - return truthy(objs[i]) ? objs[i] : false; - } - - function getTokenIndex(objs,propname,propvals) { - - for (var i = objs.length-1; -1 < i ; i--) { - if (is_member(objs[i][propname],propvals)) { - return i; - } - } - return false; - } - - function truthy(x) { - return (x !== false) && (x != null); - } - -///////////////////////////////////////////////////////////////////////////// -// this object defines the mode - - return { - startState: - function() { - return {tokenStack: [], - in_string: false, - in_atom: false}; - }, - - token: - function(stream, state) { - return tokenizer(stream, state); - }, - - indent: - function(state, textAfter) { - return indenter(state,textAfter); - }, - - lineComment: "%" - }; -}); - -}); diff --git a/kallithea/public/codemirror/mode/fortran/fortran.js b/kallithea/public/codemirror/mode/fortran/fortran.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/fortran/fortran.js +++ /dev/null @@ -1,188 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("fortran", function() { - function words(array) { - var keys = {}; - for (var i = 0; i < array.length; ++i) { - keys[array[i]] = true; - } - return keys; - } - - var keywords = words([ - "abstract", "accept", "allocatable", "allocate", - "array", "assign", "asynchronous", "backspace", - "bind", "block", "byte", "call", "case", - "class", "close", "common", "contains", - "continue", "cycle", "data", "deallocate", - "decode", "deferred", "dimension", "do", - "elemental", "else", "encode", "end", - "endif", "entry", "enumerator", "equivalence", - "exit", "external", "extrinsic", "final", - "forall", "format", "function", "generic", - "go", "goto", "if", "implicit", "import", "include", - "inquire", "intent", "interface", "intrinsic", - "module", "namelist", "non_intrinsic", - "non_overridable", "none", "nopass", - "nullify", "open", "optional", "options", - "parameter", "pass", "pause", "pointer", - "print", "private", "program", "protected", - "public", "pure", "read", "recursive", "result", - "return", "rewind", "save", "select", "sequence", - "stop", "subroutine", "target", "then", "to", "type", - "use", "value", "volatile", "where", "while", - "write"]); - var builtins = words(["abort", "abs", "access", "achar", "acos", - "adjustl", "adjustr", "aimag", "aint", "alarm", - "all", "allocated", "alog", "amax", "amin", - "amod", "and", "anint", "any", "asin", - "associated", "atan", "besj", "besjn", "besy", - "besyn", "bit_size", "btest", "cabs", "ccos", - "ceiling", "cexp", "char", "chdir", "chmod", - "clog", "cmplx", "command_argument_count", - "complex", "conjg", "cos", "cosh", "count", - "cpu_time", "cshift", "csin", "csqrt", "ctime", - "c_funloc", "c_loc", "c_associated", "c_null_ptr", - "c_null_funptr", "c_f_pointer", "c_null_char", - "c_alert", "c_backspace", "c_form_feed", - "c_new_line", "c_carriage_return", - "c_horizontal_tab", "c_vertical_tab", "dabs", - "dacos", "dasin", "datan", "date_and_time", - "dbesj", "dbesj", "dbesjn", "dbesy", "dbesy", - "dbesyn", "dble", "dcos", "dcosh", "ddim", "derf", - "derfc", "dexp", "digits", "dim", "dint", "dlog", - "dlog", "dmax", "dmin", "dmod", "dnint", - "dot_product", "dprod", "dsign", "dsinh", - "dsin", "dsqrt", "dtanh", "dtan", "dtime", - "eoshift", "epsilon", "erf", "erfc", "etime", - "exit", "exp", "exponent", "extends_type_of", - "fdate", "fget", "fgetc", "float", "floor", - "flush", "fnum", "fputc", "fput", "fraction", - "fseek", "fstat", "ftell", "gerror", "getarg", - "get_command", "get_command_argument", - "get_environment_variable", "getcwd", - "getenv", "getgid", "getlog", "getpid", - "getuid", "gmtime", "hostnm", "huge", "iabs", - "iachar", "iand", "iargc", "ibclr", "ibits", - "ibset", "ichar", "idate", "idim", "idint", - "idnint", "ieor", "ierrno", "ifix", "imag", - "imagpart", "index", "int", "ior", "irand", - "isatty", "ishft", "ishftc", "isign", - "iso_c_binding", "is_iostat_end", "is_iostat_eor", - "itime", "kill", "kind", "lbound", "len", "len_trim", - "lge", "lgt", "link", "lle", "llt", "lnblnk", "loc", - "log", "logical", "long", "lshift", "lstat", "ltime", - "matmul", "max", "maxexponent", "maxloc", "maxval", - "mclock", "merge", "move_alloc", "min", "minexponent", - "minloc", "minval", "mod", "modulo", "mvbits", - "nearest", "new_line", "nint", "not", "or", "pack", - "perror", "precision", "present", "product", "radix", - "rand", "random_number", "random_seed", "range", - "real", "realpart", "rename", "repeat", "reshape", - "rrspacing", "rshift", "same_type_as", "scale", - "scan", "second", "selected_int_kind", - "selected_real_kind", "set_exponent", "shape", - "short", "sign", "signal", "sinh", "sin", "sleep", - "sngl", "spacing", "spread", "sqrt", "srand", "stat", - "sum", "symlnk", "system", "system_clock", "tan", - "tanh", "time", "tiny", "transfer", "transpose", - "trim", "ttynam", "ubound", "umask", "unlink", - "unpack", "verify", "xor", "zabs", "zcos", "zexp", - "zlog", "zsin", "zsqrt"]); - - var dataTypes = words(["c_bool", "c_char", "c_double", "c_double_complex", - "c_float", "c_float_complex", "c_funptr", "c_int", - "c_int16_t", "c_int32_t", "c_int64_t", "c_int8_t", - "c_int_fast16_t", "c_int_fast32_t", "c_int_fast64_t", - "c_int_fast8_t", "c_int_least16_t", "c_int_least32_t", - "c_int_least64_t", "c_int_least8_t", "c_intmax_t", - "c_intptr_t", "c_long", "c_long_double", - "c_long_double_complex", "c_long_long", "c_ptr", - "c_short", "c_signed_char", "c_size_t", "character", - "complex", "double", "integer", "logical", "real"]); - var isOperatorChar = /[+\-*&=<>\/\:]/; - var litOperator = new RegExp("(\.and\.|\.or\.|\.eq\.|\.lt\.|\.le\.|\.gt\.|\.ge\.|\.ne\.|\.not\.|\.eqv\.|\.neqv\.)", "i"); - - function tokenBase(stream, state) { - - if (stream.match(litOperator)){ - return 'operator'; - } - - var ch = stream.next(); - if (ch == "!") { - stream.skipToEnd(); - return "comment"; - } - if (ch == '"' || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } - if (/[\[\]\(\),]/.test(ch)) { - return null; - } - if (/\d/.test(ch)) { - stream.eatWhile(/[\w\.]/); - return "number"; - } - if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return "operator"; - } - stream.eatWhile(/[\w\$_]/); - var word = stream.current().toLowerCase(); - - if (keywords.hasOwnProperty(word)){ - return 'keyword'; - } - if (builtins.hasOwnProperty(word) || dataTypes.hasOwnProperty(word)) { - return 'builtin'; - } - return "variable"; - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next, end = false; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) { - end = true; - break; - } - escaped = !escaped && next == "\\"; - } - if (end || !escaped) state.tokenize = null; - return "string"; - }; - } - - // Interface - - return { - startState: function() { - return {tokenize: null}; - }, - - token: function(stream, state) { - if (stream.eatSpace()) return null; - var style = (state.tokenize || tokenBase)(stream, state); - if (style == "comment" || style == "meta") return style; - return style; - } - }; -}); - -CodeMirror.defineMIME("text/x-fortran", "fortran"); - -}); diff --git a/kallithea/public/codemirror/mode/gas/gas.js b/kallithea/public/codemirror/mode/gas/gas.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/gas/gas.js +++ /dev/null @@ -1,345 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("gas", function(_config, parserConfig) { - 'use strict'; - - // If an architecture is specified, its initialization function may - // populate this array with custom parsing functions which will be - // tried in the event that the standard functions do not find a match. - var custom = []; - - // The symbol used to start a line comment changes based on the target - // architecture. - // If no architecture is pased in "parserConfig" then only multiline - // comments will have syntax support. - var lineCommentStartSymbol = ""; - - // These directives are architecture independent. - // Machine specific directives should go in their respective - // architecture initialization function. - // Reference: - // http://sourceware.org/binutils/docs/as/Pseudo-Ops.html#Pseudo-Ops - var directives = { - ".abort" : "builtin", - ".align" : "builtin", - ".altmacro" : "builtin", - ".ascii" : "builtin", - ".asciz" : "builtin", - ".balign" : "builtin", - ".balignw" : "builtin", - ".balignl" : "builtin", - ".bundle_align_mode" : "builtin", - ".bundle_lock" : "builtin", - ".bundle_unlock" : "builtin", - ".byte" : "builtin", - ".cfi_startproc" : "builtin", - ".comm" : "builtin", - ".data" : "builtin", - ".def" : "builtin", - ".desc" : "builtin", - ".dim" : "builtin", - ".double" : "builtin", - ".eject" : "builtin", - ".else" : "builtin", - ".elseif" : "builtin", - ".end" : "builtin", - ".endef" : "builtin", - ".endfunc" : "builtin", - ".endif" : "builtin", - ".equ" : "builtin", - ".equiv" : "builtin", - ".eqv" : "builtin", - ".err" : "builtin", - ".error" : "builtin", - ".exitm" : "builtin", - ".extern" : "builtin", - ".fail" : "builtin", - ".file" : "builtin", - ".fill" : "builtin", - ".float" : "builtin", - ".func" : "builtin", - ".global" : "builtin", - ".gnu_attribute" : "builtin", - ".hidden" : "builtin", - ".hword" : "builtin", - ".ident" : "builtin", - ".if" : "builtin", - ".incbin" : "builtin", - ".include" : "builtin", - ".int" : "builtin", - ".internal" : "builtin", - ".irp" : "builtin", - ".irpc" : "builtin", - ".lcomm" : "builtin", - ".lflags" : "builtin", - ".line" : "builtin", - ".linkonce" : "builtin", - ".list" : "builtin", - ".ln" : "builtin", - ".loc" : "builtin", - ".loc_mark_labels" : "builtin", - ".local" : "builtin", - ".long" : "builtin", - ".macro" : "builtin", - ".mri" : "builtin", - ".noaltmacro" : "builtin", - ".nolist" : "builtin", - ".octa" : "builtin", - ".offset" : "builtin", - ".org" : "builtin", - ".p2align" : "builtin", - ".popsection" : "builtin", - ".previous" : "builtin", - ".print" : "builtin", - ".protected" : "builtin", - ".psize" : "builtin", - ".purgem" : "builtin", - ".pushsection" : "builtin", - ".quad" : "builtin", - ".reloc" : "builtin", - ".rept" : "builtin", - ".sbttl" : "builtin", - ".scl" : "builtin", - ".section" : "builtin", - ".set" : "builtin", - ".short" : "builtin", - ".single" : "builtin", - ".size" : "builtin", - ".skip" : "builtin", - ".sleb128" : "builtin", - ".space" : "builtin", - ".stab" : "builtin", - ".string" : "builtin", - ".struct" : "builtin", - ".subsection" : "builtin", - ".symver" : "builtin", - ".tag" : "builtin", - ".text" : "builtin", - ".title" : "builtin", - ".type" : "builtin", - ".uleb128" : "builtin", - ".val" : "builtin", - ".version" : "builtin", - ".vtable_entry" : "builtin", - ".vtable_inherit" : "builtin", - ".warning" : "builtin", - ".weak" : "builtin", - ".weakref" : "builtin", - ".word" : "builtin" - }; - - var registers = {}; - - function x86(_parserConfig) { - lineCommentStartSymbol = "#"; - - registers.ax = "variable"; - registers.eax = "variable-2"; - registers.rax = "variable-3"; - - registers.bx = "variable"; - registers.ebx = "variable-2"; - registers.rbx = "variable-3"; - - registers.cx = "variable"; - registers.ecx = "variable-2"; - registers.rcx = "variable-3"; - - registers.dx = "variable"; - registers.edx = "variable-2"; - registers.rdx = "variable-3"; - - registers.si = "variable"; - registers.esi = "variable-2"; - registers.rsi = "variable-3"; - - registers.di = "variable"; - registers.edi = "variable-2"; - registers.rdi = "variable-3"; - - registers.sp = "variable"; - registers.esp = "variable-2"; - registers.rsp = "variable-3"; - - registers.bp = "variable"; - registers.ebp = "variable-2"; - registers.rbp = "variable-3"; - - registers.ip = "variable"; - registers.eip = "variable-2"; - registers.rip = "variable-3"; - - registers.cs = "keyword"; - registers.ds = "keyword"; - registers.ss = "keyword"; - registers.es = "keyword"; - registers.fs = "keyword"; - registers.gs = "keyword"; - } - - function armv6(_parserConfig) { - // Reference: - // http://infocenter.arm.com/help/topic/com.arm.doc.qrc0001l/QRC0001_UAL.pdf - // http://infocenter.arm.com/help/topic/com.arm.doc.ddi0301h/DDI0301H_arm1176jzfs_r0p7_trm.pdf - lineCommentStartSymbol = "@"; - directives.syntax = "builtin"; - - registers.r0 = "variable"; - registers.r1 = "variable"; - registers.r2 = "variable"; - registers.r3 = "variable"; - registers.r4 = "variable"; - registers.r5 = "variable"; - registers.r6 = "variable"; - registers.r7 = "variable"; - registers.r8 = "variable"; - registers.r9 = "variable"; - registers.r10 = "variable"; - registers.r11 = "variable"; - registers.r12 = "variable"; - - registers.sp = "variable-2"; - registers.lr = "variable-2"; - registers.pc = "variable-2"; - registers.r13 = registers.sp; - registers.r14 = registers.lr; - registers.r15 = registers.pc; - - custom.push(function(ch, stream) { - if (ch === '#') { - stream.eatWhile(/\w/); - return "number"; - } - }); - } - - var arch = (parserConfig.architecture || "x86").toLowerCase(); - if (arch === "x86") { - x86(parserConfig); - } else if (arch === "arm" || arch === "armv6") { - armv6(parserConfig); - } - - function nextUntilUnescaped(stream, end) { - var escaped = false, next; - while ((next = stream.next()) != null) { - if (next === end && !escaped) { - return false; - } - escaped = !escaped && next === "\\"; - } - return escaped; - } - - function clikeComment(stream, state) { - var maybeEnd = false, ch; - while ((ch = stream.next()) != null) { - if (ch === "/" && maybeEnd) { - state.tokenize = null; - break; - } - maybeEnd = (ch === "*"); - } - return "comment"; - } - - return { - startState: function() { - return { - tokenize: null - }; - }, - - token: function(stream, state) { - if (state.tokenize) { - return state.tokenize(stream, state); - } - - if (stream.eatSpace()) { - return null; - } - - var style, cur, ch = stream.next(); - - if (ch === "/") { - if (stream.eat("*")) { - state.tokenize = clikeComment; - return clikeComment(stream, state); - } - } - - if (ch === lineCommentStartSymbol) { - stream.skipToEnd(); - return "comment"; - } - - if (ch === '"') { - nextUntilUnescaped(stream, '"'); - return "string"; - } - - if (ch === '.') { - stream.eatWhile(/\w/); - cur = stream.current().toLowerCase(); - style = directives[cur]; - return style || null; - } - - if (ch === '=') { - stream.eatWhile(/\w/); - return "tag"; - } - - if (ch === '{') { - return "braket"; - } - - if (ch === '}') { - return "braket"; - } - - if (/\d/.test(ch)) { - if (ch === "0" && stream.eat("x")) { - stream.eatWhile(/[0-9a-fA-F]/); - return "number"; - } - stream.eatWhile(/\d/); - return "number"; - } - - if (/\w/.test(ch)) { - stream.eatWhile(/\w/); - if (stream.eat(":")) { - return 'tag'; - } - cur = stream.current().toLowerCase(); - style = registers[cur]; - return style || null; - } - - for (var i = 0; i < custom.length; i++) { - style = custom[i](ch, stream, state); - if (style) { - return style; - } - } - }, - - lineComment: lineCommentStartSymbol, - blockCommentStart: "/*", - blockCommentEnd: "*/" - }; -}); - -}); diff --git a/kallithea/public/codemirror/mode/gfm/gfm.js b/kallithea/public/codemirror/mode/gfm/gfm.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/gfm/gfm.js +++ /dev/null @@ -1,122 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../markdown/markdown"), require("../../addon/mode/overlay")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../markdown/markdown", "../../addon/mode/overlay"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("gfm", function(config, modeConfig) { - var codeDepth = 0; - function blankLine(state) { - state.code = false; - return null; - } - var gfmOverlay = { - startState: function() { - return { - code: false, - codeBlock: false, - ateSpace: false - }; - }, - copyState: function(s) { - return { - code: s.code, - codeBlock: s.codeBlock, - ateSpace: s.ateSpace - }; - }, - token: function(stream, state) { - state.combineTokens = null; - - // Hack to prevent formatting override inside code blocks (block and inline) - if (state.codeBlock) { - if (stream.match(/^```/)) { - state.codeBlock = false; - return null; - } - stream.skipToEnd(); - return null; - } - if (stream.sol()) { - state.code = false; - } - if (stream.sol() && stream.match(/^```/)) { - stream.skipToEnd(); - state.codeBlock = true; - return null; - } - // If this block is changed, it may need to be updated in Markdown mode - if (stream.peek() === '`') { - stream.next(); - var before = stream.pos; - stream.eatWhile('`'); - var difference = 1 + stream.pos - before; - if (!state.code) { - codeDepth = difference; - state.code = true; - } else { - if (difference === codeDepth) { // Must be exact - state.code = false; - } - } - return null; - } else if (state.code) { - stream.next(); - return null; - } - // Check if space. If so, links can be formatted later on - if (stream.eatSpace()) { - state.ateSpace = true; - return null; - } - if (stream.sol() || state.ateSpace) { - state.ateSpace = false; - if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) { - // User/Project@SHA - // User@SHA - // SHA - state.combineTokens = true; - return "link"; - } else if (stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/)) { - // User/Project#Num - // User#Num - // #Num - state.combineTokens = true; - return "link"; - } - } - if (stream.match(/^((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i) && - stream.string.slice(stream.start - 2, stream.start) != "](") { - // URLs - // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls - // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine - state.combineTokens = true; - return "link"; - } - stream.next(); - return null; - }, - blankLine: blankLine - }; - - var markdownConfig = { - underscoresBreakWords: false, - taskLists: true, - fencedCodeBlocks: true - }; - for (var attr in modeConfig) { - markdownConfig[attr] = modeConfig[attr]; - } - markdownConfig.name = "markdown"; - CodeMirror.defineMIME("gfmBase", markdownConfig); - return CodeMirror.overlayMode(CodeMirror.getMode(config, "gfmBase"), gfmOverlay); -}, "markdown"); - -}); diff --git a/kallithea/public/codemirror/mode/gherkin/gherkin.js b/kallithea/public/codemirror/mode/gherkin/gherkin.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/gherkin/gherkin.js +++ /dev/null @@ -1,178 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/* -Gherkin mode - http://www.cukes.info/ -Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues -*/ - -// Following Objs from Brackets implementation: https://github.com/tregusti/brackets-gherkin/blob/master/main.js -//var Quotes = { -// SINGLE: 1, -// DOUBLE: 2 -//}; - -//var regex = { -// keywords: /(Feature| {2}(Scenario|In order to|As|I)| {4}(Given|When|Then|And))/ -//}; - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("gherkin", function () { - return { - startState: function () { - return { - lineNumber: 0, - tableHeaderLine: false, - allowFeature: true, - allowBackground: false, - allowScenario: false, - allowSteps: false, - allowPlaceholders: false, - allowMultilineArgument: false, - inMultilineString: false, - inMultilineTable: false, - inKeywordLine: false - }; - }, - token: function (stream, state) { - if (stream.sol()) { - state.lineNumber++; - state.inKeywordLine = false; - if (state.inMultilineTable) { - state.tableHeaderLine = false; - if (!stream.match(/\s*\|/, false)) { - state.allowMultilineArgument = false; - state.inMultilineTable = false; - } - } - } - - stream.eatSpace(); - - if (state.allowMultilineArgument) { - - // STRING - if (state.inMultilineString) { - if (stream.match('"""')) { - state.inMultilineString = false; - state.allowMultilineArgument = false; - } else { - stream.match(/.*/); - } - return "string"; - } - - // TABLE - if (state.inMultilineTable) { - if (stream.match(/\|\s*/)) { - return "bracket"; - } else { - stream.match(/[^\|]*/); - return state.tableHeaderLine ? "header" : "string"; - } - } - - // DETECT START - if (stream.match('"""')) { - // String - state.inMultilineString = true; - return "string"; - } else if (stream.match("|")) { - // Table - state.inMultilineTable = true; - state.tableHeaderLine = true; - return "bracket"; - } - - } - - // LINE COMMENT - if (stream.match(/#.*/)) { - return "comment"; - - // TAG - } else if (!state.inKeywordLine && stream.match(/@\S+/)) { - return "tag"; - - // FEATURE - } else if (!state.inKeywordLine && state.allowFeature && stream.match(/(機能|功能|フィーチャ|기능|โครงหลัก|ความสามารถ|ความต้องการทางธุรกิจ|ಹೆಚ್ಚಳ|గుణము|ਮੁਹਾਂਦਰਾ|ਨਕਸ਼ ਨੁਹਾਰ|ਖਾਸੀਅਤ|रूप लेख|وِیژگی|خاصية|תכונה|Функціонал|Функция|Функционалност|Функционал|Үзенчәлеклелек|Свойство|Особина|Мөмкинлек|Могућност|Λειτουργία|Δυνατότητα|Właściwość|Vlastnosť|Trajto|Tính năng|Savybė|Pretty much|Požiadavka|Požadavek|Potrzeba biznesowa|Özellik|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Hwæt|Hwaet|Funzionalità|Funktionalitéit|Funktionalität|Funkcja|Funkcionalnost|Funkcionalitāte|Funkcia|Fungsi|Functionaliteit|Funcționalitate|Funcţionalitate|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Fīča|Feature|Eiginleiki|Egenskap|Egenskab|Característica|Caracteristica|Business Need|Aspekt|Arwedd|Ahoy matey!|Ability):/)) { - state.allowScenario = true; - state.allowBackground = true; - state.allowPlaceholders = false; - state.allowSteps = false; - state.allowMultilineArgument = false; - state.inKeywordLine = true; - return "keyword"; - - // BACKGROUND - } else if (!state.inKeywordLine && state.allowBackground && stream.match(/(背景|배경|แนวคิด|ಹಿನ್ನೆಲೆ|నేపథ్యం|ਪਿਛੋਕੜ|पृष्ठभूमि|زمینه|الخلفية|רקע|Тарих|Предыстория|Предистория|Позадина|Передумова|Основа|Контекст|Кереш|Υπόβαθρο|Założenia|Yo\-ho\-ho|Tausta|Taust|Situācija|Rerefons|Pozadina|Pozadie|Pozadí|Osnova|Latar Belakang|Kontext|Konteksts|Kontekstas|Kontekst|Háttér|Hannergrond|Grundlage|Geçmiş|Fundo|Fono|First off|Dis is what went down|Dasar|Contexto|Contexte|Context|Contesto|Cenário de Fundo|Cenario de Fundo|Cefndir|Bối cảnh|Bakgrunnur|Bakgrunn|Bakgrund|Baggrund|Background|B4|Antecedents|Antecedentes|Ær|Aer|Achtergrond):/)) { - state.allowPlaceholders = false; - state.allowSteps = true; - state.allowBackground = false; - state.allowMultilineArgument = false; - state.inKeywordLine = true; - return "keyword"; - - // SCENARIO OUTLINE - } else if (!state.inKeywordLine && state.allowScenario && stream.match(/(場景大綱|场景大纲|劇本大綱|剧本大纲|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|시나리오 개요|สรุปเหตุการณ์|โครงสร้างของเหตุการณ์|ವಿವರಣೆ|కథనం|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਟਕਥਾ ਢਾਂਚਾ|परिदृश्य रूपरेखा|سيناريو مخطط|الگوی سناریو|תבנית תרחיש|Сценарийның төзелеше|Сценарий структураси|Структура сценарію|Структура сценария|Структура сценарија|Скица|Рамка на сценарий|Концепт|Περιγραφή Σεναρίου|Wharrimean is|Template Situai|Template Senario|Template Keadaan|Tapausaihio|Szenariogrundriss|Szablon scenariusza|Swa hwær swa|Swa hwaer swa|Struktura scenarija|Structură scenariu|Structura scenariu|Skica|Skenario konsep|Shiver me timbers|Senaryo taslağı|Schema dello scenario|Scenariomall|Scenariomal|Scenario Template|Scenario Outline|Scenario Amlinellol|Scenārijs pēc parauga|Scenarijaus šablonas|Reckon it's like|Raamstsenaarium|Plang vum Szenario|Plan du Scénario|Plan du scénario|Osnova scénáře|Osnova Scenára|Náčrt Scenáru|Náčrt Scénáře|Náčrt Scenára|MISHUN SRSLY|Menggariskan Senario|Lýsing Dæma|Lýsing Atburðarásar|Konturo de la scenaro|Koncept|Khung tình huống|Khung kịch bản|Forgatókönyv vázlat|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l'escenari|Esbozo do escenario|Delineação do Cenário|Delineacao do Cenario|All y'all|Abstrakt Scenario|Abstract Scenario):/)) { - state.allowPlaceholders = true; - state.allowSteps = true; - state.allowMultilineArgument = false; - state.inKeywordLine = true; - return "keyword"; - - // EXAMPLES - } else if (state.allowScenario && stream.match(/(例子|例|サンプル|예|ชุดของเหตุการณ์|ชุดของตัวอย่าง|ಉದಾಹರಣೆಗಳು|ఉదాహరణలు|ਉਦਾਹਰਨਾਂ|उदाहरण|نمونه ها|امثلة|דוגמאות|Үрнәкләр|Сценарији|Примеры|Примери|Приклади|Мисоллар|Мисаллар|Σενάρια|Παραδείγματα|You'll wanna|Voorbeelden|Variantai|Tapaukset|Se þe|Se the|Se ðe|Scenarios|Scenariji|Scenarijai|Przykłady|Primjeri|Primeri|Příklady|Príklady|Piemēri|Példák|Pavyzdžiai|Paraugs|Örnekler|Juhtumid|Exemplos|Exemples|Exemple|Exempel|EXAMPLZ|Examples|Esempi|Enghreifftiau|Ekzemploj|Eksempler|Ejemplos|Dữ liệu|Dead men tell no tales|Dæmi|Contoh|Cenários|Cenarios|Beispiller|Beispiele|Atburðarásir):/)) { - state.allowPlaceholders = false; - state.allowSteps = true; - state.allowBackground = false; - state.allowMultilineArgument = true; - return "keyword"; - - // SCENARIO - } else if (!state.inKeywordLine && state.allowScenario && stream.match(/(場景|场景|劇本|剧本|シナリオ|시나리오|เหตุการณ์|ಕಥಾಸಾರಾಂಶ|సన్నివేశం|ਪਟਕਥਾ|परिदृश्य|سيناريو|سناریو|תרחיש|Сценарій|Сценарио|Сценарий|Пример|Σενάριο|Tình huống|The thing of it is|Tapaus|Szenario|Swa|Stsenaarium|Skenario|Situai|Senaryo|Senario|Scenaro|Scenariusz|Scenariu|Scénario|Scenario|Scenarijus|Scenārijs|Scenarij|Scenarie|Scénář|Scenár|Primer|MISHUN|Kịch bản|Keadaan|Heave to|Forgatókönyv|Escenario|Escenari|Cenário|Cenario|Awww, look mate|Atburðarás):/)) { - state.allowPlaceholders = false; - state.allowSteps = true; - state.allowBackground = false; - state.allowMultilineArgument = false; - state.inKeywordLine = true; - return "keyword"; - - // STEPS - } else if (!state.inKeywordLine && state.allowSteps && stream.match(/(那麼|那么|而且|當|当|并且|同時|同时|前提|假设|假設|假定|假如|但是|但し|並且|もし|ならば|ただし|しかし|かつ|하지만|조건|먼저|만일|만약|단|그리고|그러면|และ |เมื่อ |แต่ |ดังนั้น |กำหนดให้ |ಸ್ಥಿತಿಯನ್ನು |ಮತ್ತು |ನೀಡಿದ |ನಂತರ |ಆದರೆ |మరియు |చెప్పబడినది |కాని |ఈ పరిస్థితిలో |అప్పుడు |ਪਰ |ਤਦ |ਜੇਕਰ |ਜਿਵੇਂ ਕਿ |ਜਦੋਂ |ਅਤੇ |यदि |परन्तु |पर |तब |तदा |तथा |जब |चूंकि |किन्तु |कदा |और |अगर |و |هنگامی |متى |لكن |عندما |ثم |بفرض |با فرض |اما |اذاً |آنگاه |כאשר |וגם |בהינתן |אזי |אז |אבל |Якщо |Һәм |Унда |Тоді |Тогда |То |Также |Та |Пусть |Припустимо, що |Припустимо |Онда |Но |Нехай |Нәтиҗәдә |Лекин |Ләкин |Коли |Когда |Когато |Када |Кад |К тому же |І |И |Задато |Задати |Задате |Если |Допустим |Дано |Дадено |Вә |Ва |Бирок |Әмма |Әйтик |Әгәр |Аммо |Али |Але |Агар |А також |А |Τότε |Όταν |Και |Δεδομένου |Αλλά |Þurh |Þegar |Þa þe |Þá |Þa |Zatati |Zakładając |Zadato |Zadate |Zadano |Zadani |Zadan |Za předpokladu |Za predpokladu |Youse know when youse got |Youse know like when |Yna |Yeah nah |Y'know |Y |Wun |Wtedy |When y'all |When |Wenn |WEN |wann |Ve |Và |Und |Un |ugeholl |Too right |Thurh |Thì |Then y'all |Then |Tha the |Tha |Tetapi |Tapi |Tak |Tada |Tad |Stel |Soit |Siis |Și |Şi |Si |Sed |Se |Så |Quando |Quand |Quan |Pryd |Potom |Pokud |Pokiaľ |Però |Pero |Pak |Oraz |Onda |Ond |Oletetaan |Og |Och |O zaman |Niin |Nhưng |När |Når |Mutta |Men |Mas |Maka |Majd |Mając |Mais |Maar |mä |Ma |Lorsque |Lorsqu'|Logo |Let go and haul |Kun |Kuid |Kui |Kiedy |Khi |Ketika |Kemudian |Keď |Když |Kaj |Kai |Kada |Kad |Jeżeli |Jeśli |Ja |It's just unbelievable |Ir |I CAN HAZ |I |Ha |Givun |Givet |Given y'all |Given |Gitt |Gegeven |Gegeben seien |Gegeben sei |Gdy |Gangway! |Fakat |Étant donnés |Etant donnés |Étant données |Etant données |Étant donnée |Etant donnée |Étant donné |Etant donné |Et |És |Entonces |Entón |Então |Entao |En |Eğer ki |Ef |Eeldades |E |Ðurh |Duota |Dun |Donitaĵo |Donat |Donada |Do |Diyelim ki |Diberi |Dengan |Den youse gotta |DEN |De |Dato |Dați fiind |Daţi fiind |Dati fiind |Dati |Date fiind |Date |Data |Dat fiind |Dar |Dann |dann |Dan |Dados |Dado |Dadas |Dada |Ða ðe |Ða |Cuando |Cho |Cando |Când |Cand |Cal |But y'all |But at the end of the day I reckon |BUT |But |Buh |Blimey! |Biết |Bet |Bagi |Aye |awer |Avast! |Atunci |Atesa |Atès |Apabila |Anrhegedig a |Angenommen |And y'all |And |AN |An |an |Amikor |Amennyiben |Ama |Als |Alors |Allora |Ali |Aleshores |Ale |Akkor |Ak |Adott |Ac |Aber |A zároveň |A tiež |A taktiež |A také |A |a |7 |\* )/)) { - state.inStep = true; - state.allowPlaceholders = true; - state.allowMultilineArgument = true; - state.inKeywordLine = true; - return "keyword"; - - // INLINE STRING - } else if (stream.match(/"[^"]*"?/)) { - return "string"; - - // PLACEHOLDER - } else if (state.allowPlaceholders && stream.match(/<[^>]*>?/)) { - return "variable"; - - // Fall through - } else { - stream.next(); - stream.eatWhile(/[^@"<#]/); - return null; - } - } - }; -}); - -CodeMirror.defineMIME("text/x-feature", "gherkin"); - -}); diff --git a/kallithea/public/codemirror/mode/go/go.js b/kallithea/public/codemirror/mode/go/go.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/go/go.js +++ /dev/null @@ -1,184 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("go", function(config) { - var indentUnit = config.indentUnit; - - var keywords = { - "break":true, "case":true, "chan":true, "const":true, "continue":true, - "default":true, "defer":true, "else":true, "fallthrough":true, "for":true, - "func":true, "go":true, "goto":true, "if":true, "import":true, - "interface":true, "map":true, "package":true, "range":true, "return":true, - "select":true, "struct":true, "switch":true, "type":true, "var":true, - "bool":true, "byte":true, "complex64":true, "complex128":true, - "float32":true, "float64":true, "int8":true, "int16":true, "int32":true, - "int64":true, "string":true, "uint8":true, "uint16":true, "uint32":true, - "uint64":true, "int":true, "uint":true, "uintptr":true - }; - - var atoms = { - "true":true, "false":true, "iota":true, "nil":true, "append":true, - "cap":true, "close":true, "complex":true, "copy":true, "imag":true, - "len":true, "make":true, "new":true, "panic":true, "print":true, - "println":true, "real":true, "recover":true - }; - - var isOperatorChar = /[+\-*&^%:=<>!|\/]/; - - var curPunc; - - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"' || ch == "'" || ch == "`") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } - if (/[\d\.]/.test(ch)) { - if (ch == ".") { - stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/); - } else if (ch == "0") { - stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/); - } else { - stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/); - } - return "number"; - } - if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - curPunc = ch; - return null; - } - if (ch == "/") { - if (stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } - if (stream.eat("/")) { - stream.skipToEnd(); - return "comment"; - } - } - if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return "operator"; - } - stream.eatWhile(/[\w\$_\xa1-\uffff]/); - var cur = stream.current(); - if (keywords.propertyIsEnumerable(cur)) { - if (cur == "case" || cur == "default") curPunc = "case"; - return "keyword"; - } - if (atoms.propertyIsEnumerable(cur)) return "atom"; - return "variable"; - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next, end = false; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) {end = true; break;} - escaped = !escaped && next == "\\"; - } - if (end || !(escaped || quote == "`")) - state.tokenize = tokenBase; - return "string"; - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function Context(indented, column, type, align, prev) { - this.indented = indented; - this.column = column; - this.type = type; - this.align = align; - this.prev = prev; - } - function pushContext(state, col, type) { - return state.context = new Context(state.indented, col, type, null, state.context); - } - function popContext(state) { - var t = state.context.type; - if (t == ")" || t == "]" || t == "}") - state.indented = state.context.indented; - return state.context = state.context.prev; - } - - // Interface - - return { - startState: function(basecolumn) { - return { - tokenize: null, - context: new Context((basecolumn || 0) - indentUnit, 0, "top", false), - indented: 0, - startOfLine: true - }; - }, - - token: function(stream, state) { - var ctx = state.context; - if (stream.sol()) { - if (ctx.align == null) ctx.align = false; - state.indented = stream.indentation(); - state.startOfLine = true; - if (ctx.type == "case") ctx.type = "}"; - } - if (stream.eatSpace()) return null; - curPunc = null; - var style = (state.tokenize || tokenBase)(stream, state); - if (style == "comment") return style; - if (ctx.align == null) ctx.align = true; - - if (curPunc == "{") pushContext(state, stream.column(), "}"); - else if (curPunc == "[") pushContext(state, stream.column(), "]"); - else if (curPunc == "(") pushContext(state, stream.column(), ")"); - else if (curPunc == "case") ctx.type = "case"; - else if (curPunc == "}" && ctx.type == "}") ctx = popContext(state); - else if (curPunc == ctx.type) popContext(state); - state.startOfLine = false; - return style; - }, - - indent: function(state, textAfter) { - if (state.tokenize != tokenBase && state.tokenize != null) return 0; - var ctx = state.context, firstChar = textAfter && textAfter.charAt(0); - if (ctx.type == "case" && /^(?:case|default)\b/.test(textAfter)) { - state.context.type = "}"; - return ctx.indented; - } - var closing = firstChar == ctx.type; - if (ctx.align) return ctx.column + (closing ? 0 : 1); - else return ctx.indented + (closing ? 0 : indentUnit); - }, - - electricChars: "{}):", - fold: "brace", - blockCommentStart: "/*", - blockCommentEnd: "*/", - lineComment: "//" - }; -}); - -CodeMirror.defineMIME("text/x-go", "go"); - -}); diff --git a/kallithea/public/codemirror/mode/groovy/groovy.js b/kallithea/public/codemirror/mode/groovy/groovy.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/groovy/groovy.js +++ /dev/null @@ -1,226 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("groovy", function(config) { - function words(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - var keywords = words( - "abstract as assert boolean break byte case catch char class const continue def default " + - "do double else enum extends final finally float for goto if implements import in " + - "instanceof int interface long native new package private protected public return " + - "short static strictfp super switch synchronized threadsafe throw throws transient " + - "try void volatile while"); - var blockKeywords = words("catch class do else finally for if switch try while enum interface def"); - var atoms = words("null true false this"); - - var curPunc; - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"' || ch == "'") { - return startString(ch, stream, state); - } - if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - curPunc = ch; - return null; - } - if (/\d/.test(ch)) { - stream.eatWhile(/[\w\.]/); - if (stream.eat(/eE/)) { stream.eat(/\+\-/); stream.eatWhile(/\d/); } - return "number"; - } - if (ch == "/") { - if (stream.eat("*")) { - state.tokenize.push(tokenComment); - return tokenComment(stream, state); - } - if (stream.eat("/")) { - stream.skipToEnd(); - return "comment"; - } - if (expectExpression(state.lastToken)) { - return startString(ch, stream, state); - } - } - if (ch == "-" && stream.eat(">")) { - curPunc = "->"; - return null; - } - if (/[+\-*&%=<>!?|\/~]/.test(ch)) { - stream.eatWhile(/[+\-*&%=<>|~]/); - return "operator"; - } - stream.eatWhile(/[\w\$_]/); - if (ch == "@") { stream.eatWhile(/[\w\$_\.]/); return "meta"; } - if (state.lastToken == ".") return "property"; - if (stream.eat(":")) { curPunc = "proplabel"; return "property"; } - var cur = stream.current(); - if (atoms.propertyIsEnumerable(cur)) { return "atom"; } - if (keywords.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "keyword"; - } - return "variable"; - } - tokenBase.isBase = true; - - function startString(quote, stream, state) { - var tripleQuoted = false; - if (quote != "/" && stream.eat(quote)) { - if (stream.eat(quote)) tripleQuoted = true; - else return "string"; - } - function t(stream, state) { - var escaped = false, next, end = !tripleQuoted; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) { - if (!tripleQuoted) { break; } - if (stream.match(quote + quote)) { end = true; break; } - } - if (quote == '"' && next == "$" && !escaped && stream.eat("{")) { - state.tokenize.push(tokenBaseUntilBrace()); - return "string"; - } - escaped = !escaped && next == "\\"; - } - if (end) state.tokenize.pop(); - return "string"; - } - state.tokenize.push(t); - return t(stream, state); - } - - function tokenBaseUntilBrace() { - var depth = 1; - function t(stream, state) { - if (stream.peek() == "}") { - depth--; - if (depth == 0) { - state.tokenize.pop(); - return state.tokenize[state.tokenize.length-1](stream, state); - } - } else if (stream.peek() == "{") { - depth++; - } - return tokenBase(stream, state); - } - t.isBase = true; - return t; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize.pop(); - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function expectExpression(last) { - return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) || - last == "newstatement" || last == "keyword" || last == "proplabel"; - } - - function Context(indented, column, type, align, prev) { - this.indented = indented; - this.column = column; - this.type = type; - this.align = align; - this.prev = prev; - } - function pushContext(state, col, type) { - return state.context = new Context(state.indented, col, type, null, state.context); - } - function popContext(state) { - var t = state.context.type; - if (t == ")" || t == "]" || t == "}") - state.indented = state.context.indented; - return state.context = state.context.prev; - } - - // Interface - - return { - startState: function(basecolumn) { - return { - tokenize: [tokenBase], - context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false), - indented: 0, - startOfLine: true, - lastToken: null - }; - }, - - token: function(stream, state) { - var ctx = state.context; - if (stream.sol()) { - if (ctx.align == null) ctx.align = false; - state.indented = stream.indentation(); - state.startOfLine = true; - // Automatic semicolon insertion - if (ctx.type == "statement" && !expectExpression(state.lastToken)) { - popContext(state); ctx = state.context; - } - } - if (stream.eatSpace()) return null; - curPunc = null; - var style = state.tokenize[state.tokenize.length-1](stream, state); - if (style == "comment") return style; - if (ctx.align == null) ctx.align = true; - - if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state); - // Handle indentation for {x -> \n ... } - else if (curPunc == "->" && ctx.type == "statement" && ctx.prev.type == "}") { - popContext(state); - state.context.align = false; - } - else if (curPunc == "{") pushContext(state, stream.column(), "}"); - else if (curPunc == "[") pushContext(state, stream.column(), "]"); - else if (curPunc == "(") pushContext(state, stream.column(), ")"); - else if (curPunc == "}") { - while (ctx.type == "statement") ctx = popContext(state); - if (ctx.type == "}") ctx = popContext(state); - while (ctx.type == "statement") ctx = popContext(state); - } - else if (curPunc == ctx.type) popContext(state); - else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement")) - pushContext(state, stream.column(), "statement"); - state.startOfLine = false; - state.lastToken = curPunc || style; - return style; - }, - - indent: function(state, textAfter) { - if (!state.tokenize[state.tokenize.length-1].isBase) return 0; - var firstChar = textAfter && textAfter.charAt(0), ctx = state.context; - if (ctx.type == "statement" && !expectExpression(state.lastToken)) ctx = ctx.prev; - var closing = firstChar == ctx.type; - if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit); - else if (ctx.align) return ctx.column + (closing ? 0 : 1); - else return ctx.indented + (closing ? 0 : config.indentUnit); - }, - - electricChars: "{}", - fold: "brace" - }; -}); - -CodeMirror.defineMIME("text/x-groovy", "groovy"); - -}); diff --git a/kallithea/public/codemirror/mode/haml/haml.js b/kallithea/public/codemirror/mode/haml/haml.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/haml/haml.js +++ /dev/null @@ -1,159 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../ruby/ruby")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../ruby/ruby"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - - // full haml mode. This handled embeded ruby and html fragments too - CodeMirror.defineMode("haml", function(config) { - var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"}); - var rubyMode = CodeMirror.getMode(config, "ruby"); - - function rubyInQuote(endQuote) { - return function(stream, state) { - var ch = stream.peek(); - if (ch == endQuote && state.rubyState.tokenize.length == 1) { - // step out of ruby context as it seems to complete processing all the braces - stream.next(); - state.tokenize = html; - return "closeAttributeTag"; - } else { - return ruby(stream, state); - } - }; - } - - function ruby(stream, state) { - if (stream.match("-#")) { - stream.skipToEnd(); - return "comment"; - } - return rubyMode.token(stream, state.rubyState); - } - - function html(stream, state) { - var ch = stream.peek(); - - // handle haml declarations. All declarations that cant be handled here - // will be passed to html mode - if (state.previousToken.style == "comment" ) { - if (state.indented > state.previousToken.indented) { - stream.skipToEnd(); - return "commentLine"; - } - } - - if (state.startOfLine) { - if (ch == "!" && stream.match("!!")) { - stream.skipToEnd(); - return "tag"; - } else if (stream.match(/^%[\w:#\.]+=/)) { - state.tokenize = ruby; - return "hamlTag"; - } else if (stream.match(/^%[\w:]+/)) { - return "hamlTag"; - } else if (ch == "/" ) { - stream.skipToEnd(); - return "comment"; - } - } - - if (state.startOfLine || state.previousToken.style == "hamlTag") { - if ( ch == "#" || ch == ".") { - stream.match(/[\w-#\.]*/); - return "hamlAttribute"; - } - } - - // donot handle --> as valid ruby, make it HTML close comment instead - if (state.startOfLine && !stream.match("-->", false) && (ch == "=" || ch == "-" )) { - state.tokenize = ruby; - return state.tokenize(stream, state); - } - - if (state.previousToken.style == "hamlTag" || - state.previousToken.style == "closeAttributeTag" || - state.previousToken.style == "hamlAttribute") { - if (ch == "(") { - state.tokenize = rubyInQuote(")"); - return state.tokenize(stream, state); - } else if (ch == "{") { - state.tokenize = rubyInQuote("}"); - return state.tokenize(stream, state); - } - } - - return htmlMode.token(stream, state.htmlState); - } - - return { - // default to html mode - startState: function() { - var htmlState = htmlMode.startState(); - var rubyState = rubyMode.startState(); - return { - htmlState: htmlState, - rubyState: rubyState, - indented: 0, - previousToken: { style: null, indented: 0}, - tokenize: html - }; - }, - - copyState: function(state) { - return { - htmlState : CodeMirror.copyState(htmlMode, state.htmlState), - rubyState: CodeMirror.copyState(rubyMode, state.rubyState), - indented: state.indented, - previousToken: state.previousToken, - tokenize: state.tokenize - }; - }, - - token: function(stream, state) { - if (stream.sol()) { - state.indented = stream.indentation(); - state.startOfLine = true; - } - if (stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - state.startOfLine = false; - // dont record comment line as we only want to measure comment line with - // the opening comment block - if (style && style != "commentLine") { - state.previousToken = { style: style, indented: state.indented }; - } - // if current state is ruby and the previous token is not `,` reset the - // tokenize to html - if (stream.eol() && state.tokenize == ruby) { - stream.backUp(1); - var ch = stream.peek(); - stream.next(); - if (ch && ch != ",") { - state.tokenize = html; - } - } - // reprocess some of the specific style tag when finish setting previousToken - if (style == "hamlTag") { - style = "tag"; - } else if (style == "commentLine") { - style = "comment"; - } else if (style == "hamlAttribute") { - style = "attribute"; - } else if (style == "closeAttributeTag") { - style = null; - } - return style; - } - }; - }, "htmlmixed", "ruby"); - - CodeMirror.defineMIME("text/x-haml", "haml"); -}); diff --git a/kallithea/public/codemirror/mode/haskell/haskell.js b/kallithea/public/codemirror/mode/haskell/haskell.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/haskell/haskell.js +++ /dev/null @@ -1,267 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("haskell", function(_config, modeConfig) { - - function switchState(source, setState, f) { - setState(f); - return f(source, setState); - } - - // These should all be Unicode extended, as per the Haskell 2010 report - var smallRE = /[a-z_]/; - var largeRE = /[A-Z]/; - var digitRE = /\d/; - var hexitRE = /[0-9A-Fa-f]/; - var octitRE = /[0-7]/; - var idRE = /[a-z_A-Z0-9'\xa1-\uffff]/; - var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:]/; - var specialRE = /[(),;[\]`{}]/; - var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer - - function normal(source, setState) { - if (source.eatWhile(whiteCharRE)) { - return null; - } - - var ch = source.next(); - if (specialRE.test(ch)) { - if (ch == '{' && source.eat('-')) { - var t = "comment"; - if (source.eat('#')) { - t = "meta"; - } - return switchState(source, setState, ncomment(t, 1)); - } - return null; - } - - if (ch == '\'') { - if (source.eat('\\')) { - source.next(); // should handle other escapes here - } - else { - source.next(); - } - if (source.eat('\'')) { - return "string"; - } - return "error"; - } - - if (ch == '"') { - return switchState(source, setState, stringLiteral); - } - - if (largeRE.test(ch)) { - source.eatWhile(idRE); - if (source.eat('.')) { - return "qualifier"; - } - return "variable-2"; - } - - if (smallRE.test(ch)) { - source.eatWhile(idRE); - return "variable"; - } - - if (digitRE.test(ch)) { - if (ch == '0') { - if (source.eat(/[xX]/)) { - source.eatWhile(hexitRE); // should require at least 1 - return "integer"; - } - if (source.eat(/[oO]/)) { - source.eatWhile(octitRE); // should require at least 1 - return "number"; - } - } - source.eatWhile(digitRE); - var t = "number"; - if (source.match(/^\.\d+/)) { - t = "number"; - } - if (source.eat(/[eE]/)) { - t = "number"; - source.eat(/[-+]/); - source.eatWhile(digitRE); // should require at least 1 - } - return t; - } - - if (ch == "." && source.eat(".")) - return "keyword"; - - if (symbolRE.test(ch)) { - if (ch == '-' && source.eat(/-/)) { - source.eatWhile(/-/); - if (!source.eat(symbolRE)) { - source.skipToEnd(); - return "comment"; - } - } - var t = "variable"; - if (ch == ':') { - t = "variable-2"; - } - source.eatWhile(symbolRE); - return t; - } - - return "error"; - } - - function ncomment(type, nest) { - if (nest == 0) { - return normal; - } - return function(source, setState) { - var currNest = nest; - while (!source.eol()) { - var ch = source.next(); - if (ch == '{' && source.eat('-')) { - ++currNest; - } - else if (ch == '-' && source.eat('}')) { - --currNest; - if (currNest == 0) { - setState(normal); - return type; - } - } - } - setState(ncomment(type, currNest)); - return type; - }; - } - - function stringLiteral(source, setState) { - while (!source.eol()) { - var ch = source.next(); - if (ch == '"') { - setState(normal); - return "string"; - } - if (ch == '\\') { - if (source.eol() || source.eat(whiteCharRE)) { - setState(stringGap); - return "string"; - } - if (source.eat('&')) { - } - else { - source.next(); // should handle other escapes here - } - } - } - setState(normal); - return "error"; - } - - function stringGap(source, setState) { - if (source.eat('\\')) { - return switchState(source, setState, stringLiteral); - } - source.next(); - setState(normal); - return "error"; - } - - - var wellKnownWords = (function() { - var wkw = {}; - function setType(t) { - return function () { - for (var i = 0; i < arguments.length; i++) - wkw[arguments[i]] = t; - }; - } - - setType("keyword")( - "case", "class", "data", "default", "deriving", "do", "else", "foreign", - "if", "import", "in", "infix", "infixl", "infixr", "instance", "let", - "module", "newtype", "of", "then", "type", "where", "_"); - - setType("keyword")( - "\.\.", ":", "::", "=", "\\", "\"", "<-", "->", "@", "~", "=>"); - - setType("builtin")( - "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<=", "=<<", - "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*", "**"); - - setType("builtin")( - "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum", "Eq", - "False", "FilePath", "Float", "Floating", "Fractional", "Functor", "GT", - "IO", "IOError", "Int", "Integer", "Integral", "Just", "LT", "Left", - "Maybe", "Monad", "Nothing", "Num", "Ord", "Ordering", "Rational", "Read", - "ReadS", "Real", "RealFloat", "RealFrac", "Right", "Show", "ShowS", - "String", "True"); - - setType("builtin")( - "abs", "acos", "acosh", "all", "and", "any", "appendFile", "asTypeOf", - "asin", "asinh", "atan", "atan2", "atanh", "break", "catch", "ceiling", - "compare", "concat", "concatMap", "const", "cos", "cosh", "curry", - "cycle", "decodeFloat", "div", "divMod", "drop", "dropWhile", "either", - "elem", "encodeFloat", "enumFrom", "enumFromThen", "enumFromThenTo", - "enumFromTo", "error", "even", "exp", "exponent", "fail", "filter", - "flip", "floatDigits", "floatRadix", "floatRange", "floor", "fmap", - "foldl", "foldl1", "foldr", "foldr1", "fromEnum", "fromInteger", - "fromIntegral", "fromRational", "fst", "gcd", "getChar", "getContents", - "getLine", "head", "id", "init", "interact", "ioError", "isDenormalized", - "isIEEE", "isInfinite", "isNaN", "isNegativeZero", "iterate", "last", - "lcm", "length", "lex", "lines", "log", "logBase", "lookup", "map", - "mapM", "mapM_", "max", "maxBound", "maximum", "maybe", "min", "minBound", - "minimum", "mod", "negate", "not", "notElem", "null", "odd", "or", - "otherwise", "pi", "pred", "print", "product", "properFraction", - "putChar", "putStr", "putStrLn", "quot", "quotRem", "read", "readFile", - "readIO", "readList", "readLn", "readParen", "reads", "readsPrec", - "realToFrac", "recip", "rem", "repeat", "replicate", "return", "reverse", - "round", "scaleFloat", "scanl", "scanl1", "scanr", "scanr1", "seq", - "sequence", "sequence_", "show", "showChar", "showList", "showParen", - "showString", "shows", "showsPrec", "significand", "signum", "sin", - "sinh", "snd", "span", "splitAt", "sqrt", "subtract", "succ", "sum", - "tail", "take", "takeWhile", "tan", "tanh", "toEnum", "toInteger", - "toRational", "truncate", "uncurry", "undefined", "unlines", "until", - "unwords", "unzip", "unzip3", "userError", "words", "writeFile", "zip", - "zip3", "zipWith", "zipWith3"); - - var override = modeConfig.overrideKeywords; - if (override) for (var word in override) if (override.hasOwnProperty(word)) - wkw[word] = override[word]; - - return wkw; - })(); - - - - return { - startState: function () { return { f: normal }; }, - copyState: function (s) { return { f: s.f }; }, - - token: function(stream, state) { - var t = state.f(stream, function(s) { state.f = s; }); - var w = stream.current(); - return wellKnownWords.hasOwnProperty(w) ? wellKnownWords[w] : t; - }, - - blockCommentStart: "{-", - blockCommentEnd: "-}", - lineComment: "--" - }; - -}); - -CodeMirror.defineMIME("text/x-haskell", "haskell"); - -}); diff --git a/kallithea/public/codemirror/mode/haxe/haxe.js b/kallithea/public/codemirror/mode/haxe/haxe.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/haxe/haxe.js +++ /dev/null @@ -1,518 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("haxe", function(config, parserConfig) { - var indentUnit = config.indentUnit; - - // Tokenizer - - var keywords = function(){ - function kw(type) {return {type: type, style: "keyword"};} - var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"); - var operator = kw("operator"), atom = {type: "atom", style: "atom"}, attribute = {type:"attribute", style: "attribute"}; - var type = kw("typedef"); - return { - "if": A, "while": A, "else": B, "do": B, "try": B, - "return": C, "break": C, "continue": C, "new": C, "throw": C, - "var": kw("var"), "inline":attribute, "static": attribute, "using":kw("import"), - "public": attribute, "private": attribute, "cast": kw("cast"), "import": kw("import"), "macro": kw("macro"), - "function": kw("function"), "catch": kw("catch"), "untyped": kw("untyped"), "callback": kw("cb"), - "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"), - "in": operator, "never": kw("property_access"), "trace":kw("trace"), - "class": type, "abstract":type, "enum":type, "interface":type, "typedef":type, "extends":type, "implements":type, "dynamic":type, - "true": atom, "false": atom, "null": atom - }; - }(); - - var isOperatorChar = /[+\-*&%=<>!?|]/; - - function chain(stream, state, f) { - state.tokenize = f; - return f(stream, state); - } - - function nextUntilUnescaped(stream, end) { - var escaped = false, next; - while ((next = stream.next()) != null) { - if (next == end && !escaped) - return false; - escaped = !escaped && next == "\\"; - } - return escaped; - } - - // Used as scratch variables to communicate multiple values without - // consing up tons of objects. - var type, content; - function ret(tp, style, cont) { - type = tp; content = cont; - return style; - } - - function haxeTokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"' || ch == "'") - return chain(stream, state, haxeTokenString(ch)); - else if (/[\[\]{}\(\),;\:\.]/.test(ch)) - return ret(ch); - else if (ch == "0" && stream.eat(/x/i)) { - stream.eatWhile(/[\da-f]/i); - return ret("number", "number"); - } - else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) { - stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/); - return ret("number", "number"); - } - else if (state.reAllowed && (ch == "~" && stream.eat(/\//))) { - nextUntilUnescaped(stream, "/"); - stream.eatWhile(/[gimsu]/); - return ret("regexp", "string-2"); - } - else if (ch == "/") { - if (stream.eat("*")) { - return chain(stream, state, haxeTokenComment); - } - else if (stream.eat("/")) { - stream.skipToEnd(); - return ret("comment", "comment"); - } - else { - stream.eatWhile(isOperatorChar); - return ret("operator", null, stream.current()); - } - } - else if (ch == "#") { - stream.skipToEnd(); - return ret("conditional", "meta"); - } - else if (ch == "@") { - stream.eat(/:/); - stream.eatWhile(/[\w_]/); - return ret ("metadata", "meta"); - } - else if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return ret("operator", null, stream.current()); - } - else { - var word; - if(/[A-Z]/.test(ch)) - { - stream.eatWhile(/[\w_<>]/); - word = stream.current(); - return ret("type", "variable-3", word); - } - else - { - stream.eatWhile(/[\w_]/); - var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word]; - return (known && state.kwAllowed) ? ret(known.type, known.style, word) : - ret("variable", "variable", word); - } - } - } - - function haxeTokenString(quote) { - return function(stream, state) { - if (!nextUntilUnescaped(stream, quote)) - state.tokenize = haxeTokenBase; - return ret("string", "string"); - }; - } - - function haxeTokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = haxeTokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return ret("comment", "comment"); - } - - // Parser - - var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true}; - - function HaxeLexical(indented, column, type, align, prev, info) { - this.indented = indented; - this.column = column; - this.type = type; - this.prev = prev; - this.info = info; - if (align != null) this.align = align; - } - - function inScope(state, varname) { - for (var v = state.localVars; v; v = v.next) - if (v.name == varname) return true; - } - - function parseHaxe(state, style, type, content, stream) { - var cc = state.cc; - // Communicate our context to the combinators. - // (Less wasteful than consing up a hundred closures on every call.) - cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; - - if (!state.lexical.hasOwnProperty("align")) - state.lexical.align = true; - - while(true) { - var combinator = cc.length ? cc.pop() : statement; - if (combinator(type, content)) { - while(cc.length && cc[cc.length - 1].lex) - cc.pop()(); - if (cx.marked) return cx.marked; - if (type == "variable" && inScope(state, content)) return "variable-2"; - if (type == "variable" && imported(state, content)) return "variable-3"; - return style; - } - } - } - - function imported(state, typename) - { - if (/[a-z]/.test(typename.charAt(0))) - return false; - var len = state.importedtypes.length; - for (var i = 0; i= 0; i--) cx.cc.push(arguments[i]); - } - function cont() { - pass.apply(null, arguments); - return true; - } - function register(varname) { - var state = cx.state; - if (state.context) { - cx.marked = "def"; - for (var v = state.localVars; v; v = v.next) - if (v.name == varname) return; - state.localVars = {name: varname, next: state.localVars}; - } - } - - // Combinators - - var defaultVars = {name: "this", next: null}; - function pushcontext() { - if (!cx.state.context) cx.state.localVars = defaultVars; - cx.state.context = {prev: cx.state.context, vars: cx.state.localVars}; - } - function popcontext() { - cx.state.localVars = cx.state.context.vars; - cx.state.context = cx.state.context.prev; - } - function pushlex(type, info) { - var result = function() { - var state = cx.state; - state.lexical = new HaxeLexical(state.indented, cx.stream.column(), type, null, state.lexical, info); - }; - result.lex = true; - return result; - } - function poplex() { - var state = cx.state; - if (state.lexical.prev) { - if (state.lexical.type == ")") - state.indented = state.lexical.indented; - state.lexical = state.lexical.prev; - } - } - poplex.lex = true; - - function expect(wanted) { - function f(type) { - if (type == wanted) return cont(); - else if (wanted == ";") return pass(); - else return cont(f); - }; - return f; - } - - function statement(type) { - if (type == "@") return cont(metadef); - if (type == "var") return cont(pushlex("vardef"), vardef1, expect(";"), poplex); - if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex); - if (type == "keyword b") return cont(pushlex("form"), statement, poplex); - if (type == "{") return cont(pushlex("}"), pushcontext, block, poplex, popcontext); - if (type == ";") return cont(); - if (type == "attribute") return cont(maybeattribute); - if (type == "function") return cont(functiondef); - if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"), - poplex, statement, poplex); - if (type == "variable") return cont(pushlex("stat"), maybelabel); - if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"), - block, poplex, poplex); - if (type == "case") return cont(expression, expect(":")); - if (type == "default") return cont(expect(":")); - if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"), - statement, poplex, popcontext); - if (type == "import") return cont(importdef, expect(";")); - if (type == "typedef") return cont(typedef); - return pass(pushlex("stat"), expression, expect(";"), poplex); - } - function expression(type) { - if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator); - if (type == "function") return cont(functiondef); - if (type == "keyword c") return cont(maybeexpression); - if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeoperator); - if (type == "operator") return cont(expression); - if (type == "[") return cont(pushlex("]"), commasep(expression, "]"), poplex, maybeoperator); - if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator); - return cont(); - } - function maybeexpression(type) { - if (type.match(/[;\}\)\],]/)) return pass(); - return pass(expression); - } - - function maybeoperator(type, value) { - if (type == "operator" && /\+\+|--/.test(value)) return cont(maybeoperator); - if (type == "operator" || type == ":") return cont(expression); - if (type == ";") return; - if (type == "(") return cont(pushlex(")"), commasep(expression, ")"), poplex, maybeoperator); - if (type == ".") return cont(property, maybeoperator); - if (type == "[") return cont(pushlex("]"), expression, expect("]"), poplex, maybeoperator); - } - - function maybeattribute(type) { - if (type == "attribute") return cont(maybeattribute); - if (type == "function") return cont(functiondef); - if (type == "var") return cont(vardef1); - } - - function metadef(type) { - if(type == ":") return cont(metadef); - if(type == "variable") return cont(metadef); - if(type == "(") return cont(pushlex(")"), commasep(metaargs, ")"), poplex, statement); - } - function metaargs(type) { - if(type == "variable") return cont(); - } - - function importdef (type, value) { - if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); } - else if(type == "variable" || type == "property" || type == "." || value == "*") return cont(importdef); - } - - function typedef (type, value) - { - if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); } - else if (type == "type" && /[A-Z]/.test(value.charAt(0))) { return cont(); } - } - - function maybelabel(type) { - if (type == ":") return cont(poplex, statement); - return pass(maybeoperator, expect(";"), poplex); - } - function property(type) { - if (type == "variable") {cx.marked = "property"; return cont();} - } - function objprop(type) { - if (type == "variable") cx.marked = "property"; - if (atomicTypes.hasOwnProperty(type)) return cont(expect(":"), expression); - } - function commasep(what, end) { - function proceed(type) { - if (type == ",") return cont(what, proceed); - if (type == end) return cont(); - return cont(expect(end)); - } - return function(type) { - if (type == end) return cont(); - else return pass(what, proceed); - }; - } - function block(type) { - if (type == "}") return cont(); - return pass(statement, block); - } - function vardef1(type, value) { - if (type == "variable"){register(value); return cont(typeuse, vardef2);} - return cont(); - } - function vardef2(type, value) { - if (value == "=") return cont(expression, vardef2); - if (type == ",") return cont(vardef1); - } - function forspec1(type, value) { - if (type == "variable") { - register(value); - } - return cont(pushlex(")"), pushcontext, forin, expression, poplex, statement, popcontext); - } - function forin(_type, value) { - if (value == "in") return cont(); - } - function functiondef(type, value) { - if (type == "variable") {register(value); return cont(functiondef);} - if (value == "new") return cont(functiondef); - if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, typeuse, statement, popcontext); - } - function typeuse(type) { - if(type == ":") return cont(typestring); - } - function typestring(type) { - if(type == "type") return cont(); - if(type == "variable") return cont(); - if(type == "{") return cont(pushlex("}"), commasep(typeprop, "}"), poplex); - } - function typeprop(type) { - if(type == "variable") return cont(typeuse); - } - function funarg(type, value) { - if (type == "variable") {register(value); return cont(typeuse);} - } - - // Interface - - return { - startState: function(basecolumn) { - var defaulttypes = ["Int", "Float", "String", "Void", "Std", "Bool", "Dynamic", "Array"]; - return { - tokenize: haxeTokenBase, - reAllowed: true, - kwAllowed: true, - cc: [], - lexical: new HaxeLexical((basecolumn || 0) - indentUnit, 0, "block", false), - localVars: parserConfig.localVars, - importedtypes: defaulttypes, - context: parserConfig.localVars && {vars: parserConfig.localVars}, - indented: 0 - }; - }, - - token: function(stream, state) { - if (stream.sol()) { - if (!state.lexical.hasOwnProperty("align")) - state.lexical.align = false; - state.indented = stream.indentation(); - } - if (stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - if (type == "comment") return style; - state.reAllowed = !!(type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/)); - state.kwAllowed = type != '.'; - return parseHaxe(state, style, type, content, stream); - }, - - indent: function(state, textAfter) { - if (state.tokenize != haxeTokenBase) return 0; - var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical; - if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev; - var type = lexical.type, closing = firstChar == type; - if (type == "vardef") return lexical.indented + 4; - else if (type == "form" && firstChar == "{") return lexical.indented; - else if (type == "stat" || type == "form") return lexical.indented + indentUnit; - else if (lexical.info == "switch" && !closing) - return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit); - else if (lexical.align) return lexical.column + (closing ? 0 : 1); - else return lexical.indented + (closing ? 0 : indentUnit); - }, - - electricChars: "{}", - blockCommentStart: "/*", - blockCommentEnd: "*/", - lineComment: "//" - }; -}); - -CodeMirror.defineMIME("text/x-haxe", "haxe"); - -CodeMirror.defineMode("hxml", function () { - - return { - startState: function () { - return { - define: false, - inString: false - }; - }, - token: function (stream, state) { - var ch = stream.peek(); - var sol = stream.sol(); - - ///* comments */ - if (ch == "#") { - stream.skipToEnd(); - return "comment"; - } - if (sol && ch == "-") { - var style = "variable-2"; - - stream.eat(/-/); - - if (stream.peek() == "-") { - stream.eat(/-/); - style = "keyword a"; - } - - if (stream.peek() == "D") { - stream.eat(/[D]/); - style = "keyword c"; - state.define = true; - } - - stream.eatWhile(/[A-Z]/i); - return style; - } - - var ch = stream.peek(); - - if (state.inString == false && ch == "'") { - state.inString = true; - ch = stream.next(); - } - - if (state.inString == true) { - if (stream.skipTo("'")) { - - } else { - stream.skipToEnd(); - } - - if (stream.peek() == "'") { - stream.next(); - state.inString = false; - } - - return "string"; - } - - stream.next(); - return null; - }, - lineComment: "#" - }; -}); - -CodeMirror.defineMIME("text/x-hxml", "hxml"); - -}); diff --git a/kallithea/public/codemirror/mode/htmlembedded/htmlembedded.js b/kallithea/public/codemirror/mode/htmlembedded/htmlembedded.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/htmlembedded/htmlembedded.js +++ /dev/null @@ -1,86 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../htmlmixed/htmlmixed"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("htmlembedded", function(config, parserConfig) { - - //config settings - var scriptStartRegex = parserConfig.scriptStartRegex || /^<%/i, - scriptEndRegex = parserConfig.scriptEndRegex || /^%>/i; - - //inner modes - var scriptingMode, htmlMixedMode; - - //tokenizer when in html mode - function htmlDispatch(stream, state) { - if (stream.match(scriptStartRegex, false)) { - state.token=scriptingDispatch; - return scriptingMode.token(stream, state.scriptState); - } - else - return htmlMixedMode.token(stream, state.htmlState); - } - - //tokenizer when in scripting mode - function scriptingDispatch(stream, state) { - if (stream.match(scriptEndRegex, false)) { - state.token=htmlDispatch; - return htmlMixedMode.token(stream, state.htmlState); - } - else - return scriptingMode.token(stream, state.scriptState); - } - - - return { - startState: function() { - scriptingMode = scriptingMode || CodeMirror.getMode(config, parserConfig.scriptingModeSpec); - htmlMixedMode = htmlMixedMode || CodeMirror.getMode(config, "htmlmixed"); - return { - token : parserConfig.startOpen ? scriptingDispatch : htmlDispatch, - htmlState : CodeMirror.startState(htmlMixedMode), - scriptState : CodeMirror.startState(scriptingMode) - }; - }, - - token: function(stream, state) { - return state.token(stream, state); - }, - - indent: function(state, textAfter) { - if (state.token == htmlDispatch) - return htmlMixedMode.indent(state.htmlState, textAfter); - else if (scriptingMode.indent) - return scriptingMode.indent(state.scriptState, textAfter); - }, - - copyState: function(state) { - return { - token : state.token, - htmlState : CodeMirror.copyState(htmlMixedMode, state.htmlState), - scriptState : CodeMirror.copyState(scriptingMode, state.scriptState) - }; - }, - - innerMode: function(state) { - if (state.token == scriptingDispatch) return {state: state.scriptState, mode: scriptingMode}; - else return {state: state.htmlState, mode: htmlMixedMode}; - } - }; -}, "htmlmixed"); - -CodeMirror.defineMIME("application/x-ejs", { name: "htmlembedded", scriptingModeSpec:"javascript"}); -CodeMirror.defineMIME("application/x-aspx", { name: "htmlembedded", scriptingModeSpec:"text/x-csharp"}); -CodeMirror.defineMIME("application/x-jsp", { name: "htmlembedded", scriptingModeSpec:"text/x-java"}); -CodeMirror.defineMIME("application/x-erb", { name: "htmlembedded", scriptingModeSpec:"ruby"}); - -}); diff --git a/kallithea/public/codemirror/mode/htmlmixed/htmlmixed.js b/kallithea/public/codemirror/mode/htmlmixed/htmlmixed.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/htmlmixed/htmlmixed.js +++ /dev/null @@ -1,121 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../css/css")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript", "../css/css"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("htmlmixed", function(config, parserConfig) { - var htmlMode = CodeMirror.getMode(config, {name: "xml", - htmlMode: true, - multilineTagIndentFactor: parserConfig.multilineTagIndentFactor, - multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag}); - var cssMode = CodeMirror.getMode(config, "css"); - - var scriptTypes = [], scriptTypesConf = parserConfig && parserConfig.scriptTypes; - scriptTypes.push({matches: /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, - mode: CodeMirror.getMode(config, "javascript")}); - if (scriptTypesConf) for (var i = 0; i < scriptTypesConf.length; ++i) { - var conf = scriptTypesConf[i]; - scriptTypes.push({matches: conf.matches, mode: conf.mode && CodeMirror.getMode(config, conf.mode)}); - } - scriptTypes.push({matches: /./, - mode: CodeMirror.getMode(config, "text/plain")}); - - function html(stream, state) { - var tagName = state.htmlState.tagName; - if (tagName) tagName = tagName.toLowerCase(); - var style = htmlMode.token(stream, state.htmlState); - if (tagName == "script" && /\btag\b/.test(style) && stream.current() == ">") { - // Script block: mode to change to depends on type attribute - var scriptType = stream.string.slice(Math.max(0, stream.pos - 100), stream.pos).match(/\btype\s*=\s*("[^"]+"|'[^']+'|\S+)[^<]*$/i); - scriptType = scriptType ? scriptType[1] : ""; - if (scriptType && /[\"\']/.test(scriptType.charAt(0))) scriptType = scriptType.slice(1, scriptType.length - 1); - for (var i = 0; i < scriptTypes.length; ++i) { - var tp = scriptTypes[i]; - if (typeof tp.matches == "string" ? scriptType == tp.matches : tp.matches.test(scriptType)) { - if (tp.mode) { - state.token = script; - state.localMode = tp.mode; - state.localState = tp.mode.startState && tp.mode.startState(htmlMode.indent(state.htmlState, "")); - } - break; - } - } - } else if (tagName == "style" && /\btag\b/.test(style) && stream.current() == ">") { - state.token = css; - state.localMode = cssMode; - state.localState = cssMode.startState(htmlMode.indent(state.htmlState, "")); - } - return style; - } - function maybeBackup(stream, pat, style) { - var cur = stream.current(); - var close = cur.search(pat), m; - if (close > -1) stream.backUp(cur.length - close); - else if (m = cur.match(/<\/?$/)) { - stream.backUp(cur.length); - if (!stream.match(pat, false)) stream.match(cur); - } - return style; - } - function script(stream, state) { - if (stream.match(/^<\/\s*script\s*>/i, false)) { - state.token = html; - state.localState = state.localMode = null; - return html(stream, state); - } - return maybeBackup(stream, /<\/\s*script\s*>/, - state.localMode.token(stream, state.localState)); - } - function css(stream, state) { - if (stream.match(/^<\/\s*style\s*>/i, false)) { - state.token = html; - state.localState = state.localMode = null; - return html(stream, state); - } - return maybeBackup(stream, /<\/\s*style\s*>/, - cssMode.token(stream, state.localState)); - } - - return { - startState: function() { - var state = htmlMode.startState(); - return {token: html, localMode: null, localState: null, htmlState: state}; - }, - - copyState: function(state) { - if (state.localState) - var local = CodeMirror.copyState(state.localMode, state.localState); - return {token: state.token, localMode: state.localMode, localState: local, - htmlState: CodeMirror.copyState(htmlMode, state.htmlState)}; - }, - - token: function(stream, state) { - return state.token(stream, state); - }, - - indent: function(state, textAfter) { - if (!state.localMode || /^\s*<\//.test(textAfter)) - return htmlMode.indent(state.htmlState, textAfter); - else if (state.localMode.indent) - return state.localMode.indent(state.localState, textAfter); - else - return CodeMirror.Pass; - }, - - innerMode: function(state) { - return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode}; - } - }; -}, "xml", "javascript", "css"); - -CodeMirror.defineMIME("text/html", "htmlmixed"); - -}); diff --git a/kallithea/public/codemirror/mode/http/http.js b/kallithea/public/codemirror/mode/http/http.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/http/http.js +++ /dev/null @@ -1,113 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("http", function() { - function failFirstLine(stream, state) { - stream.skipToEnd(); - state.cur = header; - return "error"; - } - - function start(stream, state) { - if (stream.match(/^HTTP\/\d\.\d/)) { - state.cur = responseStatusCode; - return "keyword"; - } else if (stream.match(/^[A-Z]+/) && /[ \t]/.test(stream.peek())) { - state.cur = requestPath; - return "keyword"; - } else { - return failFirstLine(stream, state); - } - } - - function responseStatusCode(stream, state) { - var code = stream.match(/^\d+/); - if (!code) return failFirstLine(stream, state); - - state.cur = responseStatusText; - var status = Number(code[0]); - if (status >= 100 && status < 200) { - return "positive informational"; - } else if (status >= 200 && status < 300) { - return "positive success"; - } else if (status >= 300 && status < 400) { - return "positive redirect"; - } else if (status >= 400 && status < 500) { - return "negative client-error"; - } else if (status >= 500 && status < 600) { - return "negative server-error"; - } else { - return "error"; - } - } - - function responseStatusText(stream, state) { - stream.skipToEnd(); - state.cur = header; - return null; - } - - function requestPath(stream, state) { - stream.eatWhile(/\S/); - state.cur = requestProtocol; - return "string-2"; - } - - function requestProtocol(stream, state) { - if (stream.match(/^HTTP\/\d\.\d$/)) { - state.cur = header; - return "keyword"; - } else { - return failFirstLine(stream, state); - } - } - - function header(stream) { - if (stream.sol() && !stream.eat(/[ \t]/)) { - if (stream.match(/^.*?:/)) { - return "atom"; - } else { - stream.skipToEnd(); - return "error"; - } - } else { - stream.skipToEnd(); - return "string"; - } - } - - function body(stream) { - stream.skipToEnd(); - return null; - } - - return { - token: function(stream, state) { - var cur = state.cur; - if (cur != header && cur != body && stream.eatSpace()) return null; - return cur(stream, state); - }, - - blankLine: function(state) { - state.cur = body; - }, - - startState: function() { - return {cur: start}; - } - }; -}); - -CodeMirror.defineMIME("message/http", "http"); - -}); diff --git a/kallithea/public/codemirror/mode/jade/jade.js b/kallithea/public/codemirror/mode/jade/jade.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/jade/jade.js +++ /dev/null @@ -1,590 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../javascript/javascript"), require("../css/css"), require("../htmlmixed/htmlmixed")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../javascript/javascript", "../css/css", "../htmlmixed/htmlmixed"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode('jade', function (config) { - // token types - var KEYWORD = 'keyword'; - var DOCTYPE = 'meta'; - var ID = 'builtin'; - var CLASS = 'qualifier'; - - var ATTRS_NEST = { - '{': '}', - '(': ')', - '[': ']' - }; - - var jsMode = CodeMirror.getMode(config, 'javascript'); - - function State() { - this.javaScriptLine = false; - this.javaScriptLineExcludesColon = false; - - this.javaScriptArguments = false; - this.javaScriptArgumentsDepth = 0; - - this.isInterpolating = false; - this.interpolationNesting = 0; - - this.jsState = jsMode.startState(); - - this.restOfLine = ''; - - this.isIncludeFiltered = false; - this.isEach = false; - - this.lastTag = ''; - this.scriptType = ''; - - // Attributes Mode - this.isAttrs = false; - this.attrsNest = []; - this.inAttributeName = true; - this.attributeIsType = false; - this.attrValue = ''; - - // Indented Mode - this.indentOf = Infinity; - this.indentToken = ''; - - this.innerMode = null; - this.innerState = null; - - this.innerModeForLine = false; - } - /** - * Safely copy a state - * - * @return {State} - */ - State.prototype.copy = function () { - var res = new State(); - res.javaScriptLine = this.javaScriptLine; - res.javaScriptLineExcludesColon = this.javaScriptLineExcludesColon; - res.javaScriptArguments = this.javaScriptArguments; - res.javaScriptArgumentsDepth = this.javaScriptArgumentsDepth; - res.isInterpolating = this.isInterpolating; - res.interpolationNesting = this.intpolationNesting; - - res.jsState = CodeMirror.copyState(jsMode, this.jsState); - - res.innerMode = this.innerMode; - if (this.innerMode && this.innerState) { - res.innerState = CodeMirror.copyState(this.innerMode, this.innerState); - } - - res.restOfLine = this.restOfLine; - - res.isIncludeFiltered = this.isIncludeFiltered; - res.isEach = this.isEach; - res.lastTag = this.lastTag; - res.scriptType = this.scriptType; - res.isAttrs = this.isAttrs; - res.attrsNest = this.attrsNest.slice(); - res.inAttributeName = this.inAttributeName; - res.attributeIsType = this.attributeIsType; - res.attrValue = this.attrValue; - res.indentOf = this.indentOf; - res.indentToken = this.indentToken; - - res.innerModeForLine = this.innerModeForLine; - - return res; - }; - - function javaScript(stream, state) { - if (stream.sol()) { - // if javaScriptLine was set at end of line, ignore it - state.javaScriptLine = false; - state.javaScriptLineExcludesColon = false; - } - if (state.javaScriptLine) { - if (state.javaScriptLineExcludesColon && stream.peek() === ':') { - state.javaScriptLine = false; - state.javaScriptLineExcludesColon = false; - return; - } - var tok = jsMode.token(stream, state.jsState); - if (stream.eol()) state.javaScriptLine = false; - return tok || true; - } - } - function javaScriptArguments(stream, state) { - if (state.javaScriptArguments) { - if (state.javaScriptArgumentsDepth === 0 && stream.peek() !== '(') { - state.javaScriptArguments = false; - return; - } - if (stream.peek() === '(') { - state.javaScriptArgumentsDepth++; - } else if (stream.peek() === ')') { - state.javaScriptArgumentsDepth--; - } - if (state.javaScriptArgumentsDepth === 0) { - state.javaScriptArguments = false; - return; - } - - var tok = jsMode.token(stream, state.jsState); - return tok || true; - } - } - - function yieldStatement(stream) { - if (stream.match(/^yield\b/)) { - return 'keyword'; - } - } - - function doctype(stream) { - if (stream.match(/^(?:doctype) *([^\n]+)?/)) { - return DOCTYPE; - } - } - - function interpolation(stream, state) { - if (stream.match('#{')) { - state.isInterpolating = true; - state.interpolationNesting = 0; - return 'punctuation'; - } - } - - function interpolationContinued(stream, state) { - if (state.isInterpolating) { - if (stream.peek() === '}') { - state.interpolationNesting--; - if (state.interpolationNesting < 0) { - stream.next(); - state.isInterpolating = false; - return 'puncutation'; - } - } else if (stream.peek() === '{') { - state.interpolationNesting++; - } - return jsMode.token(stream, state.jsState) || true; - } - } - - function caseStatement(stream, state) { - if (stream.match(/^case\b/)) { - state.javaScriptLine = true; - return KEYWORD; - } - } - - function when(stream, state) { - if (stream.match(/^when\b/)) { - state.javaScriptLine = true; - state.javaScriptLineExcludesColon = true; - return KEYWORD; - } - } - - function defaultStatement(stream) { - if (stream.match(/^default\b/)) { - return KEYWORD; - } - } - - function extendsStatement(stream, state) { - if (stream.match(/^extends?\b/)) { - state.restOfLine = 'string'; - return KEYWORD; - } - } - - function append(stream, state) { - if (stream.match(/^append\b/)) { - state.restOfLine = 'variable'; - return KEYWORD; - } - } - function prepend(stream, state) { - if (stream.match(/^prepend\b/)) { - state.restOfLine = 'variable'; - return KEYWORD; - } - } - function block(stream, state) { - if (stream.match(/^block\b *(?:(prepend|append)\b)?/)) { - state.restOfLine = 'variable'; - return KEYWORD; - } - } - - function include(stream, state) { - if (stream.match(/^include\b/)) { - state.restOfLine = 'string'; - return KEYWORD; - } - } - - function includeFiltered(stream, state) { - if (stream.match(/^include:([a-zA-Z0-9\-]+)/, false) && stream.match('include')) { - state.isIncludeFiltered = true; - return KEYWORD; - } - } - - function includeFilteredContinued(stream, state) { - if (state.isIncludeFiltered) { - var tok = filter(stream, state); - state.isIncludeFiltered = false; - state.restOfLine = 'string'; - return tok; - } - } - - function mixin(stream, state) { - if (stream.match(/^mixin\b/)) { - state.javaScriptLine = true; - return KEYWORD; - } - } - - function call(stream, state) { - if (stream.match(/^\+([-\w]+)/)) { - if (!stream.match(/^\( *[-\w]+ *=/, false)) { - state.javaScriptArguments = true; - state.javaScriptArgumentsDepth = 0; - } - return 'variable'; - } - if (stream.match(/^\+#{/, false)) { - stream.next(); - state.mixinCallAfter = true; - return interpolation(stream, state); - } - } - function callArguments(stream, state) { - if (state.mixinCallAfter) { - state.mixinCallAfter = false; - if (!stream.match(/^\( *[-\w]+ *=/, false)) { - state.javaScriptArguments = true; - state.javaScriptArgumentsDepth = 0; - } - return true; - } - } - - function conditional(stream, state) { - if (stream.match(/^(if|unless|else if|else)\b/)) { - state.javaScriptLine = true; - return KEYWORD; - } - } - - function each(stream, state) { - if (stream.match(/^(- *)?(each|for)\b/)) { - state.isEach = true; - return KEYWORD; - } - } - function eachContinued(stream, state) { - if (state.isEach) { - if (stream.match(/^ in\b/)) { - state.javaScriptLine = true; - state.isEach = false; - return KEYWORD; - } else if (stream.sol() || stream.eol()) { - state.isEach = false; - } else if (stream.next()) { - while (!stream.match(/^ in\b/, false) && stream.next()); - return 'variable'; - } - } - } - - function whileStatement(stream, state) { - if (stream.match(/^while\b/)) { - state.javaScriptLine = true; - return KEYWORD; - } - } - - function tag(stream, state) { - var captures; - if (captures = stream.match(/^(\w(?:[-:\w]*\w)?)\/?/)) { - state.lastTag = captures[1].toLowerCase(); - if (state.lastTag === 'script') { - state.scriptType = 'application/javascript'; - } - return 'tag'; - } - } - - function filter(stream, state) { - if (stream.match(/^:([\w\-]+)/)) { - var innerMode; - if (config && config.innerModes) { - innerMode = config.innerModes(stream.current().substring(1)); - } - if (!innerMode) { - innerMode = stream.current().substring(1); - } - if (typeof innerMode === 'string') { - innerMode = CodeMirror.getMode(config, innerMode); - } - setInnerMode(stream, state, innerMode); - return 'atom'; - } - } - - function code(stream, state) { - if (stream.match(/^(!?=|-)/)) { - state.javaScriptLine = true; - return 'punctuation'; - } - } - - function id(stream) { - if (stream.match(/^#([\w-]+)/)) { - return ID; - } - } - - function className(stream) { - if (stream.match(/^\.([\w-]+)/)) { - return CLASS; - } - } - - function attrs(stream, state) { - if (stream.peek() == '(') { - stream.next(); - state.isAttrs = true; - state.attrsNest = []; - state.inAttributeName = true; - state.attrValue = ''; - state.attributeIsType = false; - return 'punctuation'; - } - } - - function attrsContinued(stream, state) { - if (state.isAttrs) { - if (ATTRS_NEST[stream.peek()]) { - state.attrsNest.push(ATTRS_NEST[stream.peek()]); - } - if (state.attrsNest[state.attrsNest.length - 1] === stream.peek()) { - state.attrsNest.pop(); - } else if (stream.eat(')')) { - state.isAttrs = false; - return 'punctuation'; - } - if (state.inAttributeName && stream.match(/^[^=,\)!]+/)) { - if (stream.peek() === '=' || stream.peek() === '!') { - state.inAttributeName = false; - state.jsState = jsMode.startState(); - if (state.lastTag === 'script' && stream.current().trim().toLowerCase() === 'type') { - state.attributeIsType = true; - } else { - state.attributeIsType = false; - } - } - return 'attribute'; - } - - var tok = jsMode.token(stream, state.jsState); - if (state.attributeIsType && tok === 'string') { - state.scriptType = stream.current().toString(); - } - if (state.attrsNest.length === 0 && (tok === 'string' || tok === 'variable' || tok === 'keyword')) { - try { - Function('', 'var x ' + state.attrValue.replace(/,\s*$/, '').replace(/^!/, '')); - state.inAttributeName = true; - state.attrValue = ''; - stream.backUp(stream.current().length); - return attrsContinued(stream, state); - } catch (ex) { - //not the end of an attribute - } - } - state.attrValue += stream.current(); - return tok || true; - } - } - - function attributesBlock(stream, state) { - if (stream.match(/^&attributes\b/)) { - state.javaScriptArguments = true; - state.javaScriptArgumentsDepth = 0; - return 'keyword'; - } - } - - function indent(stream) { - if (stream.sol() && stream.eatSpace()) { - return 'indent'; - } - } - - function comment(stream, state) { - if (stream.match(/^ *\/\/(-)?([^\n]*)/)) { - state.indentOf = stream.indentation(); - state.indentToken = 'comment'; - return 'comment'; - } - } - - function colon(stream) { - if (stream.match(/^: */)) { - return 'colon'; - } - } - - function text(stream, state) { - if (stream.match(/^(?:\| ?| )([^\n]+)/)) { - return 'string'; - } - if (stream.match(/^(<[^\n]*)/, false)) { - // html string - setInnerMode(stream, state, 'htmlmixed'); - state.innerModeForLine = true; - return innerMode(stream, state, true); - } - } - - function dot(stream, state) { - if (stream.eat('.')) { - var innerMode = null; - if (state.lastTag === 'script' && state.scriptType.toLowerCase().indexOf('javascript') != -1) { - innerMode = state.scriptType.toLowerCase().replace(/"|'/g, ''); - } else if (state.lastTag === 'style') { - innerMode = 'css'; - } - setInnerMode(stream, state, innerMode); - return 'dot'; - } - } - - function fail(stream) { - stream.next(); - return null; - } - - - function setInnerMode(stream, state, mode) { - mode = CodeMirror.mimeModes[mode] || mode; - mode = config.innerModes ? config.innerModes(mode) || mode : mode; - mode = CodeMirror.mimeModes[mode] || mode; - mode = CodeMirror.getMode(config, mode); - state.indentOf = stream.indentation(); - - if (mode && mode.name !== 'null') { - state.innerMode = mode; - } else { - state.indentToken = 'string'; - } - } - function innerMode(stream, state, force) { - if (stream.indentation() > state.indentOf || (state.innerModeForLine && !stream.sol()) || force) { - if (state.innerMode) { - if (!state.innerState) { - state.innerState = state.innerMode.startState ? state.innerMode.startState(stream.indentation()) : {}; - } - return stream.hideFirstChars(state.indentOf + 2, function () { - return state.innerMode.token(stream, state.innerState) || true; - }); - } else { - stream.skipToEnd(); - return state.indentToken; - } - } else if (stream.sol()) { - state.indentOf = Infinity; - state.indentToken = null; - state.innerMode = null; - state.innerState = null; - } - } - function restOfLine(stream, state) { - if (stream.sol()) { - // if restOfLine was set at end of line, ignore it - state.restOfLine = ''; - } - if (state.restOfLine) { - stream.skipToEnd(); - var tok = state.restOfLine; - state.restOfLine = ''; - return tok; - } - } - - - function startState() { - return new State(); - } - function copyState(state) { - return state.copy(); - } - /** - * Get the next token in the stream - * - * @param {Stream} stream - * @param {State} state - */ - function nextToken(stream, state) { - var tok = innerMode(stream, state) - || restOfLine(stream, state) - || interpolationContinued(stream, state) - || includeFilteredContinued(stream, state) - || eachContinued(stream, state) - || attrsContinued(stream, state) - || javaScript(stream, state) - || javaScriptArguments(stream, state) - || callArguments(stream, state) - - || yieldStatement(stream, state) - || doctype(stream, state) - || interpolation(stream, state) - || caseStatement(stream, state) - || when(stream, state) - || defaultStatement(stream, state) - || extendsStatement(stream, state) - || append(stream, state) - || prepend(stream, state) - || block(stream, state) - || include(stream, state) - || includeFiltered(stream, state) - || mixin(stream, state) - || call(stream, state) - || conditional(stream, state) - || each(stream, state) - || whileStatement(stream, state) - || tag(stream, state) - || filter(stream, state) - || code(stream, state) - || id(stream, state) - || className(stream, state) - || attrs(stream, state) - || attributesBlock(stream, state) - || indent(stream, state) - || text(stream, state) - || comment(stream, state) - || colon(stream, state) - || dot(stream, state) - || fail(stream, state); - - return tok === true ? null : tok; - } - return { - startState: startState, - copyState: copyState, - token: nextToken - }; -}); - -CodeMirror.defineMIME('text/x-jade', 'jade'); - -}); diff --git a/kallithea/public/codemirror/mode/javascript/javascript.js b/kallithea/public/codemirror/mode/javascript/javascript.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/javascript/javascript.js +++ /dev/null @@ -1,684 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// TODO actually recognize syntax of TypeScript constructs - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("javascript", function(config, parserConfig) { - var indentUnit = config.indentUnit; - var statementIndent = parserConfig.statementIndent; - var jsonldMode = parserConfig.jsonld; - var jsonMode = parserConfig.json || jsonldMode; - var isTS = parserConfig.typescript; - var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/; - - // Tokenizer - - var keywords = function(){ - function kw(type) {return {type: type, style: "keyword"};} - var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"); - var operator = kw("operator"), atom = {type: "atom", style: "atom"}; - - var jsKeywords = { - "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B, - "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, "debugger": C, - "var": kw("var"), "const": kw("var"), "let": kw("var"), - "function": kw("function"), "catch": kw("catch"), - "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"), - "in": operator, "typeof": operator, "instanceof": operator, - "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom, - "this": kw("this"), "module": kw("module"), "class": kw("class"), "super": kw("atom"), - "yield": C, "export": kw("export"), "import": kw("import"), "extends": C - }; - - // Extend the 'normal' keywords with the TypeScript language extensions - if (isTS) { - var type = {type: "variable", style: "variable-3"}; - var tsKeywords = { - // object-like things - "interface": kw("interface"), - "extends": kw("extends"), - "constructor": kw("constructor"), - - // scope modifiers - "public": kw("public"), - "private": kw("private"), - "protected": kw("protected"), - "static": kw("static"), - - // types - "string": type, "number": type, "bool": type, "any": type - }; - - for (var attr in tsKeywords) { - jsKeywords[attr] = tsKeywords[attr]; - } - } - - return jsKeywords; - }(); - - var isOperatorChar = /[+\-*&%=<>!?|~^]/; - var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/; - - function readRegexp(stream) { - var escaped = false, next, inSet = false; - while ((next = stream.next()) != null) { - if (!escaped) { - if (next == "/" && !inSet) return; - if (next == "[") inSet = true; - else if (inSet && next == "]") inSet = false; - } - escaped = !escaped && next == "\\"; - } - } - - // Used as scratch variables to communicate multiple values without - // consing up tons of objects. - var type, content; - function ret(tp, style, cont) { - type = tp; content = cont; - return style; - } - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"' || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) { - return ret("number", "number"); - } else if (ch == "." && stream.match("..")) { - return ret("spread", "meta"); - } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - return ret(ch); - } else if (ch == "=" && stream.eat(">")) { - return ret("=>", "operator"); - } else if (ch == "0" && stream.eat(/x/i)) { - stream.eatWhile(/[\da-f]/i); - return ret("number", "number"); - } else if (/\d/.test(ch)) { - stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/); - return ret("number", "number"); - } else if (ch == "/") { - if (stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } else if (stream.eat("/")) { - stream.skipToEnd(); - return ret("comment", "comment"); - } else if (state.lastType == "operator" || state.lastType == "keyword c" || - state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) { - readRegexp(stream); - stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla - return ret("regexp", "string-2"); - } else { - stream.eatWhile(isOperatorChar); - return ret("operator", "operator", stream.current()); - } - } else if (ch == "`") { - state.tokenize = tokenQuasi; - return tokenQuasi(stream, state); - } else if (ch == "#") { - stream.skipToEnd(); - return ret("error", "error"); - } else if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return ret("operator", "operator", stream.current()); - } else if (wordRE.test(ch)) { - stream.eatWhile(wordRE); - var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word]; - return (known && state.lastType != ".") ? ret(known.type, known.style, word) : - ret("variable", "variable", word); - } - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next; - if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){ - state.tokenize = tokenBase; - return ret("jsonld-keyword", "meta"); - } - while ((next = stream.next()) != null) { - if (next == quote && !escaped) break; - escaped = !escaped && next == "\\"; - } - if (!escaped) state.tokenize = tokenBase; - return ret("string", "string"); - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return ret("comment", "comment"); - } - - function tokenQuasi(stream, state) { - var escaped = false, next; - while ((next = stream.next()) != null) { - if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) { - state.tokenize = tokenBase; - break; - } - escaped = !escaped && next == "\\"; - } - return ret("quasi", "string-2", stream.current()); - } - - var brackets = "([{}])"; - // This is a crude lookahead trick to try and notice that we're - // parsing the argument patterns for a fat-arrow function before we - // actually hit the arrow token. It only works if the arrow is on - // the same line as the arguments and there's no strange noise - // (comments) in between. Fallback is to only notice when we hit the - // arrow, and not declare the arguments as locals for the arrow - // body. - function findFatArrow(stream, state) { - if (state.fatArrowAt) state.fatArrowAt = null; - var arrow = stream.string.indexOf("=>", stream.start); - if (arrow < 0) return; - - var depth = 0, sawSomething = false; - for (var pos = arrow - 1; pos >= 0; --pos) { - var ch = stream.string.charAt(pos); - var bracket = brackets.indexOf(ch); - if (bracket >= 0 && bracket < 3) { - if (!depth) { ++pos; break; } - if (--depth == 0) break; - } else if (bracket >= 3 && bracket < 6) { - ++depth; - } else if (wordRE.test(ch)) { - sawSomething = true; - } else if (sawSomething && !depth) { - ++pos; - break; - } - } - if (sawSomething && !depth) state.fatArrowAt = pos; - } - - // Parser - - var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true}; - - function JSLexical(indented, column, type, align, prev, info) { - this.indented = indented; - this.column = column; - this.type = type; - this.prev = prev; - this.info = info; - if (align != null) this.align = align; - } - - function inScope(state, varname) { - for (var v = state.localVars; v; v = v.next) - if (v.name == varname) return true; - for (var cx = state.context; cx; cx = cx.prev) { - for (var v = cx.vars; v; v = v.next) - if (v.name == varname) return true; - } - } - - function parseJS(state, style, type, content, stream) { - var cc = state.cc; - // Communicate our context to the combinators. - // (Less wasteful than consing up a hundred closures on every call.) - cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style; - - if (!state.lexical.hasOwnProperty("align")) - state.lexical.align = true; - - while(true) { - var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement; - if (combinator(type, content)) { - while(cc.length && cc[cc.length - 1].lex) - cc.pop()(); - if (cx.marked) return cx.marked; - if (type == "variable" && inScope(state, content)) return "variable-2"; - return style; - } - } - } - - // Combinator utils - - var cx = {state: null, column: null, marked: null, cc: null}; - function pass() { - for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]); - } - function cont() { - pass.apply(null, arguments); - return true; - } - function register(varname) { - function inList(list) { - for (var v = list; v; v = v.next) - if (v.name == varname) return true; - return false; - } - var state = cx.state; - if (state.context) { - cx.marked = "def"; - if (inList(state.localVars)) return; - state.localVars = {name: varname, next: state.localVars}; - } else { - if (inList(state.globalVars)) return; - if (parserConfig.globalVars) - state.globalVars = {name: varname, next: state.globalVars}; - } - } - - // Combinators - - var defaultVars = {name: "this", next: {name: "arguments"}}; - function pushcontext() { - cx.state.context = {prev: cx.state.context, vars: cx.state.localVars}; - cx.state.localVars = defaultVars; - } - function popcontext() { - cx.state.localVars = cx.state.context.vars; - cx.state.context = cx.state.context.prev; - } - function pushlex(type, info) { - var result = function() { - var state = cx.state, indent = state.indented; - if (state.lexical.type == "stat") indent = state.lexical.indented; - else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev) - indent = outer.indented; - state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info); - }; - result.lex = true; - return result; - } - function poplex() { - var state = cx.state; - if (state.lexical.prev) { - if (state.lexical.type == ")") - state.indented = state.lexical.indented; - state.lexical = state.lexical.prev; - } - } - poplex.lex = true; - - function expect(wanted) { - function exp(type) { - if (type == wanted) return cont(); - else if (wanted == ";") return pass(); - else return cont(exp); - }; - return exp; - } - - function statement(type, value) { - if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex); - if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex); - if (type == "keyword b") return cont(pushlex("form"), statement, poplex); - if (type == "{") return cont(pushlex("}"), block, poplex); - if (type == ";") return cont(); - if (type == "if") { - if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex) - cx.state.cc.pop()(); - return cont(pushlex("form"), expression, statement, poplex, maybeelse); - } - if (type == "function") return cont(functiondef); - if (type == "for") return cont(pushlex("form"), forspec, statement, poplex); - if (type == "variable") return cont(pushlex("stat"), maybelabel); - if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"), - block, poplex, poplex); - if (type == "case") return cont(expression, expect(":")); - if (type == "default") return cont(expect(":")); - if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"), - statement, poplex, popcontext); - if (type == "module") return cont(pushlex("form"), pushcontext, afterModule, popcontext, poplex); - if (type == "class") return cont(pushlex("form"), className, poplex); - if (type == "export") return cont(pushlex("form"), afterExport, poplex); - if (type == "import") return cont(pushlex("form"), afterImport, poplex); - return pass(pushlex("stat"), expression, expect(";"), poplex); - } - function expression(type) { - return expressionInner(type, false); - } - function expressionNoComma(type) { - return expressionInner(type, true); - } - function expressionInner(type, noComma) { - if (cx.state.fatArrowAt == cx.stream.start) { - var body = noComma ? arrowBodyNoComma : arrowBody; - if (type == "(") return cont(pushcontext, pushlex(")"), commasep(pattern, ")"), poplex, expect("=>"), body, popcontext); - else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext); - } - - var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma; - if (atomicTypes.hasOwnProperty(type)) return cont(maybeop); - if (type == "function") return cont(functiondef, maybeop); - if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression); - if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop); - if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression); - if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop); - if (type == "{") return contCommasep(objprop, "}", null, maybeop); - if (type == "quasi") { return pass(quasi, maybeop); } - return cont(); - } - function maybeexpression(type) { - if (type.match(/[;\}\)\],]/)) return pass(); - return pass(expression); - } - function maybeexpressionNoComma(type) { - if (type.match(/[;\}\)\],]/)) return pass(); - return pass(expressionNoComma); - } - - function maybeoperatorComma(type, value) { - if (type == ",") return cont(expression); - return maybeoperatorNoComma(type, value, false); - } - function maybeoperatorNoComma(type, value, noComma) { - var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma; - var expr = noComma == false ? expression : expressionNoComma; - if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext); - if (type == "operator") { - if (/\+\+|--/.test(value)) return cont(me); - if (value == "?") return cont(expression, expect(":"), expr); - return cont(expr); - } - if (type == "quasi") { return pass(quasi, me); } - if (type == ";") return; - if (type == "(") return contCommasep(expressionNoComma, ")", "call", me); - if (type == ".") return cont(property, me); - if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me); - } - function quasi(type, value) { - if (type != "quasi") return pass(); - if (value.slice(value.length - 2) != "${") return cont(quasi); - return cont(expression, continueQuasi); - } - function continueQuasi(type) { - if (type == "}") { - cx.marked = "string-2"; - cx.state.tokenize = tokenQuasi; - return cont(quasi); - } - } - function arrowBody(type) { - findFatArrow(cx.stream, cx.state); - return pass(type == "{" ? statement : expression); - } - function arrowBodyNoComma(type) { - findFatArrow(cx.stream, cx.state); - return pass(type == "{" ? statement : expressionNoComma); - } - function maybelabel(type) { - if (type == ":") return cont(poplex, statement); - return pass(maybeoperatorComma, expect(";"), poplex); - } - function property(type) { - if (type == "variable") {cx.marked = "property"; return cont();} - } - function objprop(type, value) { - if (type == "variable" || cx.style == "keyword") { - cx.marked = "property"; - if (value == "get" || value == "set") return cont(getterSetter); - return cont(afterprop); - } else if (type == "number" || type == "string") { - cx.marked = jsonldMode ? "property" : (cx.style + " property"); - return cont(afterprop); - } else if (type == "jsonld-keyword") { - return cont(afterprop); - } else if (type == "[") { - return cont(expression, expect("]"), afterprop); - } - } - function getterSetter(type) { - if (type != "variable") return pass(afterprop); - cx.marked = "property"; - return cont(functiondef); - } - function afterprop(type) { - if (type == ":") return cont(expressionNoComma); - if (type == "(") return pass(functiondef); - } - function commasep(what, end) { - function proceed(type) { - if (type == ",") { - var lex = cx.state.lexical; - if (lex.info == "call") lex.pos = (lex.pos || 0) + 1; - return cont(what, proceed); - } - if (type == end) return cont(); - return cont(expect(end)); - } - return function(type) { - if (type == end) return cont(); - return pass(what, proceed); - }; - } - function contCommasep(what, end, info) { - for (var i = 3; i < arguments.length; i++) - cx.cc.push(arguments[i]); - return cont(pushlex(end, info), commasep(what, end), poplex); - } - function block(type) { - if (type == "}") return cont(); - return pass(statement, block); - } - function maybetype(type) { - if (isTS && type == ":") return cont(typedef); - } - function typedef(type) { - if (type == "variable"){cx.marked = "variable-3"; return cont();} - } - function vardef() { - return pass(pattern, maybetype, maybeAssign, vardefCont); - } - function pattern(type, value) { - if (type == "variable") { register(value); return cont(); } - if (type == "[") return contCommasep(pattern, "]"); - if (type == "{") return contCommasep(proppattern, "}"); - } - function proppattern(type, value) { - if (type == "variable" && !cx.stream.match(/^\s*:/, false)) { - register(value); - return cont(maybeAssign); - } - if (type == "variable") cx.marked = "property"; - return cont(expect(":"), pattern, maybeAssign); - } - function maybeAssign(_type, value) { - if (value == "=") return cont(expressionNoComma); - } - function vardefCont(type) { - if (type == ",") return cont(vardef); - } - function maybeelse(type, value) { - if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex); - } - function forspec(type) { - if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex); - } - function forspec1(type) { - if (type == "var") return cont(vardef, expect(";"), forspec2); - if (type == ";") return cont(forspec2); - if (type == "variable") return cont(formaybeinof); - return pass(expression, expect(";"), forspec2); - } - function formaybeinof(_type, value) { - if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); } - return cont(maybeoperatorComma, forspec2); - } - function forspec2(type, value) { - if (type == ";") return cont(forspec3); - if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); } - return pass(expression, expect(";"), forspec3); - } - function forspec3(type) { - if (type != ")") cont(expression); - } - function functiondef(type, value) { - if (value == "*") {cx.marked = "keyword"; return cont(functiondef);} - if (type == "variable") {register(value); return cont(functiondef);} - if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, statement, popcontext); - } - function funarg(type) { - if (type == "spread") return cont(funarg); - return pass(pattern, maybetype); - } - function className(type, value) { - if (type == "variable") {register(value); return cont(classNameAfter);} - } - function classNameAfter(type, value) { - if (value == "extends") return cont(expression, classNameAfter); - if (type == "{") return cont(pushlex("}"), classBody, poplex); - } - function classBody(type, value) { - if (type == "variable" || cx.style == "keyword") { - cx.marked = "property"; - if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody); - return cont(functiondef, classBody); - } - if (value == "*") { - cx.marked = "keyword"; - return cont(classBody); - } - if (type == ";") return cont(classBody); - if (type == "}") return cont(); - } - function classGetterSetter(type) { - if (type != "variable") return pass(); - cx.marked = "property"; - return cont(); - } - function afterModule(type, value) { - if (type == "string") return cont(statement); - if (type == "variable") { register(value); return cont(maybeFrom); } - } - function afterExport(_type, value) { - if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); } - if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); } - return pass(statement); - } - function afterImport(type) { - if (type == "string") return cont(); - return pass(importSpec, maybeFrom); - } - function importSpec(type, value) { - if (type == "{") return contCommasep(importSpec, "}"); - if (type == "variable") register(value); - return cont(); - } - function maybeFrom(_type, value) { - if (value == "from") { cx.marked = "keyword"; return cont(expression); } - } - function arrayLiteral(type) { - if (type == "]") return cont(); - return pass(expressionNoComma, maybeArrayComprehension); - } - function maybeArrayComprehension(type) { - if (type == "for") return pass(comprehension, expect("]")); - if (type == ",") return cont(commasep(maybeexpressionNoComma, "]")); - return pass(commasep(expressionNoComma, "]")); - } - function comprehension(type) { - if (type == "for") return cont(forspec, comprehension); - if (type == "if") return cont(expression, comprehension); - } - - // Interface - - return { - startState: function(basecolumn) { - var state = { - tokenize: tokenBase, - lastType: "sof", - cc: [], - lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false), - localVars: parserConfig.localVars, - context: parserConfig.localVars && {vars: parserConfig.localVars}, - indented: 0 - }; - if (parserConfig.globalVars && typeof parserConfig.globalVars == "object") - state.globalVars = parserConfig.globalVars; - return state; - }, - - token: function(stream, state) { - if (stream.sol()) { - if (!state.lexical.hasOwnProperty("align")) - state.lexical.align = false; - state.indented = stream.indentation(); - findFatArrow(stream, state); - } - if (state.tokenize != tokenComment && stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - if (type == "comment") return style; - state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type; - return parseJS(state, style, type, content, stream); - }, - - indent: function(state, textAfter) { - if (state.tokenize == tokenComment) return CodeMirror.Pass; - if (state.tokenize != tokenBase) return 0; - var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical; - // Kludge to prevent 'maybelse' from blocking lexical scope pops - if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) { - var c = state.cc[i]; - if (c == poplex) lexical = lexical.prev; - else if (c != maybeelse) break; - } - if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev; - if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat") - lexical = lexical.prev; - var type = lexical.type, closing = firstChar == type; - - if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0); - else if (type == "form" && firstChar == "{") return lexical.indented; - else if (type == "form") return lexical.indented + indentUnit; - else if (type == "stat") - return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? statementIndent || indentUnit : 0); - else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false) - return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit); - else if (lexical.align) return lexical.column + (closing ? 0 : 1); - else return lexical.indented + (closing ? 0 : indentUnit); - }, - - electricInput: /^\s*(?:case .*?:|default:|\{|\})$/, - blockCommentStart: jsonMode ? null : "/*", - blockCommentEnd: jsonMode ? null : "*/", - lineComment: jsonMode ? null : "//", - fold: "brace", - - helperType: jsonMode ? "json" : "javascript", - jsonldMode: jsonldMode, - jsonMode: jsonMode - }; -}); - -CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/); - -CodeMirror.defineMIME("text/javascript", "javascript"); -CodeMirror.defineMIME("text/ecmascript", "javascript"); -CodeMirror.defineMIME("application/javascript", "javascript"); -CodeMirror.defineMIME("application/x-javascript", "javascript"); -CodeMirror.defineMIME("application/ecmascript", "javascript"); -CodeMirror.defineMIME("application/json", {name: "javascript", json: true}); -CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true}); -CodeMirror.defineMIME("application/ld+json", {name: "javascript", jsonld: true}); -CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true }); -CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true }); - -}); diff --git a/kallithea/public/codemirror/mode/jinja2/jinja2.js b/kallithea/public/codemirror/mode/jinja2/jinja2.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/jinja2/jinja2.js +++ /dev/null @@ -1,142 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - CodeMirror.defineMode("jinja2", function() { - var keywords = ["and", "as", "block", "endblock", "by", "cycle", "debug", "else", "elif", - "extends", "filter", "endfilter", "firstof", "for", - "endfor", "if", "endif", "ifchanged", "endifchanged", - "ifequal", "endifequal", "ifnotequal", - "endifnotequal", "in", "include", "load", "not", "now", "or", - "parsed", "regroup", "reversed", "spaceless", - "endspaceless", "ssi", "templatetag", "openblock", - "closeblock", "openvariable", "closevariable", - "openbrace", "closebrace", "opencomment", - "closecomment", "widthratio", "url", "with", "endwith", - "get_current_language", "trans", "endtrans", "noop", "blocktrans", - "endblocktrans", "get_available_languages", - "get_current_language_bidi", "plural"], - operator = /^[+\-*&%=<>!?|~^]/, - sign = /^[:\[\(\{]/, - atom = ["true", "false"], - number = /^(\d[+\-\*\/])?\d+(\.\d+)?/; - - keywords = new RegExp("((" + keywords.join(")|(") + "))\\b"); - atom = new RegExp("((" + atom.join(")|(") + "))\\b"); - - function tokenBase (stream, state) { - var ch = stream.peek(); - - //Comment - if (state.incomment) { - if(!stream.skipTo("#}")) { - stream.skipToEnd(); - } else { - stream.eatWhile(/\#|}/); - state.incomment = false; - } - return "comment"; - //Tag - } else if (state.intag) { - //After operator - if(state.operator) { - state.operator = false; - if(stream.match(atom)) { - return "atom"; - } - if(stream.match(number)) { - return "number"; - } - } - //After sign - if(state.sign) { - state.sign = false; - if(stream.match(atom)) { - return "atom"; - } - if(stream.match(number)) { - return "number"; - } - } - - if(state.instring) { - if(ch == state.instring) { - state.instring = false; - } - stream.next(); - return "string"; - } else if(ch == "'" || ch == '"') { - state.instring = ch; - stream.next(); - return "string"; - } else if(stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) { - state.intag = false; - return "tag"; - } else if(stream.match(operator)) { - state.operator = true; - return "operator"; - } else if(stream.match(sign)) { - state.sign = true; - } else { - if(stream.eat(" ") || stream.sol()) { - if(stream.match(keywords)) { - return "keyword"; - } - if(stream.match(atom)) { - return "atom"; - } - if(stream.match(number)) { - return "number"; - } - if(stream.sol()) { - stream.next(); - } - } else { - stream.next(); - } - - } - return "variable"; - } else if (stream.eat("{")) { - if (ch = stream.eat("#")) { - state.incomment = true; - if(!stream.skipTo("#}")) { - stream.skipToEnd(); - } else { - stream.eatWhile(/\#|}/); - state.incomment = false; - } - return "comment"; - //Open tag - } else if (ch = stream.eat(/\{|%/)) { - //Cache close tag - state.intag = ch; - if(ch == "{") { - state.intag = "}"; - } - stream.eat("-"); - return "tag"; - } - } - stream.next(); - }; - - return { - startState: function () { - return {tokenize: tokenBase}; - }, - token: function (stream, state) { - return state.tokenize(stream, state); - } - }; - }); -}); diff --git a/kallithea/public/codemirror/mode/julia/julia.js b/kallithea/public/codemirror/mode/julia/julia.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/julia/julia.js +++ /dev/null @@ -1,301 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("julia", function(_conf, parserConf) { - var ERRORCLASS = 'error'; - - function wordRegexp(words) { - return new RegExp("^((" + words.join(")|(") + "))\\b"); - } - - var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b/; - var delimiters = parserConf.delimiters || /^[;,()[\]{}]/; - var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/; - var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"]; - var blockClosers = ["end", "else", "elseif", "catch", "finally"]; - var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall']; - var builtinList = ['true', 'false', 'enumerate', 'open', 'close', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'UTF8String', 'ASCIIString', 'error', 'warn', 'info', '@printf']; - - //var stringPrefixes = new RegExp("^[br]?('|\")") - var stringPrefixes = /^(`|'|"{3}|([br]?"))/; - var keywords = wordRegexp(keywordList); - var builtins = wordRegexp(builtinList); - var openers = wordRegexp(blockOpeners); - var closers = wordRegexp(blockClosers); - var macro = /^@[_A-Za-z][_A-Za-z0-9]*/; - var symbol = /^:[_A-Za-z][_A-Za-z0-9]*/; - var indentInfo = null; - - function in_array(state) { - var ch = cur_scope(state); - if(ch=="[" || ch=="{") { - return true; - } - else { - return false; - } - } - - function cur_scope(state) { - if(state.scopes.length==0) { - return null; - } - return state.scopes[state.scopes.length - 1]; - } - - // tokenizers - function tokenBase(stream, state) { - // Handle scope changes - var leaving_expr = state.leaving_expr; - if(stream.sol()) { - leaving_expr = false; - } - state.leaving_expr = false; - if(leaving_expr) { - if(stream.match(/^'+/)) { - return 'operator'; - } - - } - - if(stream.match(/^\.{2,3}/)) { - return 'operator'; - } - - if (stream.eatSpace()) { - return null; - } - - var ch = stream.peek(); - // Handle Comments - if (ch === '#') { - stream.skipToEnd(); - return 'comment'; - } - if(ch==='[') { - state.scopes.push("["); - } - - if(ch==='{') { - state.scopes.push("{"); - } - - var scope=cur_scope(state); - - if(scope==='[' && ch===']') { - state.scopes.pop(); - state.leaving_expr=true; - } - - if(scope==='{' && ch==='}') { - state.scopes.pop(); - state.leaving_expr=true; - } - - if(ch===')') { - state.leaving_expr = true; - } - - var match; - if(!in_array(state) && (match=stream.match(openers, false))) { - state.scopes.push(match); - } - - if(!in_array(state) && stream.match(closers, false)) { - state.scopes.pop(); - } - - if(in_array(state)) { - if(stream.match(/^end/)) { - return 'number'; - } - - } - - if(stream.match(/^=>/)) { - return 'operator'; - } - - - // Handle Number Literals - if (stream.match(/^[0-9\.]/, false)) { - var imMatcher = RegExp(/^im\b/); - var floatLiteral = false; - // Floats - if (stream.match(/^\d*\.(?!\.)\d+([ef][\+\-]?\d+)?/i)) { floatLiteral = true; } - if (stream.match(/^\d+\.(?!\.)\d*/)) { floatLiteral = true; } - if (stream.match(/^\.\d+/)) { floatLiteral = true; } - if (floatLiteral) { - // Float literals may be "imaginary" - stream.match(imMatcher); - state.leaving_expr = true; - return 'number'; - } - // Integers - var intLiteral = false; - // Hex - if (stream.match(/^0x[0-9a-f]+/i)) { intLiteral = true; } - // Binary - if (stream.match(/^0b[01]+/i)) { intLiteral = true; } - // Octal - if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; } - // Decimal - if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) { - intLiteral = true; - } - // Zero by itself with no other piece of number. - if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; } - if (intLiteral) { - // Integer literals may be "long" - stream.match(imMatcher); - state.leaving_expr = true; - return 'number'; - } - } - - if(stream.match(/^(::)|(<:)/)) { - return 'operator'; - } - - // Handle symbols - if(!leaving_expr && stream.match(symbol)) { - return 'string'; - } - - // Handle operators and Delimiters - if (stream.match(operators)) { - return 'operator'; - } - - - // Handle Strings - if (stream.match(stringPrefixes)) { - state.tokenize = tokenStringFactory(stream.current()); - return state.tokenize(stream, state); - } - - if (stream.match(macro)) { - return 'meta'; - } - - - if (stream.match(delimiters)) { - return null; - } - - if (stream.match(keywords)) { - return 'keyword'; - } - - if (stream.match(builtins)) { - return 'builtin'; - } - - - if (stream.match(identifiers)) { - state.leaving_expr=true; - return 'variable'; - } - // Handle non-detected items - stream.next(); - return ERRORCLASS; - } - - function tokenStringFactory(delimiter) { - while ('rub'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) { - delimiter = delimiter.substr(1); - } - var singleline = delimiter.length == 1; - var OUTCLASS = 'string'; - - function tokenString(stream, state) { - while (!stream.eol()) { - stream.eatWhile(/[^'"\\]/); - if (stream.eat('\\')) { - stream.next(); - if (singleline && stream.eol()) { - return OUTCLASS; - } - } else if (stream.match(delimiter)) { - state.tokenize = tokenBase; - return OUTCLASS; - } else { - stream.eat(/['"]/); - } - } - if (singleline) { - if (parserConf.singleLineStringErrors) { - return ERRORCLASS; - } else { - state.tokenize = tokenBase; - } - } - return OUTCLASS; - } - tokenString.isString = true; - return tokenString; - } - - function tokenLexer(stream, state) { - indentInfo = null; - var style = state.tokenize(stream, state); - var current = stream.current(); - - // Handle '.' connected identifiers - if (current === '.') { - style = stream.match(identifiers, false) ? null : ERRORCLASS; - if (style === null && state.lastStyle === 'meta') { - // Apply 'meta' style to '.' connected identifiers when - // appropriate. - style = 'meta'; - } - return style; - } - - return style; - } - - var external = { - startState: function() { - return { - tokenize: tokenBase, - scopes: [], - leaving_expr: false - }; - }, - - token: function(stream, state) { - var style = tokenLexer(stream, state); - state.lastStyle = style; - return style; - }, - - indent: function(state, textAfter) { - var delta = 0; - if(textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif" || textAfter=="catch" || textAfter=="finally") { - delta = -1; - } - return (state.scopes.length + delta) * 4; - }, - - lineComment: "#", - fold: "indent", - electricChars: "edlsifyh]}" - }; - return external; -}); - - -CodeMirror.defineMIME("text/x-julia", "julia"); - -}); diff --git a/kallithea/public/codemirror/mode/kotlin/kotlin.js b/kallithea/public/codemirror/mode/kotlin/kotlin.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/kotlin/kotlin.js +++ /dev/null @@ -1,280 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("kotlin", function (config, parserConfig) { - function words(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - var multiLineStrings = parserConfig.multiLineStrings; - - var keywords = words( - "package continue return object while break class data trait throw super" + - " when type this else This try val var fun for is in if do as true false null get set"); - var softKeywords = words("import" + - " where by get set abstract enum open annotation override private public internal" + - " protected catch out vararg inline finally final ref"); - var blockKeywords = words("catch class do else finally for if where try while enum"); - var atoms = words("null true false this"); - - var curPunc; - - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"' || ch == "'") { - return startString(ch, stream, state); - } - // Wildcard import w/o trailing semicolon (import smth.*) - if (ch == "." && stream.eat("*")) { - return "word"; - } - if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - curPunc = ch; - return null; - } - if (/\d/.test(ch)) { - if (stream.eat(/eE/)) { - stream.eat(/\+\-/); - stream.eatWhile(/\d/); - } - return "number"; - } - if (ch == "/") { - if (stream.eat("*")) { - state.tokenize.push(tokenComment); - return tokenComment(stream, state); - } - if (stream.eat("/")) { - stream.skipToEnd(); - return "comment"; - } - if (expectExpression(state.lastToken)) { - return startString(ch, stream, state); - } - } - // Commented - if (ch == "-" && stream.eat(">")) { - curPunc = "->"; - return null; - } - if (/[\-+*&%=<>!?|\/~]/.test(ch)) { - stream.eatWhile(/[\-+*&%=<>|~]/); - return "operator"; - } - stream.eatWhile(/[\w\$_]/); - - var cur = stream.current(); - if (atoms.propertyIsEnumerable(cur)) { - return "atom"; - } - if (softKeywords.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "softKeyword"; - } - - if (keywords.propertyIsEnumerable(cur)) { - if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement"; - return "keyword"; - } - return "word"; - } - - tokenBase.isBase = true; - - function startString(quote, stream, state) { - var tripleQuoted = false; - if (quote != "/" && stream.eat(quote)) { - if (stream.eat(quote)) tripleQuoted = true; - else return "string"; - } - function t(stream, state) { - var escaped = false, next, end = !tripleQuoted; - - while ((next = stream.next()) != null) { - if (next == quote && !escaped) { - if (!tripleQuoted) { - break; - } - if (stream.match(quote + quote)) { - end = true; - break; - } - } - - if (quote == '"' && next == "$" && !escaped && stream.eat("{")) { - state.tokenize.push(tokenBaseUntilBrace()); - return "string"; - } - - if (next == "$" && !escaped && !stream.eat(" ")) { - state.tokenize.push(tokenBaseUntilSpace()); - return "string"; - } - escaped = !escaped && next == "\\"; - } - if (multiLineStrings) - state.tokenize.push(t); - if (end) state.tokenize.pop(); - return "string"; - } - - state.tokenize.push(t); - return t(stream, state); - } - - function tokenBaseUntilBrace() { - var depth = 1; - - function t(stream, state) { - if (stream.peek() == "}") { - depth--; - if (depth == 0) { - state.tokenize.pop(); - return state.tokenize[state.tokenize.length - 1](stream, state); - } - } else if (stream.peek() == "{") { - depth++; - } - return tokenBase(stream, state); - } - - t.isBase = true; - return t; - } - - function tokenBaseUntilSpace() { - function t(stream, state) { - if (stream.eat(/[\w]/)) { - var isWord = stream.eatWhile(/[\w]/); - if (isWord) { - state.tokenize.pop(); - return "word"; - } - } - state.tokenize.pop(); - return "string"; - } - - t.isBase = true; - return t; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize.pop(); - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function expectExpression(last) { - return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) || - last == "newstatement" || last == "keyword" || last == "proplabel"; - } - - function Context(indented, column, type, align, prev) { - this.indented = indented; - this.column = column; - this.type = type; - this.align = align; - this.prev = prev; - } - - function pushContext(state, col, type) { - return state.context = new Context(state.indented, col, type, null, state.context); - } - - function popContext(state) { - var t = state.context.type; - if (t == ")" || t == "]" || t == "}") - state.indented = state.context.indented; - return state.context = state.context.prev; - } - - // Interface - - return { - startState: function (basecolumn) { - return { - tokenize: [tokenBase], - context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false), - indented: 0, - startOfLine: true, - lastToken: null - }; - }, - - token: function (stream, state) { - var ctx = state.context; - if (stream.sol()) { - if (ctx.align == null) ctx.align = false; - state.indented = stream.indentation(); - state.startOfLine = true; - // Automatic semicolon insertion - if (ctx.type == "statement" && !expectExpression(state.lastToken)) { - popContext(state); - ctx = state.context; - } - } - if (stream.eatSpace()) return null; - curPunc = null; - var style = state.tokenize[state.tokenize.length - 1](stream, state); - if (style == "comment") return style; - if (ctx.align == null) ctx.align = true; - if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state); - // Handle indentation for {x -> \n ... } - else if (curPunc == "->" && ctx.type == "statement" && ctx.prev.type == "}") { - popContext(state); - state.context.align = false; - } - else if (curPunc == "{") pushContext(state, stream.column(), "}"); - else if (curPunc == "[") pushContext(state, stream.column(), "]"); - else if (curPunc == "(") pushContext(state, stream.column(), ")"); - else if (curPunc == "}") { - while (ctx.type == "statement") ctx = popContext(state); - if (ctx.type == "}") ctx = popContext(state); - while (ctx.type == "statement") ctx = popContext(state); - } - else if (curPunc == ctx.type) popContext(state); - else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement")) - pushContext(state, stream.column(), "statement"); - state.startOfLine = false; - state.lastToken = curPunc || style; - return style; - }, - - indent: function (state, textAfter) { - if (!state.tokenize[state.tokenize.length - 1].isBase) return 0; - var firstChar = textAfter && textAfter.charAt(0), ctx = state.context; - if (ctx.type == "statement" && !expectExpression(state.lastToken)) ctx = ctx.prev; - var closing = firstChar == ctx.type; - if (ctx.type == "statement") { - return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit); - } - else if (ctx.align) return ctx.column + (closing ? 0 : 1); - else return ctx.indented + (closing ? 0 : config.indentUnit); - }, - - electricChars: "{}" - }; -}); - -CodeMirror.defineMIME("text/x-kotlin", "kotlin"); - -}); diff --git a/kallithea/public/codemirror/mode/livescript/livescript.js b/kallithea/public/codemirror/mode/livescript/livescript.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/livescript/livescript.js +++ /dev/null @@ -1,280 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/** - * Link to the project's GitHub page: - * https://github.com/duralog/CodeMirror - */ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - CodeMirror.defineMode('livescript', function(){ - var tokenBase = function(stream, state) { - var next_rule = state.next || "start"; - if (next_rule) { - state.next = state.next; - var nr = Rules[next_rule]; - if (nr.splice) { - for (var i$ = 0; i$ < nr.length; ++i$) { - var r = nr[i$], m; - if (r.regex && (m = stream.match(r.regex))) { - state.next = r.next || state.next; - return r.token; - } - } - stream.next(); - return 'error'; - } - if (stream.match(r = Rules[next_rule])) { - if (r.regex && stream.match(r.regex)) { - state.next = r.next; - return r.token; - } else { - stream.next(); - return 'error'; - } - } - } - stream.next(); - return 'error'; - }; - var external = { - startState: function(){ - return { - next: 'start', - lastToken: null - }; - }, - token: function(stream, state){ - while (stream.pos == stream.start) - var style = tokenBase(stream, state); - state.lastToken = { - style: style, - indent: stream.indentation(), - content: stream.current() - }; - return style.replace(/\./g, ' '); - }, - indent: function(state){ - var indentation = state.lastToken.indent; - if (state.lastToken.content.match(indenter)) { - indentation += 2; - } - return indentation; - } - }; - return external; - }); - - var identifier = '(?![\\d\\s])[$\\w\\xAA-\\uFFDC](?:(?!\\s)[$\\w\\xAA-\\uFFDC]|-[A-Za-z])*'; - var indenter = RegExp('(?:[({[=:]|[-~]>|\\b(?:e(?:lse|xport)|d(?:o|efault)|t(?:ry|hen)|finally|import(?:\\s*all)?|const|var|let|new|catch(?:\\s*' + identifier + ')?))\\s*$'); - var keywordend = '(?![$\\w]|-[A-Za-z]|\\s*:(?![:=]))'; - var stringfill = { - token: 'string', - regex: '.+' - }; - var Rules = { - start: [ - { - token: 'comment.doc', - regex: '/\\*', - next: 'comment' - }, { - token: 'comment', - regex: '#.*' - }, { - token: 'keyword', - regex: '(?:t(?:h(?:is|row|en)|ry|ypeof!?)|c(?:on(?:tinue|st)|a(?:se|tch)|lass)|i(?:n(?:stanceof)?|mp(?:ort(?:\\s+all)?|lements)|[fs])|d(?:e(?:fault|lete|bugger)|o)|f(?:or(?:\\s+own)?|inally|unction)|s(?:uper|witch)|e(?:lse|x(?:tends|port)|val)|a(?:nd|rguments)|n(?:ew|ot)|un(?:less|til)|w(?:hile|ith)|o[fr]|return|break|let|var|loop)' + keywordend - }, { - token: 'constant.language', - regex: '(?:true|false|yes|no|on|off|null|void|undefined)' + keywordend - }, { - token: 'invalid.illegal', - regex: '(?:p(?:ackage|r(?:ivate|otected)|ublic)|i(?:mplements|nterface)|enum|static|yield)' + keywordend - }, { - token: 'language.support.class', - regex: '(?:R(?:e(?:gExp|ferenceError)|angeError)|S(?:tring|yntaxError)|E(?:rror|valError)|Array|Boolean|Date|Function|Number|Object|TypeError|URIError)' + keywordend - }, { - token: 'language.support.function', - regex: '(?:is(?:NaN|Finite)|parse(?:Int|Float)|Math|JSON|(?:en|de)codeURI(?:Component)?)' + keywordend - }, { - token: 'variable.language', - regex: '(?:t(?:hat|il|o)|f(?:rom|allthrough)|it|by|e)' + keywordend - }, { - token: 'identifier', - regex: identifier + '\\s*:(?![:=])' - }, { - token: 'variable', - regex: identifier - }, { - token: 'keyword.operator', - regex: '(?:\\.{3}|\\s+\\?)' - }, { - token: 'keyword.variable', - regex: '(?:@+|::|\\.\\.)', - next: 'key' - }, { - token: 'keyword.operator', - regex: '\\.\\s*', - next: 'key' - }, { - token: 'string', - regex: '\\\\\\S[^\\s,;)}\\]]*' - }, { - token: 'string.doc', - regex: '\'\'\'', - next: 'qdoc' - }, { - token: 'string.doc', - regex: '"""', - next: 'qqdoc' - }, { - token: 'string', - regex: '\'', - next: 'qstring' - }, { - token: 'string', - regex: '"', - next: 'qqstring' - }, { - token: 'string', - regex: '`', - next: 'js' - }, { - token: 'string', - regex: '<\\[', - next: 'words' - }, { - token: 'string.regex', - regex: '//', - next: 'heregex' - }, { - token: 'string.regex', - regex: '\\/(?:[^[\\/\\n\\\\]*(?:(?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[\\/\\n\\\\]*)*)\\/[gimy$]{0,4}', - next: 'key' - }, { - token: 'constant.numeric', - regex: '(?:0x[\\da-fA-F][\\da-fA-F_]*|(?:[2-9]|[12]\\d|3[0-6])r[\\da-zA-Z][\\da-zA-Z_]*|(?:\\d[\\d_]*(?:\\.\\d[\\d_]*)?|\\.\\d[\\d_]*)(?:e[+-]?\\d[\\d_]*)?[\\w$]*)' - }, { - token: 'lparen', - regex: '[({[]' - }, { - token: 'rparen', - regex: '[)}\\]]', - next: 'key' - }, { - token: 'keyword.operator', - regex: '\\S+' - }, { - token: 'text', - regex: '\\s+' - } - ], - heregex: [ - { - token: 'string.regex', - regex: '.*?//[gimy$?]{0,4}', - next: 'start' - }, { - token: 'string.regex', - regex: '\\s*#{' - }, { - token: 'comment.regex', - regex: '\\s+(?:#.*)?' - }, { - token: 'string.regex', - regex: '\\S+' - } - ], - key: [ - { - token: 'keyword.operator', - regex: '[.?@!]+' - }, { - token: 'identifier', - regex: identifier, - next: 'start' - }, { - token: 'text', - regex: '', - next: 'start' - } - ], - comment: [ - { - token: 'comment.doc', - regex: '.*?\\*/', - next: 'start' - }, { - token: 'comment.doc', - regex: '.+' - } - ], - qdoc: [ - { - token: 'string', - regex: ".*?'''", - next: 'key' - }, stringfill - ], - qqdoc: [ - { - token: 'string', - regex: '.*?"""', - next: 'key' - }, stringfill - ], - qstring: [ - { - token: 'string', - regex: '[^\\\\\']*(?:\\\\.[^\\\\\']*)*\'', - next: 'key' - }, stringfill - ], - qqstring: [ - { - token: 'string', - regex: '[^\\\\"]*(?:\\\\.[^\\\\"]*)*"', - next: 'key' - }, stringfill - ], - js: [ - { - token: 'string', - regex: '[^\\\\`]*(?:\\\\.[^\\\\`]*)*`', - next: 'key' - }, stringfill - ], - words: [ - { - token: 'string', - regex: '.*?\\]>', - next: 'key' - }, stringfill - ] - }; - for (var idx in Rules) { - var r = Rules[idx]; - if (r.splice) { - for (var i = 0, len = r.length; i < len; ++i) { - var rr = r[i]; - if (typeof rr.regex === 'string') { - Rules[idx][i].regex = new RegExp('^' + rr.regex); - } - } - } else if (typeof rr.regex === 'string') { - Rules[idx].regex = new RegExp('^' + r.regex); - } - } - - CodeMirror.defineMIME('text/x-livescript', 'livescript'); - -}); diff --git a/kallithea/public/codemirror/mode/lua/lua.js b/kallithea/public/codemirror/mode/lua/lua.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/lua/lua.js +++ /dev/null @@ -1,159 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's -// CodeMirror 1 mode. -// highlights keywords, strings, comments (no leveling supported! ("[==[")), tokens, basic indenting - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("lua", function(config, parserConfig) { - var indentUnit = config.indentUnit; - - function prefixRE(words) { - return new RegExp("^(?:" + words.join("|") + ")", "i"); - } - function wordRE(words) { - return new RegExp("^(?:" + words.join("|") + ")$", "i"); - } - var specials = wordRE(parserConfig.specials || []); - - // long list of standard functions from lua manual - var builtins = wordRE([ - "_G","_VERSION","assert","collectgarbage","dofile","error","getfenv","getmetatable","ipairs","load", - "loadfile","loadstring","module","next","pairs","pcall","print","rawequal","rawget","rawset","require", - "select","setfenv","setmetatable","tonumber","tostring","type","unpack","xpcall", - - "coroutine.create","coroutine.resume","coroutine.running","coroutine.status","coroutine.wrap","coroutine.yield", - - "debug.debug","debug.getfenv","debug.gethook","debug.getinfo","debug.getlocal","debug.getmetatable", - "debug.getregistry","debug.getupvalue","debug.setfenv","debug.sethook","debug.setlocal","debug.setmetatable", - "debug.setupvalue","debug.traceback", - - "close","flush","lines","read","seek","setvbuf","write", - - "io.close","io.flush","io.input","io.lines","io.open","io.output","io.popen","io.read","io.stderr","io.stdin", - "io.stdout","io.tmpfile","io.type","io.write", - - "math.abs","math.acos","math.asin","math.atan","math.atan2","math.ceil","math.cos","math.cosh","math.deg", - "math.exp","math.floor","math.fmod","math.frexp","math.huge","math.ldexp","math.log","math.log10","math.max", - "math.min","math.modf","math.pi","math.pow","math.rad","math.random","math.randomseed","math.sin","math.sinh", - "math.sqrt","math.tan","math.tanh", - - "os.clock","os.date","os.difftime","os.execute","os.exit","os.getenv","os.remove","os.rename","os.setlocale", - "os.time","os.tmpname", - - "package.cpath","package.loaded","package.loaders","package.loadlib","package.path","package.preload", - "package.seeall", - - "string.byte","string.char","string.dump","string.find","string.format","string.gmatch","string.gsub", - "string.len","string.lower","string.match","string.rep","string.reverse","string.sub","string.upper", - - "table.concat","table.insert","table.maxn","table.remove","table.sort" - ]); - var keywords = wordRE(["and","break","elseif","false","nil","not","or","return", - "true","function", "end", "if", "then", "else", "do", - "while", "repeat", "until", "for", "in", "local" ]); - - var indentTokens = wordRE(["function", "if","repeat","do", "\\(", "{"]); - var dedentTokens = wordRE(["end", "until", "\\)", "}"]); - var dedentPartial = prefixRE(["end", "until", "\\)", "}", "else", "elseif"]); - - function readBracket(stream) { - var level = 0; - while (stream.eat("=")) ++level; - stream.eat("["); - return level; - } - - function normal(stream, state) { - var ch = stream.next(); - if (ch == "-" && stream.eat("-")) { - if (stream.eat("[") && stream.eat("[")) - return (state.cur = bracketed(readBracket(stream), "comment"))(stream, state); - stream.skipToEnd(); - return "comment"; - } - if (ch == "\"" || ch == "'") - return (state.cur = string(ch))(stream, state); - if (ch == "[" && /[\[=]/.test(stream.peek())) - return (state.cur = bracketed(readBracket(stream), "string"))(stream, state); - if (/\d/.test(ch)) { - stream.eatWhile(/[\w.%]/); - return "number"; - } - if (/[\w_]/.test(ch)) { - stream.eatWhile(/[\w\\\-_.]/); - return "variable"; - } - return null; - } - - function bracketed(level, style) { - return function(stream, state) { - var curlev = null, ch; - while ((ch = stream.next()) != null) { - if (curlev == null) {if (ch == "]") curlev = 0;} - else if (ch == "=") ++curlev; - else if (ch == "]" && curlev == level) { state.cur = normal; break; } - else curlev = null; - } - return style; - }; - } - - function string(quote) { - return function(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == quote && !escaped) break; - escaped = !escaped && ch == "\\"; - } - if (!escaped) state.cur = normal; - return "string"; - }; - } - - return { - startState: function(basecol) { - return {basecol: basecol || 0, indentDepth: 0, cur: normal}; - }, - - token: function(stream, state) { - if (stream.eatSpace()) return null; - var style = state.cur(stream, state); - var word = stream.current(); - if (style == "variable") { - if (keywords.test(word)) style = "keyword"; - else if (builtins.test(word)) style = "builtin"; - else if (specials.test(word)) style = "variable-2"; - } - if ((style != "comment") && (style != "string")){ - if (indentTokens.test(word)) ++state.indentDepth; - else if (dedentTokens.test(word)) --state.indentDepth; - } - return style; - }, - - indent: function(state, textAfter) { - var closing = dedentPartial.test(textAfter); - return state.basecol + indentUnit * (state.indentDepth - (closing ? 1 : 0)); - }, - - lineComment: "--", - blockCommentStart: "--[[", - blockCommentEnd: "]]" - }; -}); - -CodeMirror.defineMIME("text/x-lua", "lua"); - -}); diff --git a/kallithea/public/codemirror/mode/markdown/markdown.js b/kallithea/public/codemirror/mode/markdown/markdown.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/markdown/markdown.js +++ /dev/null @@ -1,758 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror", require("../xml/xml"))); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../xml/xml"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) { - - var htmlFound = CodeMirror.modes.hasOwnProperty("xml"); - var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain"); - var aliases = { - html: "htmlmixed", - js: "javascript", - json: "application/json", - c: "text/x-csrc", - "c++": "text/x-c++src", - java: "text/x-java", - csharp: "text/x-csharp", - "c#": "text/x-csharp", - scala: "text/x-scala" - }; - - var getMode = (function () { - var i, modes = {}, mimes = {}, mime; - - var list = []; - for (var m in CodeMirror.modes) - if (CodeMirror.modes.propertyIsEnumerable(m)) list.push(m); - for (i = 0; i < list.length; i++) { - modes[list[i]] = list[i]; - } - var mimesList = []; - for (var m in CodeMirror.mimeModes) - if (CodeMirror.mimeModes.propertyIsEnumerable(m)) - mimesList.push({mime: m, mode: CodeMirror.mimeModes[m]}); - for (i = 0; i < mimesList.length; i++) { - mime = mimesList[i].mime; - mimes[mime] = mimesList[i].mime; - } - - for (var a in aliases) { - if (aliases[a] in modes || aliases[a] in mimes) - modes[a] = aliases[a]; - } - - return function (lang) { - return modes[lang] ? CodeMirror.getMode(cmCfg, modes[lang]) : null; - }; - }()); - - // Should characters that affect highlighting be highlighted separate? - // Does not include characters that will be output (such as `1.` and `-` for lists) - if (modeCfg.highlightFormatting === undefined) - modeCfg.highlightFormatting = false; - - // Maximum number of nested blockquotes. Set to 0 for infinite nesting. - // Excess `>` will emit `error` token. - if (modeCfg.maxBlockquoteDepth === undefined) - modeCfg.maxBlockquoteDepth = 0; - - // Should underscores in words open/close em/strong? - if (modeCfg.underscoresBreakWords === undefined) - modeCfg.underscoresBreakWords = true; - - // Turn on fenced code blocks? ("```" to start/end) - if (modeCfg.fencedCodeBlocks === undefined) modeCfg.fencedCodeBlocks = false; - - // Turn on task lists? ("- [ ] " and "- [x] ") - if (modeCfg.taskLists === undefined) modeCfg.taskLists = false; - - var codeDepth = 0; - - var header = 'header' - , code = 'comment' - , quote = 'quote' - , list1 = 'variable-2' - , list2 = 'variable-3' - , list3 = 'keyword' - , hr = 'hr' - , image = 'tag' - , formatting = 'formatting' - , linkinline = 'link' - , linkemail = 'link' - , linktext = 'link' - , linkhref = 'string' - , em = 'em' - , strong = 'strong'; - - var hrRE = /^([*\-=_])(?:\s*\1){2,}\s*$/ - , ulRE = /^[*\-+]\s+/ - , olRE = /^[0-9]+\.\s+/ - , taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE - , atxHeaderRE = /^#+/ - , setextHeaderRE = /^(?:\={1,}|-{1,})$/ - , textRE = /^[^#!\[\]*_\\<>` "'(]+/; - - function switchInline(stream, state, f) { - state.f = state.inline = f; - return f(stream, state); - } - - function switchBlock(stream, state, f) { - state.f = state.block = f; - return f(stream, state); - } - - - // Blocks - - function blankLine(state) { - // Reset linkTitle state - state.linkTitle = false; - // Reset EM state - state.em = false; - // Reset STRONG state - state.strong = false; - // Reset state.quote - state.quote = 0; - if (!htmlFound && state.f == htmlBlock) { - state.f = inlineNormal; - state.block = blockNormal; - } - // Reset state.trailingSpace - state.trailingSpace = 0; - state.trailingSpaceNewLine = false; - // Mark this line as blank - state.thisLineHasContent = false; - return null; - } - - function blockNormal(stream, state) { - - var sol = stream.sol(); - - var prevLineIsList = (state.list !== false); - if (state.list !== false && state.indentationDiff >= 0) { // Continued list - if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block - state.indentation -= state.indentationDiff; - } - state.list = null; - } else if (state.list !== false && state.indentation > 0) { - state.list = null; - state.listDepth = Math.floor(state.indentation / 4); - } else if (state.list !== false) { // No longer a list - state.list = false; - state.listDepth = 0; - } - - var match = null; - if (state.indentationDiff >= 4) { - state.indentation -= 4; - stream.skipToEnd(); - return code; - } else if (stream.eatSpace()) { - return null; - } else if (match = stream.match(atxHeaderRE)) { - state.header = match[0].length <= 6 ? match[0].length : 6; - if (modeCfg.highlightFormatting) state.formatting = "header"; - state.f = state.inline; - return getType(state); - } else if (state.prevLineHasContent && (match = stream.match(setextHeaderRE))) { - state.header = match[0].charAt(0) == '=' ? 1 : 2; - if (modeCfg.highlightFormatting) state.formatting = "header"; - state.f = state.inline; - return getType(state); - } else if (stream.eat('>')) { - state.indentation++; - state.quote = sol ? 1 : state.quote + 1; - if (modeCfg.highlightFormatting) state.formatting = "quote"; - stream.eatSpace(); - return getType(state); - } else if (stream.peek() === '[') { - return switchInline(stream, state, footnoteLink); - } else if (stream.match(hrRE, true)) { - return hr; - } else if ((!state.prevLineHasContent || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) { - var listType = null; - if (stream.match(ulRE, true)) { - listType = 'ul'; - } else { - stream.match(olRE, true); - listType = 'ol'; - } - state.indentation += 4; - state.list = true; - state.listDepth++; - if (modeCfg.taskLists && stream.match(taskListRE, false)) { - state.taskList = true; - } - state.f = state.inline; - if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType]; - return getType(state); - } else if (modeCfg.fencedCodeBlocks && stream.match(/^```([\w+#]*)/, true)) { - // try switching mode - state.localMode = getMode(RegExp.$1); - if (state.localMode) state.localState = state.localMode.startState(); - switchBlock(stream, state, local); - if (modeCfg.highlightFormatting) state.formatting = "code-block"; - state.code = true; - return getType(state); - } - - return switchInline(stream, state, state.inline); - } - - function htmlBlock(stream, state) { - var style = htmlMode.token(stream, state.htmlState); - if ((htmlFound && state.htmlState.tagStart === null && !state.htmlState.context) || - (state.md_inside && stream.current().indexOf(">") > -1)) { - state.f = inlineNormal; - state.block = blockNormal; - state.htmlState = null; - } - return style; - } - - function local(stream, state) { - if (stream.sol() && stream.match(/^```/, true)) { - state.localMode = state.localState = null; - state.f = inlineNormal; - state.block = blockNormal; - if (modeCfg.highlightFormatting) state.formatting = "code-block"; - state.code = true; - var returnType = getType(state); - state.code = false; - return returnType; - } else if (state.localMode) { - return state.localMode.token(stream, state.localState); - } else { - stream.skipToEnd(); - return code; - } - } - - // Inline - function getType(state) { - var styles = []; - - if (state.formatting) { - styles.push(formatting); - - if (typeof state.formatting === "string") state.formatting = [state.formatting]; - - for (var i = 0; i < state.formatting.length; i++) { - styles.push(formatting + "-" + state.formatting[i]); - - if (state.formatting[i] === "header") { - styles.push(formatting + "-" + state.formatting[i] + "-" + state.header); - } - - // Add `formatting-quote` and `formatting-quote-#` for blockquotes - // Add `error` instead if the maximum blockquote nesting depth is passed - if (state.formatting[i] === "quote") { - if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) { - styles.push(formatting + "-" + state.formatting[i] + "-" + state.quote); - } else { - styles.push("error"); - } - } - } - } - - if (state.taskOpen) { - styles.push("meta"); - return styles.length ? styles.join(' ') : null; - } - if (state.taskClosed) { - styles.push("property"); - return styles.length ? styles.join(' ') : null; - } - - if (state.linkHref) { - styles.push(linkhref); - return styles.length ? styles.join(' ') : null; - } - - if (state.strong) { styles.push(strong); } - if (state.em) { styles.push(em); } - - if (state.linkText) { styles.push(linktext); } - - if (state.code) { styles.push(code); } - - if (state.header) { styles.push(header); styles.push(header + "-" + state.header); } - - if (state.quote) { - styles.push(quote); - - // Add `quote-#` where the maximum for `#` is modeCfg.maxBlockquoteDepth - if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) { - styles.push(quote + "-" + state.quote); - } else { - styles.push(quote + "-" + modeCfg.maxBlockquoteDepth); - } - } - - if (state.list !== false) { - var listMod = (state.listDepth - 1) % 3; - if (!listMod) { - styles.push(list1); - } else if (listMod === 1) { - styles.push(list2); - } else { - styles.push(list3); - } - } - - if (state.trailingSpaceNewLine) { - styles.push("trailing-space-new-line"); - } else if (state.trailingSpace) { - styles.push("trailing-space-" + (state.trailingSpace % 2 ? "a" : "b")); - } - - return styles.length ? styles.join(' ') : null; - } - - function handleText(stream, state) { - if (stream.match(textRE, true)) { - return getType(state); - } - return undefined; - } - - function inlineNormal(stream, state) { - var style = state.text(stream, state); - if (typeof style !== 'undefined') - return style; - - if (state.list) { // List marker (*, +, -, 1., etc) - state.list = null; - return getType(state); - } - - if (state.taskList) { - var taskOpen = stream.match(taskListRE, true)[1] !== "x"; - if (taskOpen) state.taskOpen = true; - else state.taskClosed = true; - if (modeCfg.highlightFormatting) state.formatting = "task"; - state.taskList = false; - return getType(state); - } - - state.taskOpen = false; - state.taskClosed = false; - - if (state.header && stream.match(/^#+$/, true)) { - if (modeCfg.highlightFormatting) state.formatting = "header"; - return getType(state); - } - - // Get sol() value now, before character is consumed - var sol = stream.sol(); - - var ch = stream.next(); - - if (ch === '\\') { - stream.next(); - if (modeCfg.highlightFormatting) { - var type = getType(state); - return type ? type + " formatting-escape" : "formatting-escape"; - } - } - - // Matches link titles present on next line - if (state.linkTitle) { - state.linkTitle = false; - var matchCh = ch; - if (ch === '(') { - matchCh = ')'; - } - matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1"); - var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh; - if (stream.match(new RegExp(regex), true)) { - return linkhref; - } - } - - // If this block is changed, it may need to be updated in GFM mode - if (ch === '`') { - var previousFormatting = state.formatting; - if (modeCfg.highlightFormatting) state.formatting = "code"; - var t = getType(state); - var before = stream.pos; - stream.eatWhile('`'); - var difference = 1 + stream.pos - before; - if (!state.code) { - codeDepth = difference; - state.code = true; - return getType(state); - } else { - if (difference === codeDepth) { // Must be exact - state.code = false; - return t; - } - state.formatting = previousFormatting; - return getType(state); - } - } else if (state.code) { - return getType(state); - } - - if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) { - stream.match(/\[[^\]]*\]/); - state.inline = state.f = linkHref; - return image; - } - - if (ch === '[' && stream.match(/.*\](\(| ?\[)/, false)) { - state.linkText = true; - if (modeCfg.highlightFormatting) state.formatting = "link"; - return getType(state); - } - - if (ch === ']' && state.linkText) { - if (modeCfg.highlightFormatting) state.formatting = "link"; - var type = getType(state); - state.linkText = false; - state.inline = state.f = linkHref; - return type; - } - - if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, false)) { - state.f = state.inline = linkInline; - if (modeCfg.highlightFormatting) state.formatting = "link"; - var type = getType(state); - if (type){ - type += " "; - } else { - type = ""; - } - return type + linkinline; - } - - if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) { - state.f = state.inline = linkInline; - if (modeCfg.highlightFormatting) state.formatting = "link"; - var type = getType(state); - if (type){ - type += " "; - } else { - type = ""; - } - return type + linkemail; - } - - if (ch === '<' && stream.match(/^\w/, false)) { - if (stream.string.indexOf(">") != -1) { - var atts = stream.string.substring(1,stream.string.indexOf(">")); - if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) { - state.md_inside = true; - } - } - stream.backUp(1); - state.htmlState = CodeMirror.startState(htmlMode); - return switchBlock(stream, state, htmlBlock); - } - - if (ch === '<' && stream.match(/^\/\w*?>/)) { - state.md_inside = false; - return "tag"; - } - - var ignoreUnderscore = false; - if (!modeCfg.underscoresBreakWords) { - if (ch === '_' && stream.peek() !== '_' && stream.match(/(\w)/, false)) { - var prevPos = stream.pos - 2; - if (prevPos >= 0) { - var prevCh = stream.string.charAt(prevPos); - if (prevCh !== '_' && prevCh.match(/(\w)/, false)) { - ignoreUnderscore = true; - } - } - } - } - if (ch === '*' || (ch === '_' && !ignoreUnderscore)) { - if (sol && stream.peek() === ' ') { - // Do nothing, surrounded by newline and space - } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG - if (modeCfg.highlightFormatting) state.formatting = "strong"; - var t = getType(state); - state.strong = false; - return t; - } else if (!state.strong && stream.eat(ch)) { // Add STRONG - state.strong = ch; - if (modeCfg.highlightFormatting) state.formatting = "strong"; - return getType(state); - } else if (state.em === ch) { // Remove EM - if (modeCfg.highlightFormatting) state.formatting = "em"; - var t = getType(state); - state.em = false; - return t; - } else if (!state.em) { // Add EM - state.em = ch; - if (modeCfg.highlightFormatting) state.formatting = "em"; - return getType(state); - } - } else if (ch === ' ') { - if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces - if (stream.peek() === ' ') { // Surrounded by spaces, ignore - return getType(state); - } else { // Not surrounded by spaces, back up pointer - stream.backUp(1); - } - } - } - - if (ch === ' ') { - if (stream.match(/ +$/, false)) { - state.trailingSpace++; - } else if (state.trailingSpace) { - state.trailingSpaceNewLine = true; - } - } - - return getType(state); - } - - function linkInline(stream, state) { - var ch = stream.next(); - - if (ch === ">") { - state.f = state.inline = inlineNormal; - if (modeCfg.highlightFormatting) state.formatting = "link"; - var type = getType(state); - if (type){ - type += " "; - } else { - type = ""; - } - return type + linkinline; - } - - stream.match(/^[^>]+/, true); - - return linkinline; - } - - function linkHref(stream, state) { - // Check if space, and return NULL if so (to avoid marking the space) - if(stream.eatSpace()){ - return null; - } - var ch = stream.next(); - if (ch === '(' || ch === '[') { - state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]"); - if (modeCfg.highlightFormatting) state.formatting = "link-string"; - state.linkHref = true; - return getType(state); - } - return 'error'; - } - - function getLinkHrefInside(endChar) { - return function(stream, state) { - var ch = stream.next(); - - if (ch === endChar) { - state.f = state.inline = inlineNormal; - if (modeCfg.highlightFormatting) state.formatting = "link-string"; - var returnState = getType(state); - state.linkHref = false; - return returnState; - } - - if (stream.match(inlineRE(endChar), true)) { - stream.backUp(1); - } - - state.linkHref = true; - return getType(state); - }; - } - - function footnoteLink(stream, state) { - if (stream.match(/^[^\]]*\]:/, false)) { - state.f = footnoteLinkInside; - stream.next(); // Consume [ - if (modeCfg.highlightFormatting) state.formatting = "link"; - state.linkText = true; - return getType(state); - } - return switchInline(stream, state, inlineNormal); - } - - function footnoteLinkInside(stream, state) { - if (stream.match(/^\]:/, true)) { - state.f = state.inline = footnoteUrl; - if (modeCfg.highlightFormatting) state.formatting = "link"; - var returnType = getType(state); - state.linkText = false; - return returnType; - } - - stream.match(/^[^\]]+/, true); - - return linktext; - } - - function footnoteUrl(stream, state) { - // Check if space, and return NULL if so (to avoid marking the space) - if(stream.eatSpace()){ - return null; - } - // Match URL - stream.match(/^[^\s]+/, true); - // Check for link title - if (stream.peek() === undefined) { // End of line, set flag to check next line - state.linkTitle = true; - } else { // More content on line, check if link title - stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true); - } - state.f = state.inline = inlineNormal; - return linkhref; - } - - var savedInlineRE = []; - function inlineRE(endChar) { - if (!savedInlineRE[endChar]) { - // Escape endChar for RegExp (taken from http://stackoverflow.com/a/494122/526741) - endChar = (endChar+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1"); - // Match any non-endChar, escaped character, as well as the closing - // endChar. - savedInlineRE[endChar] = new RegExp('^(?:[^\\\\]|\\\\.)*?(' + endChar + ')'); - } - return savedInlineRE[endChar]; - } - - var mode = { - startState: function() { - return { - f: blockNormal, - - prevLineHasContent: false, - thisLineHasContent: false, - - block: blockNormal, - htmlState: null, - indentation: 0, - - inline: inlineNormal, - text: handleText, - - formatting: false, - linkText: false, - linkHref: false, - linkTitle: false, - em: false, - strong: false, - header: 0, - taskList: false, - list: false, - listDepth: 0, - quote: 0, - trailingSpace: 0, - trailingSpaceNewLine: false - }; - }, - - copyState: function(s) { - return { - f: s.f, - - prevLineHasContent: s.prevLineHasContent, - thisLineHasContent: s.thisLineHasContent, - - block: s.block, - htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState), - indentation: s.indentation, - - localMode: s.localMode, - localState: s.localMode ? CodeMirror.copyState(s.localMode, s.localState) : null, - - inline: s.inline, - text: s.text, - formatting: false, - linkTitle: s.linkTitle, - em: s.em, - strong: s.strong, - header: s.header, - taskList: s.taskList, - list: s.list, - listDepth: s.listDepth, - quote: s.quote, - trailingSpace: s.trailingSpace, - trailingSpaceNewLine: s.trailingSpaceNewLine, - md_inside: s.md_inside - }; - }, - - token: function(stream, state) { - - // Reset state.formatting - state.formatting = false; - - if (stream.sol()) { - var forceBlankLine = !!state.header; - - // Reset state.header - state.header = 0; - - if (stream.match(/^\s*$/, true) || forceBlankLine) { - state.prevLineHasContent = false; - blankLine(state); - return forceBlankLine ? this.token(stream, state) : null; - } else { - state.prevLineHasContent = state.thisLineHasContent; - state.thisLineHasContent = true; - } - - // Reset state.taskList - state.taskList = false; - - // Reset state.code - state.code = false; - - // Reset state.trailingSpace - state.trailingSpace = 0; - state.trailingSpaceNewLine = false; - - state.f = state.block; - var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, ' ').length; - var difference = Math.floor((indentation - state.indentation) / 4) * 4; - if (difference > 4) difference = 4; - var adjustedIndentation = state.indentation + difference; - state.indentationDiff = adjustedIndentation - state.indentation; - state.indentation = adjustedIndentation; - if (indentation > 0) return null; - } - var result = state.f(stream, state); - if (stream.start == stream.pos) return this.token(stream, state); - else return result; - }, - - innerMode: function(state) { - if (state.block == htmlBlock) return {state: state.htmlState, mode: htmlMode}; - if (state.localState) return {state: state.localState, mode: state.localMode}; - return {state: state, mode: mode}; - }, - - blankLine: blankLine, - - getType: getType, - - fold: "markdown" - }; - return mode; -}, "xml"); - -CodeMirror.defineMIME("text/x-markdown", "markdown"); - -}); diff --git a/kallithea/public/codemirror/mode/meta.js b/kallithea/public/codemirror/mode/meta.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/meta.js +++ /dev/null @@ -1,144 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - CodeMirror.modeInfo = [ - {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]}, - {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk"}, - {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]}, - {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "hpp", "h++"]}, - {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]}, - {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"]}, - {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]}, - {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"]}, - {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"]}, - {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher"}, - {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]}, - {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]}, - {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]}, - {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]}, - {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]}, - {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]}, - {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]}, - {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]}, - {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]}, - {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]}, - {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]}, - {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]}, - {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"]}, - {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]}, - {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]}, - {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm"}, - {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]}, - {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy"]}, - {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]}, - {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]}, - {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]}, - {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]}, - {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"]}, - {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"]}, - {name: "HTTP", mime: "message/http", mode: "http"}, - {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]}, - {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]}, - {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"]}, - {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"], - mode: "javascript", ext: ["js"]}, - {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"]}, - {name: "JSON-LD", mime: "application/ld+json", mode: "javascript"}, - {name: "Jinja2", mime: "null", mode: "jinja2"}, - {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]}, - {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ["kt"]}, - {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]}, - {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"]}, - {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]}, - {name: "Markdown (GitHub-flavour)", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]}, - {name: "mIRC", mime: "text/mirc", mode: "mirc"}, - {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"}, - {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]}, - {name: "MS SQL", mime: "text/x-mssql", mode: "sql"}, - {name: "MySQL", mime: "text/x-mysql", mode: "sql"}, - {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx"}, - {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]}, - {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]}, - {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]}, - {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]}, - {name: "PEG.js", mime: "null", mode: "pegjs"}, - {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]}, - {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]}, - {name: "Pig", mime: "text/x-pig", mode: "pig"}, - {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]}, - {name: "PLSQL", mime: "text/x-plsql", mode: "sql"}, - {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"]}, - {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]}, - {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]}, - {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]}, - {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"]}, - {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"]}, - {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"]}, - {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]}, - {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]}, - {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]}, - {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]}, - {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]}, - {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"]}, - {name: "Sieve", mime: "application/sieve", mode: "sieve"}, - {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim"}, - {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]}, - {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]}, - {name: "SmartyMixed", mime: "text/x-smarty", mode: "smartymixed"}, - {name: "Solr", mime: "text/x-solr", mode: "solr"}, - {name: "SPARQL", mime: "application/x-sparql-query", mode: "sparql", ext: ["sparql"]}, - {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]}, - {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"}, - {name: "sTeX", mime: "text/x-stex", mode: "stex"}, - {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"]}, - {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]}, - {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]}, - {name: "Textile", mime: "text/x-textile", mode: "textile"}, - {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"}, - {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"}, - {name: "TOML", mime: "text/x-toml", mode: "toml"}, - {name: "Tornado", mime: "text/x-tornado", mode: "tornado"}, - {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]}, - {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"]}, - {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]}, - {name: "VBScript", mime: "text/vbscript", mode: "vbscript"}, - {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]}, - {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]}, - {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"]}, - {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]}, - {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml"]}, - {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]} - ]; - // Ensure all modes have a mime property for backwards compatibility - for (var i = 0; i < CodeMirror.modeInfo.length; i++) { - var info = CodeMirror.modeInfo[i]; - if (info.mimes) info.mime = info.mimes[0]; - } - - CodeMirror.findModeByMIME = function(mime) { - for (var i = 0; i < CodeMirror.modeInfo.length; i++) { - var info = CodeMirror.modeInfo[i]; - if (info.mime == mime) return info; - if (info.mimes) for (var j = 0; j < info.mimes.length; j++) - if (info.mimes[j] == mime) return info; - } - }; - - CodeMirror.findModeByExtension = function(ext) { - for (var i = 0; i < CodeMirror.modeInfo.length; i++) { - var info = CodeMirror.modeInfo[i]; - if (info.ext) for (var j = 0; j < info.ext.length; j++) - if (info.ext[j] == ext) return info; - } - }; -}); diff --git a/kallithea/public/codemirror/mode/mirc/mirc.js b/kallithea/public/codemirror/mode/mirc/mirc.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/mirc/mirc.js +++ /dev/null @@ -1,193 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -//mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMIME("text/mirc", "mirc"); -CodeMirror.defineMode("mirc", function() { - function parseWords(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - var specials = parseWords("$! $$ $& $? $+ $abook $abs $active $activecid " + - "$activewid $address $addtok $agent $agentname $agentstat $agentver " + - "$alias $and $anick $ansi2mirc $aop $appactive $appstate $asc $asctime " + - "$asin $atan $avoice $away $awaymsg $awaytime $banmask $base $bfind " + - "$binoff $biton $bnick $bvar $bytes $calc $cb $cd $ceil $chan $chanmodes " + - "$chantypes $chat $chr $cid $clevel $click $cmdbox $cmdline $cnick $color " + - "$com $comcall $comchan $comerr $compact $compress $comval $cos $count " + - "$cr $crc $creq $crlf $ctime $ctimer $ctrlenter $date $day $daylight " + - "$dbuh $dbuw $dccignore $dccport $dde $ddename $debug $decode $decompress " + - "$deltok $devent $dialog $did $didreg $didtok $didwm $disk $dlevel $dll " + - "$dllcall $dname $dns $duration $ebeeps $editbox $emailaddr $encode $error " + - "$eval $event $exist $feof $ferr $fgetc $file $filename $filtered $finddir " + - "$finddirn $findfile $findfilen $findtok $fline $floor $fopen $fread $fserve " + - "$fulladdress $fulldate $fullname $fullscreen $get $getdir $getdot $gettok $gmt " + - "$group $halted $hash $height $hfind $hget $highlight $hnick $hotline " + - "$hotlinepos $ial $ialchan $ibl $idle $iel $ifmatch $ignore $iif $iil " + - "$inelipse $ini $inmidi $inpaste $inpoly $input $inrect $inroundrect " + - "$insong $instok $int $inwave $ip $isalias $isbit $isdde $isdir $isfile " + - "$isid $islower $istok $isupper $keychar $keyrpt $keyval $knick $lactive " + - "$lactivecid $lactivewid $left $len $level $lf $line $lines $link $lock " + - "$lock $locked $log $logstamp $logstampfmt $longfn $longip $lower $ltimer " + - "$maddress $mask $matchkey $matchtok $md5 $me $menu $menubar $menucontext " + - "$menutype $mid $middir $mircdir $mircexe $mircini $mklogfn $mnick $mode " + - "$modefirst $modelast $modespl $mouse $msfile $network $newnick $nick $nofile " + - "$nopath $noqt $not $notags $notify $null $numeric $numok $oline $onpoly " + - "$opnick $or $ord $os $passivedcc $pic $play $pnick $port $portable $portfree " + - "$pos $prefix $prop $protect $puttok $qt $query $rand $r $rawmsg $read $readomo " + - "$readn $regex $regml $regsub $regsubex $remove $remtok $replace $replacex " + - "$reptok $result $rgb $right $round $scid $scon $script $scriptdir $scriptline " + - "$sdir $send $server $serverip $sfile $sha1 $shortfn $show $signal $sin " + - "$site $sline $snick $snicks $snotify $sock $sockbr $sockerr $sockname " + - "$sorttok $sound $sqrt $ssl $sreq $sslready $status $strip $str $stripped " + - "$syle $submenu $switchbar $tan $target $ticks $time $timer $timestamp " + - "$timestampfmt $timezone $tip $titlebar $toolbar $treebar $trust $ulevel " + - "$ulist $upper $uptime $url $usermode $v1 $v2 $var $vcmd $vcmdstat $vcmdver " + - "$version $vnick $vol $wid $width $wildsite $wildtok $window $wrap $xor"); - var keywords = parseWords("abook ajinvite alias aline ame amsg anick aop auser autojoin avoice " + - "away background ban bcopy beep bread break breplace bset btrunc bunset bwrite " + - "channel clear clearall cline clipboard close cnick color comclose comopen " + - "comreg continue copy creq ctcpreply ctcps dcc dccserver dde ddeserver " + - "debug dec describe dialog did didtok disable disconnect dlevel dline dll " + - "dns dqwindow drawcopy drawdot drawfill drawline drawpic drawrect drawreplace " + - "drawrot drawsave drawscroll drawtext ebeeps echo editbox emailaddr enable " + - "events exit fclose filter findtext finger firewall flash flist flood flush " + - "flushini font fopen fseek fsend fserve fullname fwrite ghide gload gmove " + - "gopts goto gplay gpoint gqreq groups gshow gsize gstop gtalk gunload hadd " + - "halt haltdef hdec hdel help hfree hinc hload hmake hop hsave ial ialclear " + - "ialmark identd if ignore iline inc invite iuser join kick linesep links list " + - "load loadbuf localinfo log mdi me menubar mkdir mnick mode msg nick noop notice " + - "notify omsg onotice part partall pdcc perform play playctrl pop protect pvoice " + - "qme qmsg query queryn quit raw reload remini remote remove rename renwin " + - "reseterror resetidle return rlevel rline rmdir run ruser save savebuf saveini " + - "say scid scon server set showmirc signam sline sockaccept sockclose socklist " + - "socklisten sockmark sockopen sockpause sockread sockrename sockudp sockwrite " + - "sound speak splay sreq strip switchbar timer timestamp titlebar tnick tokenize " + - "toolbar topic tray treebar ulist unload unset unsetall updatenl url uwho " + - "var vcadd vcmd vcrem vol while whois window winhelp write writeint if isalnum " + - "isalpha isaop isavoice isban ischan ishop isignore isin isincs isletter islower " + - "isnotify isnum ison isop isprotect isreg isupper isvoice iswm iswmcs " + - "elseif else goto menu nicklist status title icon size option text edit " + - "button check radio box scroll list combo link tab item"); - var functions = parseWords("if elseif else and not or eq ne in ni for foreach while switch"); - var isOperatorChar = /[+\-*&%=<>!?^\/\|]/; - function chain(stream, state, f) { - state.tokenize = f; - return f(stream, state); - } - function tokenBase(stream, state) { - var beforeParams = state.beforeParams; - state.beforeParams = false; - var ch = stream.next(); - if (/[\[\]{}\(\),\.]/.test(ch)) { - if (ch == "(" && beforeParams) state.inParams = true; - else if (ch == ")") state.inParams = false; - return null; - } - else if (/\d/.test(ch)) { - stream.eatWhile(/[\w\.]/); - return "number"; - } - else if (ch == "\\") { - stream.eat("\\"); - stream.eat(/./); - return "number"; - } - else if (ch == "/" && stream.eat("*")) { - return chain(stream, state, tokenComment); - } - else if (ch == ";" && stream.match(/ *\( *\(/)) { - return chain(stream, state, tokenUnparsed); - } - else if (ch == ";" && !state.inParams) { - stream.skipToEnd(); - return "comment"; - } - else if (ch == '"') { - stream.eat(/"/); - return "keyword"; - } - else if (ch == "$") { - stream.eatWhile(/[$_a-z0-9A-Z\.:]/); - if (specials && specials.propertyIsEnumerable(stream.current().toLowerCase())) { - return "keyword"; - } - else { - state.beforeParams = true; - return "builtin"; - } - } - else if (ch == "%") { - stream.eatWhile(/[^,^\s^\(^\)]/); - state.beforeParams = true; - return "string"; - } - else if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return "operator"; - } - else { - stream.eatWhile(/[\w\$_{}]/); - var word = stream.current().toLowerCase(); - if (keywords && keywords.propertyIsEnumerable(word)) - return "keyword"; - if (functions && functions.propertyIsEnumerable(word)) { - state.beforeParams = true; - return "keyword"; - } - return null; - } - } - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - function tokenUnparsed(stream, state) { - var maybeEnd = 0, ch; - while (ch = stream.next()) { - if (ch == ";" && maybeEnd == 2) { - state.tokenize = tokenBase; - break; - } - if (ch == ")") - maybeEnd++; - else if (ch != " ") - maybeEnd = 0; - } - return "meta"; - } - return { - startState: function() { - return { - tokenize: tokenBase, - beforeParams: false, - inParams: false - }; - }, - token: function(stream, state) { - if (stream.eatSpace()) return null; - return state.tokenize(stream, state); - } - }; -}); - -}); diff --git a/kallithea/public/codemirror/mode/mllike/mllike.js b/kallithea/public/codemirror/mode/mllike/mllike.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/mllike/mllike.js +++ /dev/null @@ -1,205 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode('mllike', function(_config, parserConfig) { - var words = { - 'let': 'keyword', - 'rec': 'keyword', - 'in': 'keyword', - 'of': 'keyword', - 'and': 'keyword', - 'if': 'keyword', - 'then': 'keyword', - 'else': 'keyword', - 'for': 'keyword', - 'to': 'keyword', - 'while': 'keyword', - 'do': 'keyword', - 'done': 'keyword', - 'fun': 'keyword', - 'function': 'keyword', - 'val': 'keyword', - 'type': 'keyword', - 'mutable': 'keyword', - 'match': 'keyword', - 'with': 'keyword', - 'try': 'keyword', - 'open': 'builtin', - 'ignore': 'builtin', - 'begin': 'keyword', - 'end': 'keyword' - }; - - var extraWords = parserConfig.extraWords || {}; - for (var prop in extraWords) { - if (extraWords.hasOwnProperty(prop)) { - words[prop] = parserConfig.extraWords[prop]; - } - } - - function tokenBase(stream, state) { - var ch = stream.next(); - - if (ch === '"') { - state.tokenize = tokenString; - return state.tokenize(stream, state); - } - if (ch === '(') { - if (stream.eat('*')) { - state.commentLevel++; - state.tokenize = tokenComment; - return state.tokenize(stream, state); - } - } - if (ch === '~') { - stream.eatWhile(/\w/); - return 'variable-2'; - } - if (ch === '`') { - stream.eatWhile(/\w/); - return 'quote'; - } - if (ch === '/' && parserConfig.slashComments && stream.eat('/')) { - stream.skipToEnd(); - return 'comment'; - } - if (/\d/.test(ch)) { - stream.eatWhile(/[\d]/); - if (stream.eat('.')) { - stream.eatWhile(/[\d]/); - } - return 'number'; - } - if ( /[+\-*&%=<>!?|]/.test(ch)) { - return 'operator'; - } - stream.eatWhile(/\w/); - var cur = stream.current(); - return words[cur] || 'variable'; - } - - function tokenString(stream, state) { - var next, end = false, escaped = false; - while ((next = stream.next()) != null) { - if (next === '"' && !escaped) { - end = true; - break; - } - escaped = !escaped && next === '\\'; - } - if (end && !escaped) { - state.tokenize = tokenBase; - } - return 'string'; - }; - - function tokenComment(stream, state) { - var prev, next; - while(state.commentLevel > 0 && (next = stream.next()) != null) { - if (prev === '(' && next === '*') state.commentLevel++; - if (prev === '*' && next === ')') state.commentLevel--; - prev = next; - } - if (state.commentLevel <= 0) { - state.tokenize = tokenBase; - } - return 'comment'; - } - - return { - startState: function() {return {tokenize: tokenBase, commentLevel: 0};}, - token: function(stream, state) { - if (stream.eatSpace()) return null; - return state.tokenize(stream, state); - }, - - blockCommentStart: "(*", - blockCommentEnd: "*)", - lineComment: parserConfig.slashComments ? "//" : null - }; -}); - -CodeMirror.defineMIME('text/x-ocaml', { - name: 'mllike', - extraWords: { - 'succ': 'keyword', - 'trace': 'builtin', - 'exit': 'builtin', - 'print_string': 'builtin', - 'print_endline': 'builtin', - 'true': 'atom', - 'false': 'atom', - 'raise': 'keyword' - } -}); - -CodeMirror.defineMIME('text/x-fsharp', { - name: 'mllike', - extraWords: { - 'abstract': 'keyword', - 'as': 'keyword', - 'assert': 'keyword', - 'base': 'keyword', - 'class': 'keyword', - 'default': 'keyword', - 'delegate': 'keyword', - 'downcast': 'keyword', - 'downto': 'keyword', - 'elif': 'keyword', - 'exception': 'keyword', - 'extern': 'keyword', - 'finally': 'keyword', - 'global': 'keyword', - 'inherit': 'keyword', - 'inline': 'keyword', - 'interface': 'keyword', - 'internal': 'keyword', - 'lazy': 'keyword', - 'let!': 'keyword', - 'member' : 'keyword', - 'module': 'keyword', - 'namespace': 'keyword', - 'new': 'keyword', - 'null': 'keyword', - 'override': 'keyword', - 'private': 'keyword', - 'public': 'keyword', - 'return': 'keyword', - 'return!': 'keyword', - 'select': 'keyword', - 'static': 'keyword', - 'struct': 'keyword', - 'upcast': 'keyword', - 'use': 'keyword', - 'use!': 'keyword', - 'val': 'keyword', - 'when': 'keyword', - 'yield': 'keyword', - 'yield!': 'keyword', - - 'List': 'builtin', - 'Seq': 'builtin', - 'Map': 'builtin', - 'Set': 'builtin', - 'int': 'builtin', - 'string': 'builtin', - 'raise': 'builtin', - 'failwith': 'builtin', - 'not': 'builtin', - 'true': 'builtin', - 'false': 'builtin' - }, - slashComments: true -}); - -}); diff --git a/kallithea/public/codemirror/mode/modelica/modelica.js b/kallithea/public/codemirror/mode/modelica/modelica.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/modelica/modelica.js +++ /dev/null @@ -1,245 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// Modelica support for CodeMirror, copyright (c) by Lennart Ochel - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -}) - -(function(CodeMirror) { - "use strict"; - - CodeMirror.defineMode("modelica", function(config, parserConfig) { - - var indentUnit = config.indentUnit; - var keywords = parserConfig.keywords || {}; - var builtin = parserConfig.builtin || {}; - var atoms = parserConfig.atoms || {}; - - var isSingleOperatorChar = /[;=\(:\),{}.*<>+\-\/^\[\]]/; - var isDoubleOperatorChar = /(:=|<=|>=|==|<>|\.\+|\.\-|\.\*|\.\/|\.\^)/; - var isDigit = /[0-9]/; - var isNonDigit = /[_a-zA-Z]/; - - function tokenLineComment(stream, state) { - stream.skipToEnd(); - state.tokenize = null; - return "comment"; - } - - function tokenBlockComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (maybeEnd && ch == "/") { - state.tokenize = null; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function tokenString(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == '"' && !escaped) { - state.tokenize = null; - state.sol = false; - break; - } - escaped = !escaped && ch == "\\"; - } - - return "string"; - } - - function tokenIdent(stream, state) { - stream.eatWhile(isDigit); - while (stream.eat(isDigit) || stream.eat(isNonDigit)) { } - - - var cur = stream.current(); - - if(state.sol && (cur == "package" || cur == "model" || cur == "when" || cur == "connector")) state.level++; - else if(state.sol && cur == "end" && state.level > 0) state.level--; - - state.tokenize = null; - state.sol = false; - - if (keywords.propertyIsEnumerable(cur)) return "keyword"; - else if (builtin.propertyIsEnumerable(cur)) return "builtin"; - else if (atoms.propertyIsEnumerable(cur)) return "atom"; - else return "variable"; - } - - function tokenQIdent(stream, state) { - while (stream.eat(/[^']/)) { } - - state.tokenize = null; - state.sol = false; - - if(stream.eat("'")) - return "variable"; - else - return "error"; - } - - function tokenUnsignedNuber(stream, state) { - stream.eatWhile(isDigit); - if (stream.eat('.')) { - stream.eatWhile(isDigit); - } - if (stream.eat('e') || stream.eat('E')) { - if (!stream.eat('-')) - stream.eat('+'); - stream.eatWhile(isDigit); - } - - state.tokenize = null; - state.sol = false; - return "number"; - } - - // Interface - return { - startState: function() { - return { - tokenize: null, - level: 0, - sol: true - }; - }, - - token: function(stream, state) { - if(state.tokenize != null) { - return state.tokenize(stream, state); - } - - if(stream.sol()) { - state.sol = true; - } - - // WHITESPACE - if(stream.eatSpace()) { - state.tokenize = null; - return null; - } - - var ch = stream.next(); - - // LINECOMMENT - if(ch == '/' && stream.eat('/')) { - state.tokenize = tokenLineComment; - } - // BLOCKCOMMENT - else if(ch == '/' && stream.eat('*')) { - state.tokenize = tokenBlockComment; - } - // TWO SYMBOL TOKENS - else if(isDoubleOperatorChar.test(ch+stream.peek())) { - stream.next(); - state.tokenize = null; - return "operator"; - } - // SINGLE SYMBOL TOKENS - else if(isSingleOperatorChar.test(ch)) { - state.tokenize = null; - return "operator"; - } - // IDENT - else if(isNonDigit.test(ch)) { - state.tokenize = tokenIdent; - } - // Q-IDENT - else if(ch == "'" && stream.peek() && stream.peek() != "'") { - state.tokenize = tokenQIdent; - } - // STRING - else if(ch == '"') { - state.tokenize = tokenString; - } - // UNSIGNED_NUBER - else if(isDigit.test(ch)) { - state.tokenize = tokenUnsignedNuber; - } - // ERROR - else { - state.tokenize = null; - return "error"; - } - - return state.tokenize(stream, state); - }, - - indent: function(state, textAfter) { - if (state.tokenize != null) return CodeMirror.Pass; - - var level = state.level; - if(/(algorithm)/.test(textAfter)) level--; - if(/(equation)/.test(textAfter)) level--; - if(/(initial algorithm)/.test(textAfter)) level--; - if(/(initial equation)/.test(textAfter)) level--; - if(/(end)/.test(textAfter)) level--; - - if(level > 0) - return indentUnit*level; - else - return 0; - }, - - blockCommentStart: "/*", - blockCommentEnd: "*/", - lineComment: "//" - }; - }); - - function words(str) { - var obj = {}, words = str.split(" "); - for (var i=0; i*\/]/.test(ch)) { - return ret(null, "select-op"); - } - else if (/[;{}:\[\]]/.test(ch)) { - return ret(null, ch); - } - else { - stream.eatWhile(/[\w\\\-]/); - return ret("variable", "variable"); - } - } - - function tokenCComment(stream, state) { - var maybeEnd = false, ch; - while ((ch = stream.next()) != null) { - if (maybeEnd && ch == "/") { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return ret("comment", "comment"); - } - - function tokenSGMLComment(stream, state) { - var dashes = 0, ch; - while ((ch = stream.next()) != null) { - if (dashes >= 2 && ch == ">") { - state.tokenize = tokenBase; - break; - } - dashes = (ch == "-") ? dashes + 1 : 0; - } - return ret("comment", "comment"); - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == quote && !escaped) - break; - escaped = !escaped && ch == "\\"; - } - if (!escaped) state.tokenize = tokenBase; - return ret("string", "string"); - }; - } - - return { - startState: function(base) { - return {tokenize: tokenBase, - baseIndent: base || 0, - stack: []}; - }, - - token: function(stream, state) { - if (stream.eatSpace()) return null; - type = null; - var style = state.tokenize(stream, state); - - var context = state.stack[state.stack.length-1]; - if (type == "hash" && context == "rule") style = "atom"; - else if (style == "variable") { - if (context == "rule") style = "number"; - else if (!context || context == "@media{") style = "tag"; - } - - if (context == "rule" && /^[\{\};]$/.test(type)) - state.stack.pop(); - if (type == "{") { - if (context == "@media") state.stack[state.stack.length-1] = "@media{"; - else state.stack.push("{"); - } - else if (type == "}") state.stack.pop(); - else if (type == "@media") state.stack.push("@media"); - else if (context == "{" && type != "comment") state.stack.push("rule"); - return style; - }, - - indent: function(state, textAfter) { - var n = state.stack.length; - if (/^\}/.test(textAfter)) - n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1; - return state.baseIndent + n * indentUnit; - }, - - electricChars: "}" - }; -}); - -CodeMirror.defineMIME("text/nginx", "text/x-nginx-conf"); - -}); diff --git a/kallithea/public/codemirror/mode/ntriples/ntriples.js b/kallithea/public/codemirror/mode/ntriples/ntriples.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/ntriples/ntriples.js +++ /dev/null @@ -1,186 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/********************************************************** -* This script provides syntax highlighting support for -* the Ntriples format. -* Ntriples format specification: -* http://www.w3.org/TR/rdf-testcases/#ntriples -***********************************************************/ - -/* - The following expression defines the defined ASF grammar transitions. - - pre_subject -> - { - ( writing_subject_uri | writing_bnode_uri ) - -> pre_predicate - -> writing_predicate_uri - -> pre_object - -> writing_object_uri | writing_object_bnode | - ( - writing_object_literal - -> writing_literal_lang | writing_literal_type - ) - -> post_object - -> BEGIN - } otherwise { - -> ERROR - } -*/ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("ntriples", function() { - - var Location = { - PRE_SUBJECT : 0, - WRITING_SUB_URI : 1, - WRITING_BNODE_URI : 2, - PRE_PRED : 3, - WRITING_PRED_URI : 4, - PRE_OBJ : 5, - WRITING_OBJ_URI : 6, - WRITING_OBJ_BNODE : 7, - WRITING_OBJ_LITERAL : 8, - WRITING_LIT_LANG : 9, - WRITING_LIT_TYPE : 10, - POST_OBJ : 11, - ERROR : 12 - }; - function transitState(currState, c) { - var currLocation = currState.location; - var ret; - - // Opening. - if (currLocation == Location.PRE_SUBJECT && c == '<') ret = Location.WRITING_SUB_URI; - else if(currLocation == Location.PRE_SUBJECT && c == '_') ret = Location.WRITING_BNODE_URI; - else if(currLocation == Location.PRE_PRED && c == '<') ret = Location.WRITING_PRED_URI; - else if(currLocation == Location.PRE_OBJ && c == '<') ret = Location.WRITING_OBJ_URI; - else if(currLocation == Location.PRE_OBJ && c == '_') ret = Location.WRITING_OBJ_BNODE; - else if(currLocation == Location.PRE_OBJ && c == '"') ret = Location.WRITING_OBJ_LITERAL; - - // Closing. - else if(currLocation == Location.WRITING_SUB_URI && c == '>') ret = Location.PRE_PRED; - else if(currLocation == Location.WRITING_BNODE_URI && c == ' ') ret = Location.PRE_PRED; - else if(currLocation == Location.WRITING_PRED_URI && c == '>') ret = Location.PRE_OBJ; - else if(currLocation == Location.WRITING_OBJ_URI && c == '>') ret = Location.POST_OBJ; - else if(currLocation == Location.WRITING_OBJ_BNODE && c == ' ') ret = Location.POST_OBJ; - else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '"') ret = Location.POST_OBJ; - else if(currLocation == Location.WRITING_LIT_LANG && c == ' ') ret = Location.POST_OBJ; - else if(currLocation == Location.WRITING_LIT_TYPE && c == '>') ret = Location.POST_OBJ; - - // Closing typed and language literal. - else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '@') ret = Location.WRITING_LIT_LANG; - else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '^') ret = Location.WRITING_LIT_TYPE; - - // Spaces. - else if( c == ' ' && - ( - currLocation == Location.PRE_SUBJECT || - currLocation == Location.PRE_PRED || - currLocation == Location.PRE_OBJ || - currLocation == Location.POST_OBJ - ) - ) ret = currLocation; - - // Reset. - else if(currLocation == Location.POST_OBJ && c == '.') ret = Location.PRE_SUBJECT; - - // Error - else ret = Location.ERROR; - - currState.location=ret; - } - - return { - startState: function() { - return { - location : Location.PRE_SUBJECT, - uris : [], - anchors : [], - bnodes : [], - langs : [], - types : [] - }; - }, - token: function(stream, state) { - var ch = stream.next(); - if(ch == '<') { - transitState(state, ch); - var parsedURI = ''; - stream.eatWhile( function(c) { if( c != '#' && c != '>' ) { parsedURI += c; return true; } return false;} ); - state.uris.push(parsedURI); - if( stream.match('#', false) ) return 'variable'; - stream.next(); - transitState(state, '>'); - return 'variable'; - } - if(ch == '#') { - var parsedAnchor = ''; - stream.eatWhile(function(c) { if(c != '>' && c != ' ') { parsedAnchor+= c; return true; } return false;}); - state.anchors.push(parsedAnchor); - return 'variable-2'; - } - if(ch == '>') { - transitState(state, '>'); - return 'variable'; - } - if(ch == '_') { - transitState(state, ch); - var parsedBNode = ''; - stream.eatWhile(function(c) { if( c != ' ' ) { parsedBNode += c; return true; } return false;}); - state.bnodes.push(parsedBNode); - stream.next(); - transitState(state, ' '); - return 'builtin'; - } - if(ch == '"') { - transitState(state, ch); - stream.eatWhile( function(c) { return c != '"'; } ); - stream.next(); - if( stream.peek() != '@' && stream.peek() != '^' ) { - transitState(state, '"'); - } - return 'string'; - } - if( ch == '@' ) { - transitState(state, '@'); - var parsedLang = ''; - stream.eatWhile(function(c) { if( c != ' ' ) { parsedLang += c; return true; } return false;}); - state.langs.push(parsedLang); - stream.next(); - transitState(state, ' '); - return 'string-2'; - } - if( ch == '^' ) { - stream.next(); - transitState(state, '^'); - var parsedType = ''; - stream.eatWhile(function(c) { if( c != '>' ) { parsedType += c; return true; } return false;} ); - state.types.push(parsedType); - stream.next(); - transitState(state, '>'); - return 'variable'; - } - if( ch == ' ' ) { - transitState(state, ch); - } - if( ch == '.' ) { - transitState(state, ch); - } - } - }; -}); - -CodeMirror.defineMIME("text/n-triples", "ntriples"); - -}); diff --git a/kallithea/public/codemirror/mode/octave/octave.js b/kallithea/public/codemirror/mode/octave/octave.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/octave/octave.js +++ /dev/null @@ -1,135 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("octave", function() { - function wordRegexp(words) { - return new RegExp("^((" + words.join(")|(") + "))\\b"); - } - - var singleOperators = new RegExp("^[\\+\\-\\*/&|\\^~<>!@'\\\\]"); - var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;]'); - var doubleOperators = new RegExp("^((==)|(~=)|(<=)|(>=)|(<<)|(>>)|(\\.[\\+\\-\\*/\\^\\\\]))"); - var doubleDelimiters = new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))"); - var tripleDelimiters = new RegExp("^((>>=)|(<<=))"); - var expressionEnd = new RegExp("^[\\]\\)]"); - var identifiers = new RegExp("^[_A-Za-z\xa1-\uffff][_A-Za-z0-9\xa1-\uffff]*"); - - var builtins = wordRegexp([ - 'error', 'eval', 'function', 'abs', 'acos', 'atan', 'asin', 'cos', - 'cosh', 'exp', 'log', 'prod', 'sum', 'log10', 'max', 'min', 'sign', 'sin', 'sinh', - 'sqrt', 'tan', 'reshape', 'break', 'zeros', 'default', 'margin', 'round', 'ones', - 'rand', 'syn', 'ceil', 'floor', 'size', 'clear', 'zeros', 'eye', 'mean', 'std', 'cov', - 'det', 'eig', 'inv', 'norm', 'rank', 'trace', 'expm', 'logm', 'sqrtm', 'linspace', 'plot', - 'title', 'xlabel', 'ylabel', 'legend', 'text', 'grid', 'meshgrid', 'mesh', 'num2str', - 'fft', 'ifft', 'arrayfun', 'cellfun', 'input', 'fliplr', 'flipud', 'ismember' - ]); - - var keywords = wordRegexp([ - 'return', 'case', 'switch', 'else', 'elseif', 'end', 'endif', 'endfunction', - 'if', 'otherwise', 'do', 'for', 'while', 'try', 'catch', 'classdef', 'properties', 'events', - 'methods', 'global', 'persistent', 'endfor', 'endwhile', 'printf', 'sprintf', 'disp', 'until', - 'continue', 'pkg' - ]); - - - // tokenizers - function tokenTranspose(stream, state) { - if (!stream.sol() && stream.peek() === '\'') { - stream.next(); - state.tokenize = tokenBase; - return 'operator'; - } - state.tokenize = tokenBase; - return tokenBase(stream, state); - } - - - function tokenComment(stream, state) { - if (stream.match(/^.*%}/)) { - state.tokenize = tokenBase; - return 'comment'; - }; - stream.skipToEnd(); - return 'comment'; - } - - function tokenBase(stream, state) { - // whitespaces - if (stream.eatSpace()) return null; - - // Handle one line Comments - if (stream.match('%{')){ - state.tokenize = tokenComment; - stream.skipToEnd(); - return 'comment'; - } - - if (stream.match(/^[%#]/)){ - stream.skipToEnd(); - return 'comment'; - } - - // Handle Number Literals - if (stream.match(/^[0-9\.+-]/, false)) { - if (stream.match(/^[+-]?0x[0-9a-fA-F]+[ij]?/)) { - stream.tokenize = tokenBase; - return 'number'; }; - if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?[ij]?/)) { return 'number'; }; - if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?[ij]?/)) { return 'number'; }; - } - if (stream.match(wordRegexp(['nan','NaN','inf','Inf']))) { return 'number'; }; - - // Handle Strings - if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; } ; - if (stream.match(/^'([^']|(''))*'/)) { return 'string'; } ; - - // Handle words - if (stream.match(keywords)) { return 'keyword'; } ; - if (stream.match(builtins)) { return 'builtin'; } ; - if (stream.match(identifiers)) { return 'variable'; } ; - - if (stream.match(singleOperators) || stream.match(doubleOperators)) { return 'operator'; }; - if (stream.match(singleDelimiters) || stream.match(doubleDelimiters) || stream.match(tripleDelimiters)) { return null; }; - - if (stream.match(expressionEnd)) { - state.tokenize = tokenTranspose; - return null; - }; - - - // Handle non-detected items - stream.next(); - return 'error'; - }; - - - return { - startState: function() { - return { - tokenize: tokenBase - }; - }, - - token: function(stream, state) { - var style = state.tokenize(stream, state); - if (style === 'number' || style === 'variable'){ - state.tokenize = tokenTranspose; - } - return style; - } - }; -}); - -CodeMirror.defineMIME("text/x-octave", "octave"); - -}); diff --git a/kallithea/public/codemirror/mode/pascal/pascal.js b/kallithea/public/codemirror/mode/pascal/pascal.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/pascal/pascal.js +++ /dev/null @@ -1,109 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("pascal", function() { - function words(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - var keywords = words("and array begin case const div do downto else end file for forward integer " + - "boolean char function goto if in label mod nil not of or packed procedure " + - "program record repeat set string then to type until var while with"); - var atoms = {"null": true}; - - var isOperatorChar = /[+\-*&%=<>!?|\/]/; - - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == "#" && state.startOfLine) { - stream.skipToEnd(); - return "meta"; - } - if (ch == '"' || ch == "'") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } - if (ch == "(" && stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } - if (/[\[\]{}\(\),;\:\.]/.test(ch)) { - return null; - } - if (/\d/.test(ch)) { - stream.eatWhile(/[\w\.]/); - return "number"; - } - if (ch == "/") { - if (stream.eat("/")) { - stream.skipToEnd(); - return "comment"; - } - } - if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return "operator"; - } - stream.eatWhile(/[\w\$_]/); - var cur = stream.current(); - if (keywords.propertyIsEnumerable(cur)) return "keyword"; - if (atoms.propertyIsEnumerable(cur)) return "atom"; - return "variable"; - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next, end = false; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) {end = true; break;} - escaped = !escaped && next == "\\"; - } - if (end || !escaped) state.tokenize = null; - return "string"; - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == ")" && maybeEnd) { - state.tokenize = null; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - // Interface - - return { - startState: function() { - return {tokenize: null}; - }, - - token: function(stream, state) { - if (stream.eatSpace()) return null; - var style = (state.tokenize || tokenBase)(stream, state); - if (style == "comment" || style == "meta") return style; - return style; - }, - - electricChars: "{}" - }; -}); - -CodeMirror.defineMIME("text/x-pascal", "pascal"); - -}); diff --git a/kallithea/public/codemirror/mode/pegjs/pegjs.js b/kallithea/public/codemirror/mode/pegjs/pegjs.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/pegjs/pegjs.js +++ /dev/null @@ -1,114 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../javascript/javascript")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../javascript/javascript"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("pegjs", function (config) { - var jsMode = CodeMirror.getMode(config, "javascript"); - - function identifier(stream) { - return stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/); - } - - return { - startState: function () { - return { - inString: false, - stringType: null, - inComment: false, - inChracterClass: false, - braced: 0, - lhs: true, - localState: null - }; - }, - token: function (stream, state) { - if (stream) - - //check for state changes - if (!state.inString && !state.inComment && ((stream.peek() == '"') || (stream.peek() == "'"))) { - state.stringType = stream.peek(); - stream.next(); // Skip quote - state.inString = true; // Update state - } - if (!state.inString && !state.inComment && stream.match(/^\/\*/)) { - state.inComment = true; - } - - //return state - if (state.inString) { - while (state.inString && !stream.eol()) { - if (stream.peek() === state.stringType) { - stream.next(); // Skip quote - state.inString = false; // Clear flag - } else if (stream.peek() === '\\') { - stream.next(); - stream.next(); - } else { - stream.match(/^.[^\\\"\']*/); - } - } - return state.lhs ? "property string" : "string"; // Token style - } else if (state.inComment) { - while (state.inComment && !stream.eol()) { - if (stream.match(/\*\//)) { - state.inComment = false; // Clear flag - } else { - stream.match(/^.[^\*]*/); - } - } - return "comment"; - } else if (state.inChracterClass) { - while (state.inChracterClass && !stream.eol()) { - if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) { - state.inChracterClass = false; - } - } - } else if (stream.peek() === '[') { - stream.next(); - state.inChracterClass = true; - return 'bracket'; - } else if (stream.match(/^\/\//)) { - stream.skipToEnd(); - return "comment"; - } else if (state.braced || stream.peek() === '{') { - if (state.localState === null) { - state.localState = jsMode.startState(); - } - var token = jsMode.token(stream, state.localState); - var text = stream.current(); - if (!token) { - for (var i = 0; i < text.length; i++) { - if (text[i] === '{') { - state.braced++; - } else if (text[i] === '}') { - state.braced--; - } - }; - } - return token; - } else if (identifier(stream)) { - if (stream.peek() === ':') { - return 'variable'; - } - return 'variable-2'; - } else if (['[', ']', '(', ')'].indexOf(stream.peek()) != -1) { - stream.next(); - return 'bracket'; - } else if (!stream.eatSpace()) { - stream.next(); - } - return null; - } - }; -}, "javascript"); - -}); diff --git a/kallithea/public/codemirror/mode/perl/perl.js b/kallithea/public/codemirror/mode/perl/perl.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/perl/perl.js +++ /dev/null @@ -1,832 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08) -// This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com) - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("perl",function(){ - // http://perldoc.perl.org - var PERL={ // null - magic touch - // 1 - keyword - // 2 - def - // 3 - atom - // 4 - operator - // 5 - variable-2 (predefined) - // [x,y] - x=1,2,3; y=must be defined if x{...} - // PERL operators - '->' : 4, - '++' : 4, - '--' : 4, - '**' : 4, - // ! ~ \ and unary + and - - '=~' : 4, - '!~' : 4, - '*' : 4, - '/' : 4, - '%' : 4, - 'x' : 4, - '+' : 4, - '-' : 4, - '.' : 4, - '<<' : 4, - '>>' : 4, - // named unary operators - '<' : 4, - '>' : 4, - '<=' : 4, - '>=' : 4, - 'lt' : 4, - 'gt' : 4, - 'le' : 4, - 'ge' : 4, - '==' : 4, - '!=' : 4, - '<=>' : 4, - 'eq' : 4, - 'ne' : 4, - 'cmp' : 4, - '~~' : 4, - '&' : 4, - '|' : 4, - '^' : 4, - '&&' : 4, - '||' : 4, - '//' : 4, - '..' : 4, - '...' : 4, - '?' : 4, - ':' : 4, - '=' : 4, - '+=' : 4, - '-=' : 4, - '*=' : 4, // etc. ??? - ',' : 4, - '=>' : 4, - '::' : 4, - // list operators (rightward) - 'not' : 4, - 'and' : 4, - 'or' : 4, - 'xor' : 4, - // PERL predefined variables (I know, what this is a paranoid idea, but may be needed for people, who learn PERL, and for me as well, ...and may be for you?;) - 'BEGIN' : [5,1], - 'END' : [5,1], - 'PRINT' : [5,1], - 'PRINTF' : [5,1], - 'GETC' : [5,1], - 'READ' : [5,1], - 'READLINE' : [5,1], - 'DESTROY' : [5,1], - 'TIE' : [5,1], - 'TIEHANDLE' : [5,1], - 'UNTIE' : [5,1], - 'STDIN' : 5, - 'STDIN_TOP' : 5, - 'STDOUT' : 5, - 'STDOUT_TOP' : 5, - 'STDERR' : 5, - 'STDERR_TOP' : 5, - '$ARG' : 5, - '$_' : 5, - '@ARG' : 5, - '@_' : 5, - '$LIST_SEPARATOR' : 5, - '$"' : 5, - '$PROCESS_ID' : 5, - '$PID' : 5, - '$$' : 5, - '$REAL_GROUP_ID' : 5, - '$GID' : 5, - '$(' : 5, - '$EFFECTIVE_GROUP_ID' : 5, - '$EGID' : 5, - '$)' : 5, - '$PROGRAM_NAME' : 5, - '$0' : 5, - '$SUBSCRIPT_SEPARATOR' : 5, - '$SUBSEP' : 5, - '$;' : 5, - '$REAL_USER_ID' : 5, - '$UID' : 5, - '$<' : 5, - '$EFFECTIVE_USER_ID' : 5, - '$EUID' : 5, - '$>' : 5, - '$a' : 5, - '$b' : 5, - '$COMPILING' : 5, - '$^C' : 5, - '$DEBUGGING' : 5, - '$^D' : 5, - '${^ENCODING}' : 5, - '$ENV' : 5, - '%ENV' : 5, - '$SYSTEM_FD_MAX' : 5, - '$^F' : 5, - '@F' : 5, - '${^GLOBAL_PHASE}' : 5, - '$^H' : 5, - '%^H' : 5, - '@INC' : 5, - '%INC' : 5, - '$INPLACE_EDIT' : 5, - '$^I' : 5, - '$^M' : 5, - '$OSNAME' : 5, - '$^O' : 5, - '${^OPEN}' : 5, - '$PERLDB' : 5, - '$^P' : 5, - '$SIG' : 5, - '%SIG' : 5, - '$BASETIME' : 5, - '$^T' : 5, - '${^TAINT}' : 5, - '${^UNICODE}' : 5, - '${^UTF8CACHE}' : 5, - '${^UTF8LOCALE}' : 5, - '$PERL_VERSION' : 5, - '$^V' : 5, - '${^WIN32_SLOPPY_STAT}' : 5, - '$EXECUTABLE_NAME' : 5, - '$^X' : 5, - '$1' : 5, // - regexp $1, $2... - '$MATCH' : 5, - '$&' : 5, - '${^MATCH}' : 5, - '$PREMATCH' : 5, - '$`' : 5, - '${^PREMATCH}' : 5, - '$POSTMATCH' : 5, - "$'" : 5, - '${^POSTMATCH}' : 5, - '$LAST_PAREN_MATCH' : 5, - '$+' : 5, - '$LAST_SUBMATCH_RESULT' : 5, - '$^N' : 5, - '@LAST_MATCH_END' : 5, - '@+' : 5, - '%LAST_PAREN_MATCH' : 5, - '%+' : 5, - '@LAST_MATCH_START' : 5, - '@-' : 5, - '%LAST_MATCH_START' : 5, - '%-' : 5, - '$LAST_REGEXP_CODE_RESULT' : 5, - '$^R' : 5, - '${^RE_DEBUG_FLAGS}' : 5, - '${^RE_TRIE_MAXBUF}' : 5, - '$ARGV' : 5, - '@ARGV' : 5, - 'ARGV' : 5, - 'ARGVOUT' : 5, - '$OUTPUT_FIELD_SEPARATOR' : 5, - '$OFS' : 5, - '$,' : 5, - '$INPUT_LINE_NUMBER' : 5, - '$NR' : 5, - '$.' : 5, - '$INPUT_RECORD_SEPARATOR' : 5, - '$RS' : 5, - '$/' : 5, - '$OUTPUT_RECORD_SEPARATOR' : 5, - '$ORS' : 5, - '$\\' : 5, - '$OUTPUT_AUTOFLUSH' : 5, - '$|' : 5, - '$ACCUMULATOR' : 5, - '$^A' : 5, - '$FORMAT_FORMFEED' : 5, - '$^L' : 5, - '$FORMAT_PAGE_NUMBER' : 5, - '$%' : 5, - '$FORMAT_LINES_LEFT' : 5, - '$-' : 5, - '$FORMAT_LINE_BREAK_CHARACTERS' : 5, - '$:' : 5, - '$FORMAT_LINES_PER_PAGE' : 5, - '$=' : 5, - '$FORMAT_TOP_NAME' : 5, - '$^' : 5, - '$FORMAT_NAME' : 5, - '$~' : 5, - '${^CHILD_ERROR_NATIVE}' : 5, - '$EXTENDED_OS_ERROR' : 5, - '$^E' : 5, - '$EXCEPTIONS_BEING_CAUGHT' : 5, - '$^S' : 5, - '$WARNING' : 5, - '$^W' : 5, - '${^WARNING_BITS}' : 5, - '$OS_ERROR' : 5, - '$ERRNO' : 5, - '$!' : 5, - '%OS_ERROR' : 5, - '%ERRNO' : 5, - '%!' : 5, - '$CHILD_ERROR' : 5, - '$?' : 5, - '$EVAL_ERROR' : 5, - '$@' : 5, - '$OFMT' : 5, - '$#' : 5, - '$*' : 5, - '$ARRAY_BASE' : 5, - '$[' : 5, - '$OLD_PERL_VERSION' : 5, - '$]' : 5, - // PERL blocks - 'if' :[1,1], - elsif :[1,1], - 'else' :[1,1], - 'while' :[1,1], - unless :[1,1], - 'for' :[1,1], - foreach :[1,1], - // PERL functions - 'abs' :1, // - absolute value function - accept :1, // - accept an incoming socket connect - alarm :1, // - schedule a SIGALRM - 'atan2' :1, // - arctangent of Y/X in the range -PI to PI - bind :1, // - binds an address to a socket - binmode :1, // - prepare binary files for I/O - bless :1, // - create an object - bootstrap :1, // - 'break' :1, // - break out of a "given" block - caller :1, // - get context of the current subroutine call - chdir :1, // - change your current working directory - chmod :1, // - changes the permissions on a list of files - chomp :1, // - remove a trailing record separator from a string - chop :1, // - remove the last character from a string - chown :1, // - change the owership on a list of files - chr :1, // - get character this number represents - chroot :1, // - make directory new root for path lookups - close :1, // - close file (or pipe or socket) handle - closedir :1, // - close directory handle - connect :1, // - connect to a remote socket - 'continue' :[1,1], // - optional trailing block in a while or foreach - 'cos' :1, // - cosine function - crypt :1, // - one-way passwd-style encryption - dbmclose :1, // - breaks binding on a tied dbm file - dbmopen :1, // - create binding on a tied dbm file - 'default' :1, // - defined :1, // - test whether a value, variable, or function is defined - 'delete' :1, // - deletes a value from a hash - die :1, // - raise an exception or bail out - 'do' :1, // - turn a BLOCK into a TERM - dump :1, // - create an immediate core dump - each :1, // - retrieve the next key/value pair from a hash - endgrent :1, // - be done using group file - endhostent :1, // - be done using hosts file - endnetent :1, // - be done using networks file - endprotoent :1, // - be done using protocols file - endpwent :1, // - be done using passwd file - endservent :1, // - be done using services file - eof :1, // - test a filehandle for its end - 'eval' :1, // - catch exceptions or compile and run code - 'exec' :1, // - abandon this program to run another - exists :1, // - test whether a hash key is present - exit :1, // - terminate this program - 'exp' :1, // - raise I to a power - fcntl :1, // - file control system call - fileno :1, // - return file descriptor from filehandle - flock :1, // - lock an entire file with an advisory lock - fork :1, // - create a new process just like this one - format :1, // - declare a picture format with use by the write() function - formline :1, // - internal function used for formats - getc :1, // - get the next character from the filehandle - getgrent :1, // - get next group record - getgrgid :1, // - get group record given group user ID - getgrnam :1, // - get group record given group name - gethostbyaddr :1, // - get host record given its address - gethostbyname :1, // - get host record given name - gethostent :1, // - get next hosts record - getlogin :1, // - return who logged in at this tty - getnetbyaddr :1, // - get network record given its address - getnetbyname :1, // - get networks record given name - getnetent :1, // - get next networks record - getpeername :1, // - find the other end of a socket connection - getpgrp :1, // - get process group - getppid :1, // - get parent process ID - getpriority :1, // - get current nice value - getprotobyname :1, // - get protocol record given name - getprotobynumber :1, // - get protocol record numeric protocol - getprotoent :1, // - get next protocols record - getpwent :1, // - get next passwd record - getpwnam :1, // - get passwd record given user login name - getpwuid :1, // - get passwd record given user ID - getservbyname :1, // - get services record given its name - getservbyport :1, // - get services record given numeric port - getservent :1, // - get next services record - getsockname :1, // - retrieve the sockaddr for a given socket - getsockopt :1, // - get socket options on a given socket - given :1, // - glob :1, // - expand filenames using wildcards - gmtime :1, // - convert UNIX time into record or string using Greenwich time - 'goto' :1, // - create spaghetti code - grep :1, // - locate elements in a list test true against a given criterion - hex :1, // - convert a string to a hexadecimal number - 'import' :1, // - patch a module's namespace into your own - index :1, // - find a substring within a string - 'int' :1, // - get the integer portion of a number - ioctl :1, // - system-dependent device control system call - 'join' :1, // - join a list into a string using a separator - keys :1, // - retrieve list of indices from a hash - kill :1, // - send a signal to a process or process group - last :1, // - exit a block prematurely - lc :1, // - return lower-case version of a string - lcfirst :1, // - return a string with just the next letter in lower case - length :1, // - return the number of bytes in a string - 'link' :1, // - create a hard link in the filesytem - listen :1, // - register your socket as a server - local : 2, // - create a temporary value for a global variable (dynamic scoping) - localtime :1, // - convert UNIX time into record or string using local time - lock :1, // - get a thread lock on a variable, subroutine, or method - 'log' :1, // - retrieve the natural logarithm for a number - lstat :1, // - stat a symbolic link - m :null, // - match a string with a regular expression pattern - map :1, // - apply a change to a list to get back a new list with the changes - mkdir :1, // - create a directory - msgctl :1, // - SysV IPC message control operations - msgget :1, // - get SysV IPC message queue - msgrcv :1, // - receive a SysV IPC message from a message queue - msgsnd :1, // - send a SysV IPC message to a message queue - my : 2, // - declare and assign a local variable (lexical scoping) - 'new' :1, // - next :1, // - iterate a block prematurely - no :1, // - unimport some module symbols or semantics at compile time - oct :1, // - convert a string to an octal number - open :1, // - open a file, pipe, or descriptor - opendir :1, // - open a directory - ord :1, // - find a character's numeric representation - our : 2, // - declare and assign a package variable (lexical scoping) - pack :1, // - convert a list into a binary representation - 'package' :1, // - declare a separate global namespace - pipe :1, // - open a pair of connected filehandles - pop :1, // - remove the last element from an array and return it - pos :1, // - find or set the offset for the last/next m//g search - print :1, // - output a list to a filehandle - printf :1, // - output a formatted list to a filehandle - prototype :1, // - get the prototype (if any) of a subroutine - push :1, // - append one or more elements to an array - q :null, // - singly quote a string - qq :null, // - doubly quote a string - qr :null, // - Compile pattern - quotemeta :null, // - quote regular expression magic characters - qw :null, // - quote a list of words - qx :null, // - backquote quote a string - rand :1, // - retrieve the next pseudorandom number - read :1, // - fixed-length buffered input from a filehandle - readdir :1, // - get a directory from a directory handle - readline :1, // - fetch a record from a file - readlink :1, // - determine where a symbolic link is pointing - readpipe :1, // - execute a system command and collect standard output - recv :1, // - receive a message over a Socket - redo :1, // - start this loop iteration over again - ref :1, // - find out the type of thing being referenced - rename :1, // - change a filename - require :1, // - load in external functions from a library at runtime - reset :1, // - clear all variables of a given name - 'return' :1, // - get out of a function early - reverse :1, // - flip a string or a list - rewinddir :1, // - reset directory handle - rindex :1, // - right-to-left substring search - rmdir :1, // - remove a directory - s :null, // - replace a pattern with a string - say :1, // - print with newline - scalar :1, // - force a scalar context - seek :1, // - reposition file pointer for random-access I/O - seekdir :1, // - reposition directory pointer - select :1, // - reset default output or do I/O multiplexing - semctl :1, // - SysV semaphore control operations - semget :1, // - get set of SysV semaphores - semop :1, // - SysV semaphore operations - send :1, // - send a message over a socket - setgrent :1, // - prepare group file for use - sethostent :1, // - prepare hosts file for use - setnetent :1, // - prepare networks file for use - setpgrp :1, // - set the process group of a process - setpriority :1, // - set a process's nice value - setprotoent :1, // - prepare protocols file for use - setpwent :1, // - prepare passwd file for use - setservent :1, // - prepare services file for use - setsockopt :1, // - set some socket options - shift :1, // - remove the first element of an array, and return it - shmctl :1, // - SysV shared memory operations - shmget :1, // - get SysV shared memory segment identifier - shmread :1, // - read SysV shared memory - shmwrite :1, // - write SysV shared memory - shutdown :1, // - close down just half of a socket connection - 'sin' :1, // - return the sine of a number - sleep :1, // - block for some number of seconds - socket :1, // - create a socket - socketpair :1, // - create a pair of sockets - 'sort' :1, // - sort a list of values - splice :1, // - add or remove elements anywhere in an array - 'split' :1, // - split up a string using a regexp delimiter - sprintf :1, // - formatted print into a string - 'sqrt' :1, // - square root function - srand :1, // - seed the random number generator - stat :1, // - get a file's status information - state :1, // - declare and assign a state variable (persistent lexical scoping) - study :1, // - optimize input data for repeated searches - 'sub' :1, // - declare a subroutine, possibly anonymously - 'substr' :1, // - get or alter a portion of a stirng - symlink :1, // - create a symbolic link to a file - syscall :1, // - execute an arbitrary system call - sysopen :1, // - open a file, pipe, or descriptor - sysread :1, // - fixed-length unbuffered input from a filehandle - sysseek :1, // - position I/O pointer on handle used with sysread and syswrite - system :1, // - run a separate program - syswrite :1, // - fixed-length unbuffered output to a filehandle - tell :1, // - get current seekpointer on a filehandle - telldir :1, // - get current seekpointer on a directory handle - tie :1, // - bind a variable to an object class - tied :1, // - get a reference to the object underlying a tied variable - time :1, // - return number of seconds since 1970 - times :1, // - return elapsed time for self and child processes - tr :null, // - transliterate a string - truncate :1, // - shorten a file - uc :1, // - return upper-case version of a string - ucfirst :1, // - return a string with just the next letter in upper case - umask :1, // - set file creation mode mask - undef :1, // - remove a variable or function definition - unlink :1, // - remove one link to a file - unpack :1, // - convert binary structure into normal perl variables - unshift :1, // - prepend more elements to the beginning of a list - untie :1, // - break a tie binding to a variable - use :1, // - load in a module at compile time - utime :1, // - set a file's last access and modify times - values :1, // - return a list of the values in a hash - vec :1, // - test or set particular bits in a string - wait :1, // - wait for any child process to die - waitpid :1, // - wait for a particular child process to die - wantarray :1, // - get void vs scalar vs list context of current subroutine call - warn :1, // - print debugging info - when :1, // - write :1, // - print a picture record - y :null}; // - transliterate a string - - var RXstyle="string-2"; - var RXmodifiers=/[goseximacplud]/; // NOTE: "m", "s", "y" and "tr" need to correct real modifiers for each regexp type - - function tokenChain(stream,state,chain,style,tail){ // NOTE: chain.length > 2 is not working now (it's for s[...][...]geos;) - state.chain=null; // 12 3tail - state.style=null; - state.tail=null; - state.tokenize=function(stream,state){ - var e=false,c,i=0; - while(c=stream.next()){ - if(c===chain[i]&&!e){ - if(chain[++i]!==undefined){ - state.chain=chain[i]; - state.style=style; - state.tail=tail;} - else if(tail) - stream.eatWhile(tail); - state.tokenize=tokenPerl; - return style;} - e=!e&&c=="\\";} - return style;}; - return state.tokenize(stream,state);} - - function tokenSOMETHING(stream,state,string){ - state.tokenize=function(stream,state){ - if(stream.string==string) - state.tokenize=tokenPerl; - stream.skipToEnd(); - return "string";}; - return state.tokenize(stream,state);} - - function tokenPerl(stream,state){ - if(stream.eatSpace()) - return null; - if(state.chain) - return tokenChain(stream,state,state.chain,state.style,state.tail); - if(stream.match(/^\-?[\d\.]/,false)) - if(stream.match(/^(\-?(\d*\.\d+(e[+-]?\d+)?|\d+\.\d*)|0x[\da-fA-F]+|0b[01]+|\d+(e[+-]?\d+)?)/)) - return 'number'; - if(stream.match(/^<<(?=\w)/)){ // NOTE: <"],RXstyle,RXmodifiers);} - if(/[\^'"!~\/]/.test(c)){ - eatSuffix(stream, 1); - return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}} - else if(c=="q"){ - c=look(stream, 1); - if(c=="("){ - eatSuffix(stream, 2); - return tokenChain(stream,state,[")"],"string");} - if(c=="["){ - eatSuffix(stream, 2); - return tokenChain(stream,state,["]"],"string");} - if(c=="{"){ - eatSuffix(stream, 2); - return tokenChain(stream,state,["}"],"string");} - if(c=="<"){ - eatSuffix(stream, 2); - return tokenChain(stream,state,[">"],"string");} - if(/[\^'"!~\/]/.test(c)){ - eatSuffix(stream, 1); - return tokenChain(stream,state,[stream.eat(c)],"string");}} - else if(c=="w"){ - c=look(stream, 1); - if(c=="("){ - eatSuffix(stream, 2); - return tokenChain(stream,state,[")"],"bracket");} - if(c=="["){ - eatSuffix(stream, 2); - return tokenChain(stream,state,["]"],"bracket");} - if(c=="{"){ - eatSuffix(stream, 2); - return tokenChain(stream,state,["}"],"bracket");} - if(c=="<"){ - eatSuffix(stream, 2); - return tokenChain(stream,state,[">"],"bracket");} - if(/[\^'"!~\/]/.test(c)){ - eatSuffix(stream, 1); - return tokenChain(stream,state,[stream.eat(c)],"bracket");}} - else if(c=="r"){ - c=look(stream, 1); - if(c=="("){ - eatSuffix(stream, 2); - return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);} - if(c=="["){ - eatSuffix(stream, 2); - return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);} - if(c=="{"){ - eatSuffix(stream, 2); - return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);} - if(c=="<"){ - eatSuffix(stream, 2); - return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);} - if(/[\^'"!~\/]/.test(c)){ - eatSuffix(stream, 1); - return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}} - else if(/[\^'"!~\/(\[{<]/.test(c)){ - if(c=="("){ - eatSuffix(stream, 1); - return tokenChain(stream,state,[")"],"string");} - if(c=="["){ - eatSuffix(stream, 1); - return tokenChain(stream,state,["]"],"string");} - if(c=="{"){ - eatSuffix(stream, 1); - return tokenChain(stream,state,["}"],"string");} - if(c=="<"){ - eatSuffix(stream, 1); - return tokenChain(stream,state,[">"],"string");} - if(/[\^'"!~\/]/.test(c)){ - return tokenChain(stream,state,[stream.eat(c)],"string");}}}} - if(ch=="m"){ - var c=look(stream, -2); - if(!(c&&/\w/.test(c))){ - c=stream.eat(/[(\[{<\^'"!~\/]/); - if(c){ - if(/[\^'"!~\/]/.test(c)){ - return tokenChain(stream,state,[c],RXstyle,RXmodifiers);} - if(c=="("){ - return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);} - if(c=="["){ - return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);} - if(c=="{"){ - return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);} - if(c=="<"){ - return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}}}} - if(ch=="s"){ - var c=/[\/>\]})\w]/.test(look(stream, -2)); - if(!c){ - c=stream.eat(/[(\[{<\^'"!~\/]/); - if(c){ - if(c=="[") - return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers); - if(c=="{") - return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers); - if(c=="<") - return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers); - if(c=="(") - return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers); - return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}} - if(ch=="y"){ - var c=/[\/>\]})\w]/.test(look(stream, -2)); - if(!c){ - c=stream.eat(/[(\[{<\^'"!~\/]/); - if(c){ - if(c=="[") - return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers); - if(c=="{") - return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers); - if(c=="<") - return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers); - if(c=="(") - return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers); - return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}} - if(ch=="t"){ - var c=/[\/>\]})\w]/.test(look(stream, -2)); - if(!c){ - c=stream.eat("r");if(c){ - c=stream.eat(/[(\[{<\^'"!~\/]/); - if(c){ - if(c=="[") - return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers); - if(c=="{") - return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers); - if(c=="<") - return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers); - if(c=="(") - return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers); - return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}} - if(ch=="`"){ - return tokenChain(stream,state,[ch],"variable-2");} - if(ch=="/"){ - if(!/~\s*$/.test(prefix(stream))) - return "operator"; - else - return tokenChain(stream,state,[ch],RXstyle,RXmodifiers);} - if(ch=="$"){ - var p=stream.pos; - if(stream.eatWhile(/\d/)||stream.eat("{")&&stream.eatWhile(/\d/)&&stream.eat("}")) - return "variable-2"; - else - stream.pos=p;} - if(/[$@%]/.test(ch)){ - var p=stream.pos; - if(stream.eat("^")&&stream.eat(/[A-Z]/)||!/[@$%&]/.test(look(stream, -2))&&stream.eat(/[=|\\\-#?@;:&`~\^!\[\]*'"$+.,\/<>()]/)){ - var c=stream.current(); - if(PERL[c]) - return "variable-2";} - stream.pos=p;} - if(/[$@%&]/.test(ch)){ - if(stream.eatWhile(/[\w$\[\]]/)||stream.eat("{")&&stream.eatWhile(/[\w$\[\]]/)&&stream.eat("}")){ - var c=stream.current(); - if(PERL[c]) - return "variable-2"; - else - return "variable";}} - if(ch=="#"){ - if(look(stream, -2)!="$"){ - stream.skipToEnd(); - return "comment";}} - if(/[:+\-\^*$&%@=<>!?|\/~\.]/.test(ch)){ - var p=stream.pos; - stream.eatWhile(/[:+\-\^*$&%@=<>!?|\/~\.]/); - if(PERL[stream.current()]) - return "operator"; - else - stream.pos=p;} - if(ch=="_"){ - if(stream.pos==1){ - if(suffix(stream, 6)=="_END__"){ - return tokenChain(stream,state,['\0'],"comment");} - else if(suffix(stream, 7)=="_DATA__"){ - return tokenChain(stream,state,['\0'],"variable-2");} - else if(suffix(stream, 7)=="_C__"){ - return tokenChain(stream,state,['\0'],"string");}}} - if(/\w/.test(ch)){ - var p=stream.pos; - if(look(stream, -2)=="{"&&(look(stream, 0)=="}"||stream.eatWhile(/\w/)&&look(stream, 0)=="}")) - return "string"; - else - stream.pos=p;} - if(/[A-Z]/.test(ch)){ - var l=look(stream, -2); - var p=stream.pos; - stream.eatWhile(/[A-Z_]/); - if(/[\da-z]/.test(look(stream, 0))){ - stream.pos=p;} - else{ - var c=PERL[stream.current()]; - if(!c) - return "meta"; - if(c[1]) - c=c[0]; - if(l!=":"){ - if(c==1) - return "keyword"; - else if(c==2) - return "def"; - else if(c==3) - return "atom"; - else if(c==4) - return "operator"; - else if(c==5) - return "variable-2"; - else - return "meta";} - else - return "meta";}} - if(/[a-zA-Z_]/.test(ch)){ - var l=look(stream, -2); - stream.eatWhile(/\w/); - var c=PERL[stream.current()]; - if(!c) - return "meta"; - if(c[1]) - c=c[0]; - if(l!=":"){ - if(c==1) - return "keyword"; - else if(c==2) - return "def"; - else if(c==3) - return "atom"; - else if(c==4) - return "operator"; - else if(c==5) - return "variable-2"; - else - return "meta";} - else - return "meta";} - return null;} - - return{ - startState:function(){ - return{ - tokenize:tokenPerl, - chain:null, - style:null, - tail:null};}, - token:function(stream,state){ - return (state.tokenize||tokenPerl)(stream,state);} - };}); - -CodeMirror.registerHelper("wordChars", "perl", /[\w$]/); - -CodeMirror.defineMIME("text/x-perl", "perl"); - -// it's like "peek", but need for look-ahead or look-behind if index < 0 -function look(stream, c){ - return stream.string.charAt(stream.pos+(c||0)); -} - -// return a part of prefix of current stream from current position -function prefix(stream, c){ - if(c){ - var x=stream.pos-c; - return stream.string.substr((x>=0?x:0),c);} - else{ - return stream.string.substr(0,stream.pos-1); - } -} - -// return a part of suffix of current stream from current position -function suffix(stream, c){ - var y=stream.string.length; - var x=y-stream.pos+1; - return stream.string.substr(stream.pos,(c&&c=(y=stream.string.length-1)) - stream.pos=y; - else - stream.pos=x; -} - -}); diff --git a/kallithea/public/codemirror/mode/php/php.js b/kallithea/public/codemirror/mode/php/php.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/php/php.js +++ /dev/null @@ -1,226 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../clike/clike")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../clike/clike"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - function keywords(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - // Helper for stringWithEscapes - function matchSequence(list, end) { - if (list.length == 0) return stringWithEscapes(end); - return function (stream, state) { - var patterns = list[0]; - for (var i = 0; i < patterns.length; i++) if (stream.match(patterns[i][0])) { - state.tokenize = matchSequence(list.slice(1), end); - return patterns[i][1]; - } - state.tokenize = stringWithEscapes(end); - return "string"; - }; - } - function stringWithEscapes(closing) { - return function(stream, state) { return stringWithEscapes_(stream, state, closing); }; - } - function stringWithEscapes_(stream, state, closing) { - // "Complex" syntax - if (stream.match("${", false) || stream.match("{$", false)) { - state.tokenize = null; - return "string"; - } - - // Simple syntax - if (stream.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/)) { - // After the variable name there may appear array or object operator. - if (stream.match("[", false)) { - // Match array operator - state.tokenize = matchSequence([ - [["[", null]], - [[/\d[\w\.]*/, "number"], - [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"], - [/[\w\$]+/, "variable"]], - [["]", null]] - ], closing); - } - if (stream.match(/\-\>\w/, false)) { - // Match object operator - state.tokenize = matchSequence([ - [["->", null]], - [[/[\w]+/, "variable"]] - ], closing); - } - return "variable-2"; - } - - var escaped = false; - // Normal string - while (!stream.eol() && - (escaped || (!stream.match("{$", false) && - !stream.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false)))) { - if (!escaped && stream.match(closing)) { - state.tokenize = null; - state.tokStack.pop(); state.tokStack.pop(); - break; - } - escaped = stream.next() == "\\" && !escaped; - } - return "string"; - } - - var phpKeywords = "abstract and array as break case catch class clone const continue declare default " + - "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " + - "for foreach function global goto if implements interface instanceof namespace " + - "new or private protected public static switch throw trait try use var while xor " + - "die echo empty exit eval include include_once isset list require require_once return " + - "print unset __halt_compiler self static parent yield insteadof finally"; - var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__"; - var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count"; - CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" ")); - CodeMirror.registerHelper("wordChars", "php", /[\w$]/); - - var phpConfig = { - name: "clike", - helperType: "php", - keywords: keywords(phpKeywords), - blockKeywords: keywords("catch do else elseif for foreach if switch try while finally"), - atoms: keywords(phpAtoms), - builtin: keywords(phpBuiltin), - multiLineStrings: true, - hooks: { - "$": function(stream) { - stream.eatWhile(/[\w\$_]/); - return "variable-2"; - }, - "<": function(stream, state) { - if (stream.match(/<", false)) stream.next(); - return "comment"; - }, - "/": function(stream) { - if (stream.eat("/")) { - while (!stream.eol() && !stream.match("?>", false)) stream.next(); - return "comment"; - } - return false; - }, - '"': function(_stream, state) { - (state.tokStack || (state.tokStack = [])).push('"', 0); - state.tokenize = stringWithEscapes('"'); - return "string"; - }, - "{": function(_stream, state) { - if (state.tokStack && state.tokStack.length) - state.tokStack[state.tokStack.length - 1]++; - return false; - }, - "}": function(_stream, state) { - if (state.tokStack && state.tokStack.length > 0 && - !--state.tokStack[state.tokStack.length - 1]) { - state.tokenize = stringWithEscapes(state.tokStack[state.tokStack.length - 2]); - } - return false; - } - } - }; - - CodeMirror.defineMode("php", function(config, parserConfig) { - var htmlMode = CodeMirror.getMode(config, "text/html"); - var phpMode = CodeMirror.getMode(config, phpConfig); - - function dispatch(stream, state) { - var isPHP = state.curMode == phpMode; - if (stream.sol() && state.pending && state.pending != '"' && state.pending != "'") state.pending = null; - if (!isPHP) { - if (stream.match(/^<\?\w*/)) { - state.curMode = phpMode; - state.curState = state.php; - return "meta"; - } - if (state.pending == '"' || state.pending == "'") { - while (!stream.eol() && stream.next() != state.pending) {} - var style = "string"; - } else if (state.pending && stream.pos < state.pending.end) { - stream.pos = state.pending.end; - var style = state.pending.style; - } else { - var style = htmlMode.token(stream, state.curState); - } - if (state.pending) state.pending = null; - var cur = stream.current(), openPHP = cur.search(/<\?/), m; - if (openPHP != -1) { - if (style == "string" && (m = cur.match(/[\'\"]$/)) && !/\?>/.test(cur)) state.pending = m[0]; - else state.pending = {end: stream.pos, style: style}; - stream.backUp(cur.length - openPHP); - } - return style; - } else if (isPHP && state.php.tokenize == null && stream.match("?>")) { - state.curMode = htmlMode; - state.curState = state.html; - return "meta"; - } else { - return phpMode.token(stream, state.curState); - } - } - - return { - startState: function() { - var html = CodeMirror.startState(htmlMode), php = CodeMirror.startState(phpMode); - return {html: html, - php: php, - curMode: parserConfig.startOpen ? phpMode : htmlMode, - curState: parserConfig.startOpen ? php : html, - pending: null}; - }, - - copyState: function(state) { - var html = state.html, htmlNew = CodeMirror.copyState(htmlMode, html), - php = state.php, phpNew = CodeMirror.copyState(phpMode, php), cur; - if (state.curMode == htmlMode) cur = htmlNew; - else cur = phpNew; - return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur, - pending: state.pending}; - }, - - token: dispatch, - - indent: function(state, textAfter) { - if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) || - (state.curMode == phpMode && /^\?>/.test(textAfter))) - return htmlMode.indent(state.html, textAfter); - return state.curMode.indent(state.curState, textAfter); - }, - - blockCommentStart: "/*", - blockCommentEnd: "*/", - lineComment: "//", - - innerMode: function(state) { return {state: state.curState, mode: state.curMode}; } - }; - }, "htmlmixed", "clike"); - - CodeMirror.defineMIME("application/x-httpd-php", "php"); - CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true}); - CodeMirror.defineMIME("text/x-php", phpConfig); -}); diff --git a/kallithea/public/codemirror/mode/pig/pig.js b/kallithea/public/codemirror/mode/pig/pig.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/pig/pig.js +++ /dev/null @@ -1,188 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/* - * Pig Latin Mode for CodeMirror 2 - * @author Prasanth Jayachandran - * @link https://github.com/prasanthj/pig-codemirror-2 - * This implementation is adapted from PL/SQL mode in CodeMirror 2. - */ -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("pig", function(_config, parserConfig) { - var keywords = parserConfig.keywords, - builtins = parserConfig.builtins, - types = parserConfig.types, - multiLineStrings = parserConfig.multiLineStrings; - - var isOperatorChar = /[*+\-%<>=&?:\/!|]/; - - function chain(stream, state, f) { - state.tokenize = f; - return f(stream, state); - } - - var type; - function ret(tp, style) { - type = tp; - return style; - } - - function tokenComment(stream, state) { - var isEnd = false; - var ch; - while(ch = stream.next()) { - if(ch == "/" && isEnd) { - state.tokenize = tokenBase; - break; - } - isEnd = (ch == "*"); - } - return ret("comment", "comment"); - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next, end = false; - while((next = stream.next()) != null) { - if (next == quote && !escaped) { - end = true; break; - } - escaped = !escaped && next == "\\"; - } - if (end || !(escaped || multiLineStrings)) - state.tokenize = tokenBase; - return ret("string", "error"); - }; - } - - function tokenBase(stream, state) { - var ch = stream.next(); - - // is a start of string? - if (ch == '"' || ch == "'") - return chain(stream, state, tokenString(ch)); - // is it one of the special chars - else if(/[\[\]{}\(\),;\.]/.test(ch)) - return ret(ch); - // is it a number? - else if(/\d/.test(ch)) { - stream.eatWhile(/[\w\.]/); - return ret("number", "number"); - } - // multi line comment or operator - else if (ch == "/") { - if (stream.eat("*")) { - return chain(stream, state, tokenComment); - } - else { - stream.eatWhile(isOperatorChar); - return ret("operator", "operator"); - } - } - // single line comment or operator - else if (ch=="-") { - if(stream.eat("-")){ - stream.skipToEnd(); - return ret("comment", "comment"); - } - else { - stream.eatWhile(isOperatorChar); - return ret("operator", "operator"); - } - } - // is it an operator - else if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return ret("operator", "operator"); - } - else { - // get the while word - stream.eatWhile(/[\w\$_]/); - // is it one of the listed keywords? - if (keywords && keywords.propertyIsEnumerable(stream.current().toUpperCase())) { - if (stream.eat(")") || stream.eat(".")) { - //keywords can be used as variables like flatten(group), group.$0 etc.. - } - else { - return ("keyword", "keyword"); - } - } - // is it one of the builtin functions? - if (builtins && builtins.propertyIsEnumerable(stream.current().toUpperCase())) - { - return ("keyword", "variable-2"); - } - // is it one of the listed types? - if (types && types.propertyIsEnumerable(stream.current().toUpperCase())) - return ("keyword", "variable-3"); - // default is a 'variable' - return ret("variable", "pig-word"); - } - } - - // Interface - return { - startState: function() { - return { - tokenize: tokenBase, - startOfLine: true - }; - }, - - token: function(stream, state) { - if(stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - return style; - } - }; -}); - -(function() { - function keywords(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - // builtin funcs taken from trunk revision 1303237 - var pBuiltins = "ABS ACOS ARITY ASIN ATAN AVG BAGSIZE BINSTORAGE BLOOM BUILDBLOOM CBRT CEIL " - + "CONCAT COR COS COSH COUNT COUNT_STAR COV CONSTANTSIZE CUBEDIMENSIONS DIFF DISTINCT DOUBLEABS " - + "DOUBLEAVG DOUBLEBASE DOUBLEMAX DOUBLEMIN DOUBLEROUND DOUBLESUM EXP FLOOR FLOATABS FLOATAVG " - + "FLOATMAX FLOATMIN FLOATROUND FLOATSUM GENERICINVOKER INDEXOF INTABS INTAVG INTMAX INTMIN " - + "INTSUM INVOKEFORDOUBLE INVOKEFORFLOAT INVOKEFORINT INVOKEFORLONG INVOKEFORSTRING INVOKER " - + "ISEMPTY JSONLOADER JSONMETADATA JSONSTORAGE LAST_INDEX_OF LCFIRST LOG LOG10 LOWER LONGABS " - + "LONGAVG LONGMAX LONGMIN LONGSUM MAX MIN MAPSIZE MONITOREDUDF NONDETERMINISTIC OUTPUTSCHEMA " - + "PIGSTORAGE PIGSTREAMING RANDOM REGEX_EXTRACT REGEX_EXTRACT_ALL REPLACE ROUND SIN SINH SIZE " - + "SQRT STRSPLIT SUBSTRING SUM STRINGCONCAT STRINGMAX STRINGMIN STRINGSIZE TAN TANH TOBAG " - + "TOKENIZE TOMAP TOP TOTUPLE TRIM TEXTLOADER TUPLESIZE UCFIRST UPPER UTF8STORAGECONVERTER "; - - // taken from QueryLexer.g - var pKeywords = "VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP " - + "JOIN CROSS UNION SPLIT INTO IF OTHERWISE ALL AS BY USING INNER OUTER ONSCHEMA PARALLEL " - + "PARTITION GROUP AND OR NOT GENERATE FLATTEN ASC DESC IS STREAM THROUGH STORE MAPREDUCE " - + "SHIP CACHE INPUT OUTPUT STDERROR STDIN STDOUT LIMIT SAMPLE LEFT RIGHT FULL EQ GT LT GTE LTE " - + "NEQ MATCHES TRUE FALSE DUMP"; - - // data types - var pTypes = "BOOLEAN INT LONG FLOAT DOUBLE CHARARRAY BYTEARRAY BAG TUPLE MAP "; - - CodeMirror.defineMIME("text/x-pig", { - name: "pig", - builtins: keywords(pBuiltins), - keywords: keywords(pKeywords), - types: keywords(pTypes) - }); - - CodeMirror.registerHelper("hintWords", "pig", (pBuiltins + pTypes + pKeywords).split(" ")); -}()); - -}); diff --git a/kallithea/public/codemirror/mode/properties/properties.js b/kallithea/public/codemirror/mode/properties/properties.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/properties/properties.js +++ /dev/null @@ -1,78 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("properties", function() { - return { - token: function(stream, state) { - var sol = stream.sol() || state.afterSection; - var eol = stream.eol(); - - state.afterSection = false; - - if (sol) { - if (state.nextMultiline) { - state.inMultiline = true; - state.nextMultiline = false; - } else { - state.position = "def"; - } - } - - if (eol && ! state.nextMultiline) { - state.inMultiline = false; - state.position = "def"; - } - - if (sol) { - while(stream.eatSpace()); - } - - var ch = stream.next(); - - if (sol && (ch === "#" || ch === "!" || ch === ";")) { - state.position = "comment"; - stream.skipToEnd(); - return "comment"; - } else if (sol && ch === "[") { - state.afterSection = true; - stream.skipTo("]"); stream.eat("]"); - return "header"; - } else if (ch === "=" || ch === ":") { - state.position = "quote"; - return null; - } else if (ch === "\\" && state.position === "quote") { - if (stream.next() !== "u") { // u = Unicode sequence \u1234 - // Multiline value - state.nextMultiline = true; - } - } - - return state.position; - }, - - startState: function() { - return { - position : "def", // Current position, "def", "quote" or "comment" - nextMultiline : false, // Is the next line multiline value - inMultiline : false, // Is the current line a multiline value - afterSection : false // Did we just open a section - }; - } - - }; -}); - -CodeMirror.defineMIME("text/x-properties", "properties"); -CodeMirror.defineMIME("text/x-ini", "properties"); - -}); diff --git a/kallithea/public/codemirror/mode/puppet/puppet.js b/kallithea/public/codemirror/mode/puppet/puppet.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/puppet/puppet.js +++ /dev/null @@ -1,220 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("puppet", function () { - // Stores the words from the define method - var words = {}; - // Taken, mostly, from the Puppet official variable standards regex - var variable_regex = /({)?([a-z][a-z0-9_]*)?((::[a-z][a-z0-9_]*)*::)?[a-zA-Z0-9_]+(})?/; - - // Takes a string of words separated by spaces and adds them as - // keys with the value of the first argument 'style' - function define(style, string) { - var split = string.split(' '); - for (var i = 0; i < split.length; i++) { - words[split[i]] = style; - } - } - - // Takes commonly known puppet types/words and classifies them to a style - define('keyword', 'class define site node include import inherits'); - define('keyword', 'case if else in and elsif default or'); - define('atom', 'false true running present absent file directory undef'); - define('builtin', 'action augeas burst chain computer cron destination dport exec ' + - 'file filebucket group host icmp iniface interface jump k5login limit log_level ' + - 'log_prefix macauthorization mailalias maillist mcx mount nagios_command ' + - 'nagios_contact nagios_contactgroup nagios_host nagios_hostdependency ' + - 'nagios_hostescalation nagios_hostextinfo nagios_hostgroup nagios_service ' + - 'nagios_servicedependency nagios_serviceescalation nagios_serviceextinfo ' + - 'nagios_servicegroup nagios_timeperiod name notify outiface package proto reject ' + - 'resources router schedule scheduled_task selboolean selmodule service source ' + - 'sport ssh_authorized_key sshkey stage state table tidy todest toports tosource ' + - 'user vlan yumrepo zfs zone zpool'); - - // After finding a start of a string ('|") this function attempts to find the end; - // If a variable is encountered along the way, we display it differently when it - // is encapsulated in a double-quoted string. - function tokenString(stream, state) { - var current, prev, found_var = false; - while (!stream.eol() && (current = stream.next()) != state.pending) { - if (current === '$' && prev != '\\' && state.pending == '"') { - found_var = true; - break; - } - prev = current; - } - if (found_var) { - stream.backUp(1); - } - if (current == state.pending) { - state.continueString = false; - } else { - state.continueString = true; - } - return "string"; - } - - // Main function - function tokenize(stream, state) { - // Matches one whole word - var word = stream.match(/[\w]+/, false); - // Matches attributes (i.e. ensure => present ; 'ensure' would be matched) - var attribute = stream.match(/(\s+)?\w+\s+=>.*/, false); - // Matches non-builtin resource declarations - // (i.e. "apache::vhost {" or "mycustomclasss {" would be matched) - var resource = stream.match(/(\s+)?[\w:_]+(\s+)?{/, false); - // Matches virtual and exported resources (i.e. @@user { ; and the like) - var special_resource = stream.match(/(\s+)?[@]{1,2}[\w:_]+(\s+)?{/, false); - - // Finally advance the stream - var ch = stream.next(); - - // Have we found a variable? - if (ch === '$') { - if (stream.match(variable_regex)) { - // If so, and its in a string, assign it a different color - return state.continueString ? 'variable-2' : 'variable'; - } - // Otherwise return an invalid variable - return "error"; - } - // Should we still be looking for the end of a string? - if (state.continueString) { - // If so, go through the loop again - stream.backUp(1); - return tokenString(stream, state); - } - // Are we in a definition (class, node, define)? - if (state.inDefinition) { - // If so, return def (i.e. for 'class myclass {' ; 'myclass' would be matched) - if (stream.match(/(\s+)?[\w:_]+(\s+)?/)) { - return 'def'; - } - // Match the rest it the next time around - stream.match(/\s+{/); - state.inDefinition = false; - } - // Are we in an 'include' statement? - if (state.inInclude) { - // Match and return the included class - stream.match(/(\s+)?\S+(\s+)?/); - state.inInclude = false; - return 'def'; - } - // Do we just have a function on our hands? - // In 'ensure_resource("myclass")', 'ensure_resource' is matched - if (stream.match(/(\s+)?\w+\(/)) { - stream.backUp(1); - return 'def'; - } - // Have we matched the prior attribute regex? - if (attribute) { - stream.match(/(\s+)?\w+/); - return 'tag'; - } - // Do we have Puppet specific words? - if (word && words.hasOwnProperty(word)) { - // Negates the initial next() - stream.backUp(1); - // Acutally move the stream - stream.match(/[\w]+/); - // We want to process these words differently - // do to the importance they have in Puppet - if (stream.match(/\s+\S+\s+{/, false)) { - state.inDefinition = true; - } - if (word == 'include') { - state.inInclude = true; - } - // Returns their value as state in the prior define methods - return words[word]; - } - // Is there a match on a reference? - if (/(\s+)?[A-Z]/.test(word)) { - // Negate the next() - stream.backUp(1); - // Match the full reference - stream.match(/(\s+)?[A-Z][\w:_]+/); - return 'def'; - } - // Have we matched the prior resource regex? - if (resource) { - stream.match(/(\s+)?[\w:_]+/); - return 'def'; - } - // Have we matched the prior special_resource regex? - if (special_resource) { - stream.match(/(\s+)?[@]{1,2}/); - return 'special'; - } - // Match all the comments. All of them. - if (ch == "#") { - stream.skipToEnd(); - return "comment"; - } - // Have we found a string? - if (ch == "'" || ch == '"') { - // Store the type (single or double) - state.pending = ch; - // Perform the looping function to find the end - return tokenString(stream, state); - } - // Match all the brackets - if (ch == '{' || ch == '}') { - return 'bracket'; - } - // Match characters that we are going to assume - // are trying to be regex - if (ch == '/') { - stream.match(/.*?\//); - return 'variable-3'; - } - // Match all the numbers - if (ch.match(/[0-9]/)) { - stream.eatWhile(/[0-9]+/); - return 'number'; - } - // Match the '=' and '=>' operators - if (ch == '=') { - if (stream.peek() == '>') { - stream.next(); - } - return "operator"; - } - // Keep advancing through all the rest - stream.eatWhile(/[\w-]/); - // Return a blank line for everything else - return null; - } - // Start it all - return { - startState: function () { - var state = {}; - state.inDefinition = false; - state.inInclude = false; - state.continueString = false; - state.pending = false; - return state; - }, - token: function (stream, state) { - // Strip the spaces, but regex will account for them eitherway - if (stream.eatSpace()) return null; - // Go through the main process - return tokenize(stream, state); - } - }; -}); - -CodeMirror.defineMIME("text/x-puppet", "puppet"); - -}); diff --git a/kallithea/public/codemirror/mode/python/python.js b/kallithea/public/codemirror/mode/python/python.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/python/python.js +++ /dev/null @@ -1,359 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - function wordRegexp(words) { - return new RegExp("^((" + words.join(")|(") + "))\\b"); - } - - var wordOperators = wordRegexp(["and", "or", "not", "is"]); - var commonKeywords = ["as", "assert", "break", "class", "continue", - "def", "del", "elif", "else", "except", "finally", - "for", "from", "global", "if", "import", - "lambda", "pass", "raise", "return", - "try", "while", "with", "yield", "in"]; - var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr", - "classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod", - "enumerate", "eval", "filter", "float", "format", "frozenset", - "getattr", "globals", "hasattr", "hash", "help", "hex", "id", - "input", "int", "isinstance", "issubclass", "iter", "len", - "list", "locals", "map", "max", "memoryview", "min", "next", - "object", "oct", "open", "ord", "pow", "property", "range", - "repr", "reversed", "round", "set", "setattr", "slice", - "sorted", "staticmethod", "str", "sum", "super", "tuple", - "type", "vars", "zip", "__import__", "NotImplemented", - "Ellipsis", "__debug__"]; - var py2 = {builtins: ["apply", "basestring", "buffer", "cmp", "coerce", "execfile", - "file", "intern", "long", "raw_input", "reduce", "reload", - "unichr", "unicode", "xrange", "False", "True", "None"], - keywords: ["exec", "print"]}; - var py3 = {builtins: ["ascii", "bytes", "exec", "print"], - keywords: ["nonlocal", "False", "True", "None"]}; - - CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins)); - - function top(state) { - return state.scopes[state.scopes.length - 1]; - } - - CodeMirror.defineMode("python", function(conf, parserConf) { - var ERRORCLASS = "error"; - - var singleDelimiters = parserConf.singleDelimiters || new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]"); - var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))"); - var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))"); - var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))"); - - if (parserConf.version && parseInt(parserConf.version, 10) == 3){ - // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator - var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!@]"); - var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*"); - } else { - var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]"); - var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*"); - } - - var hangingIndent = parserConf.hangingIndent || conf.indentUnit; - - var myKeywords = commonKeywords, myBuiltins = commonBuiltins; - if(parserConf.extra_keywords != undefined){ - myKeywords = myKeywords.concat(parserConf.extra_keywords); - } - if(parserConf.extra_builtins != undefined){ - myBuiltins = myBuiltins.concat(parserConf.extra_builtins); - } - if (parserConf.version && parseInt(parserConf.version, 10) == 3) { - myKeywords = myKeywords.concat(py3.keywords); - myBuiltins = myBuiltins.concat(py3.builtins); - var stringPrefixes = new RegExp("^(([rb]|(br))?('{3}|\"{3}|['\"]))", "i"); - } else { - myKeywords = myKeywords.concat(py2.keywords); - myBuiltins = myBuiltins.concat(py2.builtins); - var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i"); - } - var keywords = wordRegexp(myKeywords); - var builtins = wordRegexp(myBuiltins); - - // tokenizers - function tokenBase(stream, state) { - // Handle scope changes - if (stream.sol() && top(state).type == "py") { - var scopeOffset = top(state).offset; - if (stream.eatSpace()) { - var lineOffset = stream.indentation(); - if (lineOffset > scopeOffset) - pushScope(stream, state, "py"); - else if (lineOffset < scopeOffset && dedent(stream, state)) - state.errorToken = true; - return null; - } else { - var style = tokenBaseInner(stream, state); - if (scopeOffset > 0 && dedent(stream, state)) - style += " " + ERRORCLASS; - return style; - } - } - return tokenBaseInner(stream, state); - } - - function tokenBaseInner(stream, state) { - if (stream.eatSpace()) return null; - - var ch = stream.peek(); - - // Handle Comments - if (ch == "#") { - stream.skipToEnd(); - return "comment"; - } - - // Handle Number Literals - if (stream.match(/^[0-9\.]/, false)) { - var floatLiteral = false; - // Floats - if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; } - if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; } - if (stream.match(/^\.\d+/)) { floatLiteral = true; } - if (floatLiteral) { - // Float literals may be "imaginary" - stream.eat(/J/i); - return "number"; - } - // Integers - var intLiteral = false; - // Hex - if (stream.match(/^0x[0-9a-f]+/i)) intLiteral = true; - // Binary - if (stream.match(/^0b[01]+/i)) intLiteral = true; - // Octal - if (stream.match(/^0o[0-7]+/i)) intLiteral = true; - // Decimal - if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) { - // Decimal literals may be "imaginary" - stream.eat(/J/i); - // TODO - Can you have imaginary longs? - intLiteral = true; - } - // Zero by itself with no other piece of number. - if (stream.match(/^0(?![\dx])/i)) intLiteral = true; - if (intLiteral) { - // Integer literals may be "long" - stream.eat(/L/i); - return "number"; - } - } - - // Handle Strings - if (stream.match(stringPrefixes)) { - state.tokenize = tokenStringFactory(stream.current()); - return state.tokenize(stream, state); - } - - // Handle operators and Delimiters - if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) - return null; - - if (stream.match(doubleOperators) - || stream.match(singleOperators) - || stream.match(wordOperators)) - return "operator"; - - if (stream.match(singleDelimiters)) - return null; - - if (stream.match(keywords)) - return "keyword"; - - if (stream.match(builtins)) - return "builtin"; - - if (stream.match(/^(self|cls)\b/)) - return "variable-2"; - - if (stream.match(identifiers)) { - if (state.lastToken == "def" || state.lastToken == "class") - return "def"; - return "variable"; - } - - // Handle non-detected items - stream.next(); - return ERRORCLASS; - } - - function tokenStringFactory(delimiter) { - while ("rub".indexOf(delimiter.charAt(0).toLowerCase()) >= 0) - delimiter = delimiter.substr(1); - - var singleline = delimiter.length == 1; - var OUTCLASS = "string"; - - function tokenString(stream, state) { - while (!stream.eol()) { - stream.eatWhile(/[^'"\\]/); - if (stream.eat("\\")) { - stream.next(); - if (singleline && stream.eol()) - return OUTCLASS; - } else if (stream.match(delimiter)) { - state.tokenize = tokenBase; - return OUTCLASS; - } else { - stream.eat(/['"]/); - } - } - if (singleline) { - if (parserConf.singleLineStringErrors) - return ERRORCLASS; - else - state.tokenize = tokenBase; - } - return OUTCLASS; - } - tokenString.isString = true; - return tokenString; - } - - function pushScope(stream, state, type) { - var offset = 0, align = null; - if (type == "py") { - while (top(state).type != "py") - state.scopes.pop(); - } - offset = top(state).offset + (type == "py" ? conf.indentUnit : hangingIndent); - if (type != "py" && !stream.match(/^(\s|#.*)*$/, false)) - align = stream.column() + 1; - state.scopes.push({offset: offset, type: type, align: align}); - } - - function dedent(stream, state) { - var indented = stream.indentation(); - while (top(state).offset > indented) { - if (top(state).type != "py") return true; - state.scopes.pop(); - } - return top(state).offset != indented; - } - - function tokenLexer(stream, state) { - var style = state.tokenize(stream, state); - var current = stream.current(); - - // Handle '.' connected identifiers - if (current == ".") { - style = stream.match(identifiers, false) ? null : ERRORCLASS; - if (style == null && state.lastStyle == "meta") { - // Apply 'meta' style to '.' connected identifiers when - // appropriate. - style = "meta"; - } - return style; - } - - // Handle decorators - if (current == "@"){ - if(parserConf.version && parseInt(parserConf.version, 10) == 3){ - return stream.match(identifiers, false) ? "meta" : "operator"; - } else { - return stream.match(identifiers, false) ? "meta" : ERRORCLASS; - } - } - - if ((style == "variable" || style == "builtin") - && state.lastStyle == "meta") - style = "meta"; - - // Handle scope changes. - if (current == "pass" || current == "return") - state.dedent += 1; - - if (current == "lambda") state.lambda = true; - if (current == ":" && !state.lambda && top(state).type == "py") - pushScope(stream, state, "py"); - - var delimiter_index = current.length == 1 ? "[({".indexOf(current) : -1; - if (delimiter_index != -1) - pushScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1)); - - delimiter_index = "])}".indexOf(current); - if (delimiter_index != -1) { - if (top(state).type == current) state.scopes.pop(); - else return ERRORCLASS; - } - if (state.dedent > 0 && stream.eol() && top(state).type == "py") { - if (state.scopes.length > 1) state.scopes.pop(); - state.dedent -= 1; - } - - return style; - } - - var external = { - startState: function(basecolumn) { - return { - tokenize: tokenBase, - scopes: [{offset: basecolumn || 0, type: "py", align: null}], - lastStyle: null, - lastToken: null, - lambda: false, - dedent: 0 - }; - }, - - token: function(stream, state) { - var addErr = state.errorToken; - if (addErr) state.errorToken = false; - var style = tokenLexer(stream, state); - - state.lastStyle = style; - - var current = stream.current(); - if (current && style) - state.lastToken = current; - - if (stream.eol() && state.lambda) - state.lambda = false; - return addErr ? style + " " + ERRORCLASS : style; - }, - - indent: function(state, textAfter) { - if (state.tokenize != tokenBase) - return state.tokenize.isString ? CodeMirror.Pass : 0; - - var scope = top(state); - var closing = textAfter && textAfter.charAt(0) == scope.type; - if (scope.align != null) - return scope.align - (closing ? 1 : 0); - else if (closing && state.scopes.length > 1) - return state.scopes[state.scopes.length - 2].offset; - else - return scope.offset; - }, - - lineComment: "#", - fold: "indent" - }; - return external; - }); - - CodeMirror.defineMIME("text/x-python", "python"); - - var words = function(str) { return str.split(" "); }; - - CodeMirror.defineMIME("text/x-cython", { - name: "python", - extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+ - "extern gil include nogil property public"+ - "readonly struct union DEF IF ELIF ELSE") - }); - -}); diff --git a/kallithea/public/codemirror/mode/q/q.js b/kallithea/public/codemirror/mode/q/q.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/q/q.js +++ /dev/null @@ -1,139 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("q",function(config){ - var indentUnit=config.indentUnit, - curPunc, - keywords=buildRE(["abs","acos","aj","aj0","all","and","any","asc","asin","asof","atan","attr","avg","avgs","bin","by","ceiling","cols","cor","cos","count","cov","cross","csv","cut","delete","deltas","desc","dev","differ","distinct","div","do","each","ej","enlist","eval","except","exec","exit","exp","fby","fills","first","fkeys","flip","floor","from","get","getenv","group","gtime","hclose","hcount","hdel","hopen","hsym","iasc","idesc","if","ij","in","insert","inter","inv","key","keys","last","like","list","lj","load","log","lower","lsq","ltime","ltrim","mavg","max","maxs","mcount","md5","mdev","med","meta","min","mins","mmax","mmin","mmu","mod","msum","neg","next","not","null","or","over","parse","peach","pj","plist","prd","prds","prev","prior","rand","rank","ratios","raze","read0","read1","reciprocal","reverse","rload","rotate","rsave","rtrim","save","scan","select","set","setenv","show","signum","sin","sqrt","ss","ssr","string","sublist","sum","sums","sv","system","tables","tan","til","trim","txf","type","uj","ungroup","union","update","upper","upsert","value","var","view","views","vs","wavg","where","where","while","within","wj","wj1","wsum","xasc","xbar","xcol","xcols","xdesc","xexp","xgroup","xkey","xlog","xprev","xrank"]), - E=/[|/&^!+:\\\-*%$=~#;@><,?_\'\"\[\(\]\)\s{}]/; - function buildRE(w){return new RegExp("^("+w.join("|")+")$");} - function tokenBase(stream,state){ - var sol=stream.sol(),c=stream.next(); - curPunc=null; - if(sol) - if(c=="/") - return(state.tokenize=tokenLineComment)(stream,state); - else if(c=="\\"){ - if(stream.eol()||/\s/.test(stream.peek())) - return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream, state):state.tokenize=tokenBase,"comment"; - else - return state.tokenize=tokenBase,"builtin"; - } - if(/\s/.test(c)) - return stream.peek()=="/"?(stream.skipToEnd(),"comment"):"whitespace"; - if(c=='"') - return(state.tokenize=tokenString)(stream,state); - if(c=='`') - return stream.eatWhile(/[A-Z|a-z|\d|_|:|\/|\.]/),"symbol"; - if(("."==c&&/\d/.test(stream.peek()))||/\d/.test(c)){ - var t=null; - stream.backUp(1); - if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([D|T](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/) - || stream.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/) - || stream.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/) - || stream.match(/^\d+[ptuv]{1}/)) - t="temporal"; - else if(stream.match(/^0[NwW]{1}/) - || stream.match(/^0x[\d|a-f|A-F]*/) - || stream.match(/^[0|1]+[b]{1}/) - || stream.match(/^\d+[chijn]{1}/) - || stream.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/)) - t="number"; - return(t&&(!(c=stream.peek())||E.test(c)))?t:(stream.next(),"error"); - } - if(/[A-Z|a-z]|\./.test(c)) - return stream.eatWhile(/[A-Z|a-z|\.|_|\d]/),keywords.test(stream.current())?"keyword":"variable"; - if(/[|/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(c)) - return null; - if(/[{}\(\[\]\)]/.test(c)) - return null; - return"error"; - } - function tokenLineComment(stream,state){ - return stream.skipToEnd(),/\/\s*$/.test(stream.current())?(state.tokenize=tokenBlockComment)(stream,state):(state.tokenize=tokenBase),"comment"; - } - function tokenBlockComment(stream,state){ - var f=stream.sol()&&stream.peek()=="\\"; - stream.skipToEnd(); - if(f&&/^\\\s*$/.test(stream.current())) - state.tokenize=tokenBase; - return"comment"; - } - function tokenCommentToEOF(stream){return stream.skipToEnd(),"comment";} - function tokenString(stream,state){ - var escaped=false,next,end=false; - while((next=stream.next())){ - if(next=="\""&&!escaped){end=true;break;} - escaped=!escaped&&next=="\\"; - } - if(end)state.tokenize=tokenBase; - return"string"; - } - function pushContext(state,type,col){state.context={prev:state.context,indent:state.indent,col:col,type:type};} - function popContext(state){state.indent=state.context.indent;state.context=state.context.prev;} - return{ - startState:function(){ - return{tokenize:tokenBase, - context:null, - indent:0, - col:0}; - }, - token:function(stream,state){ - if(stream.sol()){ - if(state.context&&state.context.align==null) - state.context.align=false; - state.indent=stream.indentation(); - } - //if (stream.eatSpace()) return null; - var style=state.tokenize(stream,state); - if(style!="comment"&&state.context&&state.context.align==null&&state.context.type!="pattern"){ - state.context.align=true; - } - if(curPunc=="(")pushContext(state,")",stream.column()); - else if(curPunc=="[")pushContext(state,"]",stream.column()); - else if(curPunc=="{")pushContext(state,"}",stream.column()); - else if(/[\]\}\)]/.test(curPunc)){ - while(state.context&&state.context.type=="pattern")popContext(state); - if(state.context&&curPunc==state.context.type)popContext(state); - } - else if(curPunc=="."&&state.context&&state.context.type=="pattern")popContext(state); - else if(/atom|string|variable/.test(style)&&state.context){ - if(/[\}\]]/.test(state.context.type)) - pushContext(state,"pattern",stream.column()); - else if(state.context.type=="pattern"&&!state.context.align){ - state.context.align=true; - state.context.col=stream.column(); - } - } - return style; - }, - indent:function(state,textAfter){ - var firstChar=textAfter&&textAfter.charAt(0); - var context=state.context; - if(/[\]\}]/.test(firstChar)) - while (context&&context.type=="pattern")context=context.prev; - var closing=context&&firstChar==context.type; - if(!context) - return 0; - else if(context.type=="pattern") - return context.col; - else if(context.align) - return context.col+(closing?0:1); - else - return context.indent+(closing?0:indentUnit); - } - }; -}); -CodeMirror.defineMIME("text/x-q","q"); - -}); diff --git a/kallithea/public/codemirror/mode/r/r.js b/kallithea/public/codemirror/mode/r/r.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/r/r.js +++ /dev/null @@ -1,162 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("r", function(config) { - function wordObj(str) { - var words = str.split(" "), res = {}; - for (var i = 0; i < words.length; ++i) res[words[i]] = true; - return res; - } - var atoms = wordObj("NULL NA Inf NaN NA_integer_ NA_real_ NA_complex_ NA_character_"); - var builtins = wordObj("list quote bquote eval return call parse deparse"); - var keywords = wordObj("if else repeat while function for in next break"); - var blockkeywords = wordObj("if else repeat while function for"); - var opChars = /[+\-*\/^<>=!&|~$:]/; - var curPunc; - - function tokenBase(stream, state) { - curPunc = null; - var ch = stream.next(); - if (ch == "#") { - stream.skipToEnd(); - return "comment"; - } else if (ch == "0" && stream.eat("x")) { - stream.eatWhile(/[\da-f]/i); - return "number"; - } else if (ch == "." && stream.eat(/\d/)) { - stream.match(/\d*(?:e[+\-]?\d+)?/); - return "number"; - } else if (/\d/.test(ch)) { - stream.match(/\d*(?:\.\d+)?(?:e[+\-]\d+)?L?/); - return "number"; - } else if (ch == "'" || ch == '"') { - state.tokenize = tokenString(ch); - return "string"; - } else if (ch == "." && stream.match(/.[.\d]+/)) { - return "keyword"; - } else if (/[\w\.]/.test(ch) && ch != "_") { - stream.eatWhile(/[\w\.]/); - var word = stream.current(); - if (atoms.propertyIsEnumerable(word)) return "atom"; - if (keywords.propertyIsEnumerable(word)) { - // Block keywords start new blocks, except 'else if', which only starts - // one new block for the 'if', no block for the 'else'. - if (blockkeywords.propertyIsEnumerable(word) && - !stream.match(/\s*if(\s+|$)/, false)) - curPunc = "block"; - return "keyword"; - } - if (builtins.propertyIsEnumerable(word)) return "builtin"; - return "variable"; - } else if (ch == "%") { - if (stream.skipTo("%")) stream.next(); - return "variable-2"; - } else if (ch == "<" && stream.eat("-")) { - return "arrow"; - } else if (ch == "=" && state.ctx.argList) { - return "arg-is"; - } else if (opChars.test(ch)) { - if (ch == "$") return "dollar"; - stream.eatWhile(opChars); - return "operator"; - } else if (/[\(\){}\[\];]/.test(ch)) { - curPunc = ch; - if (ch == ";") return "semi"; - return null; - } else { - return null; - } - } - - function tokenString(quote) { - return function(stream, state) { - if (stream.eat("\\")) { - var ch = stream.next(); - if (ch == "x") stream.match(/^[a-f0-9]{2}/i); - else if ((ch == "u" || ch == "U") && stream.eat("{") && stream.skipTo("}")) stream.next(); - else if (ch == "u") stream.match(/^[a-f0-9]{4}/i); - else if (ch == "U") stream.match(/^[a-f0-9]{8}/i); - else if (/[0-7]/.test(ch)) stream.match(/^[0-7]{1,2}/); - return "string-2"; - } else { - var next; - while ((next = stream.next()) != null) { - if (next == quote) { state.tokenize = tokenBase; break; } - if (next == "\\") { stream.backUp(1); break; } - } - return "string"; - } - }; - } - - function push(state, type, stream) { - state.ctx = {type: type, - indent: state.indent, - align: null, - column: stream.column(), - prev: state.ctx}; - } - function pop(state) { - state.indent = state.ctx.indent; - state.ctx = state.ctx.prev; - } - - return { - startState: function() { - return {tokenize: tokenBase, - ctx: {type: "top", - indent: -config.indentUnit, - align: false}, - indent: 0, - afterIdent: false}; - }, - - token: function(stream, state) { - if (stream.sol()) { - if (state.ctx.align == null) state.ctx.align = false; - state.indent = stream.indentation(); - } - if (stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - if (style != "comment" && state.ctx.align == null) state.ctx.align = true; - - var ctype = state.ctx.type; - if ((curPunc == ";" || curPunc == "{" || curPunc == "}") && ctype == "block") pop(state); - if (curPunc == "{") push(state, "}", stream); - else if (curPunc == "(") { - push(state, ")", stream); - if (state.afterIdent) state.ctx.argList = true; - } - else if (curPunc == "[") push(state, "]", stream); - else if (curPunc == "block") push(state, "block", stream); - else if (curPunc == ctype) pop(state); - state.afterIdent = style == "variable" || style == "keyword"; - return style; - }, - - indent: function(state, textAfter) { - if (state.tokenize != tokenBase) return 0; - var firstChar = textAfter && textAfter.charAt(0), ctx = state.ctx, - closing = firstChar == ctx.type; - if (ctx.type == "block") return ctx.indent + (firstChar == "{" ? 0 : config.indentUnit); - else if (ctx.align) return ctx.column + (closing ? 0 : 1); - else return ctx.indent + (closing ? 0 : config.indentUnit); - }, - - lineComment: "#" - }; -}); - -CodeMirror.defineMIME("text/x-rsrc", "r"); - -}); diff --git a/kallithea/public/codemirror/mode/rpm/rpm.js b/kallithea/public/codemirror/mode/rpm/rpm.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/rpm/rpm.js +++ /dev/null @@ -1,101 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("rpm-changes", function() { - var headerSeperator = /^-+$/; - var headerLine = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) ?\d{1,2} \d{2}:\d{2}(:\d{2})? [A-Z]{3,4} \d{4} - /; - var simpleEmail = /^[\w+.-]+@[\w.-]+/; - - return { - token: function(stream) { - if (stream.sol()) { - if (stream.match(headerSeperator)) { return 'tag'; } - if (stream.match(headerLine)) { return 'tag'; } - } - if (stream.match(simpleEmail)) { return 'string'; } - stream.next(); - return null; - } - }; -}); - -CodeMirror.defineMIME("text/x-rpm-changes", "rpm-changes"); - -// Quick and dirty spec file highlighting - -CodeMirror.defineMode("rpm-spec", function() { - var arch = /^(i386|i586|i686|x86_64|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/; - - var preamble = /^(Name|Version|Release|License|Summary|Url|Group|Source|BuildArch|BuildRequires|BuildRoot|AutoReqProv|Provides|Requires(\(\w+\))?|Obsoletes|Conflicts|Recommends|Source\d*|Patch\d*|ExclusiveArch|NoSource|Supplements):/; - var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pre|post|triggerin|triggerun|pretrans|posttrans|verifyscript|check|triggerpostun|triggerprein|trigger)/; - var control_flow_complex = /^%(ifnarch|ifarch|if)/; // rpm control flow macros - var control_flow_simple = /^%(else|endif)/; // rpm control flow macros - var operators = /^(\!|\?|\<\=|\<|\>\=|\>|\=\=|\&\&|\|\|)/; // operators in control flow macros - - return { - startState: function () { - return { - controlFlow: false, - macroParameters: false, - section: false - }; - }, - token: function (stream, state) { - var ch = stream.peek(); - if (ch == "#") { stream.skipToEnd(); return "comment"; } - - if (stream.sol()) { - if (stream.match(preamble)) { return "preamble"; } - if (stream.match(section)) { return "section"; } - } - - if (stream.match(/^\$\w+/)) { return "def"; } // Variables like '$RPM_BUILD_ROOT' - if (stream.match(/^\$\{\w+\}/)) { return "def"; } // Variables like '${RPM_BUILD_ROOT}' - - if (stream.match(control_flow_simple)) { return "keyword"; } - if (stream.match(control_flow_complex)) { - state.controlFlow = true; - return "keyword"; - } - if (state.controlFlow) { - if (stream.match(operators)) { return "operator"; } - if (stream.match(/^(\d+)/)) { return "number"; } - if (stream.eol()) { state.controlFlow = false; } - } - - if (stream.match(arch)) { return "number"; } - - // Macros like '%make_install' or '%attr(0775,root,root)' - if (stream.match(/^%[\w]+/)) { - if (stream.match(/^\(/)) { state.macroParameters = true; } - return "macro"; - } - if (state.macroParameters) { - if (stream.match(/^\d+/)) { return "number";} - if (stream.match(/^\)/)) { - state.macroParameters = false; - return "macro"; - } - } - if (stream.match(/^%\{\??[\w \-]+\}/)) { return "macro"; } // Macros like '%{defined fedora}' - - //TODO: Include bash script sub-parser (CodeMirror supports that) - stream.next(); - return null; - } - }; -}); - -CodeMirror.defineMIME("text/x-rpm-spec", "rpm-spec"); - -}); diff --git a/kallithea/public/codemirror/mode/rst/rst.js b/kallithea/public/codemirror/mode/rst/rst.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/rst/rst.js +++ /dev/null @@ -1,557 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../python/python"), require("../stex/stex"), require("../../addon/mode/overlay")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../python/python", "../stex/stex", "../../addon/mode/overlay"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode('rst', function (config, options) { - - var rx_strong = /^\*\*[^\*\s](?:[^\*]*[^\*\s])?\*\*/; - var rx_emphasis = /^\*[^\*\s](?:[^\*]*[^\*\s])?\*/; - var rx_literal = /^``[^`\s](?:[^`]*[^`\s])``/; - - var rx_number = /^(?:[\d]+(?:[\.,]\d+)*)/; - var rx_positive = /^(?:\s\+[\d]+(?:[\.,]\d+)*)/; - var rx_negative = /^(?:\s\-[\d]+(?:[\.,]\d+)*)/; - - var rx_uri_protocol = "[Hh][Tt][Tt][Pp][Ss]?://"; - var rx_uri_domain = "(?:[\\d\\w.-]+)\\.(?:\\w{2,6})"; - var rx_uri_path = "(?:/[\\d\\w\\#\\%\\&\\-\\.\\,\\/\\:\\=\\?\\~]+)*"; - var rx_uri = new RegExp("^" + rx_uri_protocol + rx_uri_domain + rx_uri_path); - - var overlay = { - token: function (stream) { - - if (stream.match(rx_strong) && stream.match (/\W+|$/, false)) - return 'strong'; - if (stream.match(rx_emphasis) && stream.match (/\W+|$/, false)) - return 'em'; - if (stream.match(rx_literal) && stream.match (/\W+|$/, false)) - return 'string-2'; - if (stream.match(rx_number)) - return 'number'; - if (stream.match(rx_positive)) - return 'positive'; - if (stream.match(rx_negative)) - return 'negative'; - if (stream.match(rx_uri)) - return 'link'; - - while (stream.next() != null) { - if (stream.match(rx_strong, false)) break; - if (stream.match(rx_emphasis, false)) break; - if (stream.match(rx_literal, false)) break; - if (stream.match(rx_number, false)) break; - if (stream.match(rx_positive, false)) break; - if (stream.match(rx_negative, false)) break; - if (stream.match(rx_uri, false)) break; - } - - return null; - } - }; - - var mode = CodeMirror.getMode( - config, options.backdrop || 'rst-base' - ); - - return CodeMirror.overlayMode(mode, overlay, true); // combine -}, 'python', 'stex'); - -/////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// - -CodeMirror.defineMode('rst-base', function (config) { - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - function format(string) { - var args = Array.prototype.slice.call(arguments, 1); - return string.replace(/{(\d+)}/g, function (match, n) { - return typeof args[n] != 'undefined' ? args[n] : match; - }); - } - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - var mode_python = CodeMirror.getMode(config, 'python'); - var mode_stex = CodeMirror.getMode(config, 'stex'); - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - var SEPA = "\\s+"; - var TAIL = "(?:\\s*|\\W|$)", - rx_TAIL = new RegExp(format('^{0}', TAIL)); - - var NAME = - "(?:[^\\W\\d_](?:[\\w!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)", - rx_NAME = new RegExp(format('^{0}', NAME)); - var NAME_WWS = - "(?:[^\\W\\d_](?:[\\w\\s!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)"; - var REF_NAME = format('(?:{0}|`{1}`)', NAME, NAME_WWS); - - var TEXT1 = "(?:[^\\s\\|](?:[^\\|]*[^\\s\\|])?)"; - var TEXT2 = "(?:[^\\`]+)", - rx_TEXT2 = new RegExp(format('^{0}', TEXT2)); - - var rx_section = new RegExp( - "^([!'#$%&\"()*+,-./:;<=>?@\\[\\\\\\]^_`{|}~])\\1{3,}\\s*$"); - var rx_explicit = new RegExp( - format('^\\.\\.{0}', SEPA)); - var rx_link = new RegExp( - format('^_{0}:{1}|^__:{1}', REF_NAME, TAIL)); - var rx_directive = new RegExp( - format('^{0}::{1}', REF_NAME, TAIL)); - var rx_substitution = new RegExp( - format('^\\|{0}\\|{1}{2}::{3}', TEXT1, SEPA, REF_NAME, TAIL)); - var rx_footnote = new RegExp( - format('^\\[(?:\\d+|#{0}?|\\*)]{1}', REF_NAME, TAIL)); - var rx_citation = new RegExp( - format('^\\[{0}\\]{1}', REF_NAME, TAIL)); - - var rx_substitution_ref = new RegExp( - format('^\\|{0}\\|', TEXT1)); - var rx_footnote_ref = new RegExp( - format('^\\[(?:\\d+|#{0}?|\\*)]_', REF_NAME)); - var rx_citation_ref = new RegExp( - format('^\\[{0}\\]_', REF_NAME)); - var rx_link_ref1 = new RegExp( - format('^{0}__?', REF_NAME)); - var rx_link_ref2 = new RegExp( - format('^`{0}`_', TEXT2)); - - var rx_role_pre = new RegExp( - format('^:{0}:`{1}`{2}', NAME, TEXT2, TAIL)); - var rx_role_suf = new RegExp( - format('^`{1}`:{0}:{2}', NAME, TEXT2, TAIL)); - var rx_role = new RegExp( - format('^:{0}:{1}', NAME, TAIL)); - - var rx_directive_name = new RegExp(format('^{0}', REF_NAME)); - var rx_directive_tail = new RegExp(format('^::{0}', TAIL)); - var rx_substitution_text = new RegExp(format('^\\|{0}\\|', TEXT1)); - var rx_substitution_sepa = new RegExp(format('^{0}', SEPA)); - var rx_substitution_name = new RegExp(format('^{0}', REF_NAME)); - var rx_substitution_tail = new RegExp(format('^::{0}', TAIL)); - var rx_link_head = new RegExp("^_"); - var rx_link_name = new RegExp(format('^{0}|_', REF_NAME)); - var rx_link_tail = new RegExp(format('^:{0}', TAIL)); - - var rx_verbatim = new RegExp('^::\\s*$'); - var rx_examples = new RegExp('^\\s+(?:>>>|In \\[\\d+\\]:)\\s'); - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - function to_normal(stream, state) { - var token = null; - - if (stream.sol() && stream.match(rx_examples, false)) { - change(state, to_mode, { - mode: mode_python, local: CodeMirror.startState(mode_python) - }); - } else if (stream.sol() && stream.match(rx_explicit)) { - change(state, to_explicit); - token = 'meta'; - } else if (stream.sol() && stream.match(rx_section)) { - change(state, to_normal); - token = 'header'; - } else if (phase(state) == rx_role_pre || - stream.match(rx_role_pre, false)) { - - switch (stage(state)) { - case 0: - change(state, to_normal, context(rx_role_pre, 1)); - stream.match(/^:/); - token = 'meta'; - break; - case 1: - change(state, to_normal, context(rx_role_pre, 2)); - stream.match(rx_NAME); - token = 'keyword'; - - if (stream.current().match(/^(?:math|latex)/)) { - state.tmp_stex = true; - } - break; - case 2: - change(state, to_normal, context(rx_role_pre, 3)); - stream.match(/^:`/); - token = 'meta'; - break; - case 3: - if (state.tmp_stex) { - state.tmp_stex = undefined; state.tmp = { - mode: mode_stex, local: CodeMirror.startState(mode_stex) - }; - } - - if (state.tmp) { - if (stream.peek() == '`') { - change(state, to_normal, context(rx_role_pre, 4)); - state.tmp = undefined; - break; - } - - token = state.tmp.mode.token(stream, state.tmp.local); - break; - } - - change(state, to_normal, context(rx_role_pre, 4)); - stream.match(rx_TEXT2); - token = 'string'; - break; - case 4: - change(state, to_normal, context(rx_role_pre, 5)); - stream.match(/^`/); - token = 'meta'; - break; - case 5: - change(state, to_normal, context(rx_role_pre, 6)); - stream.match(rx_TAIL); - break; - default: - change(state, to_normal); - } - } else if (phase(state) == rx_role_suf || - stream.match(rx_role_suf, false)) { - - switch (stage(state)) { - case 0: - change(state, to_normal, context(rx_role_suf, 1)); - stream.match(/^`/); - token = 'meta'; - break; - case 1: - change(state, to_normal, context(rx_role_suf, 2)); - stream.match(rx_TEXT2); - token = 'string'; - break; - case 2: - change(state, to_normal, context(rx_role_suf, 3)); - stream.match(/^`:/); - token = 'meta'; - break; - case 3: - change(state, to_normal, context(rx_role_suf, 4)); - stream.match(rx_NAME); - token = 'keyword'; - break; - case 4: - change(state, to_normal, context(rx_role_suf, 5)); - stream.match(/^:/); - token = 'meta'; - break; - case 5: - change(state, to_normal, context(rx_role_suf, 6)); - stream.match(rx_TAIL); - break; - default: - change(state, to_normal); - } - } else if (phase(state) == rx_role || stream.match(rx_role, false)) { - - switch (stage(state)) { - case 0: - change(state, to_normal, context(rx_role, 1)); - stream.match(/^:/); - token = 'meta'; - break; - case 1: - change(state, to_normal, context(rx_role, 2)); - stream.match(rx_NAME); - token = 'keyword'; - break; - case 2: - change(state, to_normal, context(rx_role, 3)); - stream.match(/^:/); - token = 'meta'; - break; - case 3: - change(state, to_normal, context(rx_role, 4)); - stream.match(rx_TAIL); - break; - default: - change(state, to_normal); - } - } else if (phase(state) == rx_substitution_ref || - stream.match(rx_substitution_ref, false)) { - - switch (stage(state)) { - case 0: - change(state, to_normal, context(rx_substitution_ref, 1)); - stream.match(rx_substitution_text); - token = 'variable-2'; - break; - case 1: - change(state, to_normal, context(rx_substitution_ref, 2)); - if (stream.match(/^_?_?/)) token = 'link'; - break; - default: - change(state, to_normal); - } - } else if (stream.match(rx_footnote_ref)) { - change(state, to_normal); - token = 'quote'; - } else if (stream.match(rx_citation_ref)) { - change(state, to_normal); - token = 'quote'; - } else if (stream.match(rx_link_ref1)) { - change(state, to_normal); - if (!stream.peek() || stream.peek().match(/^\W$/)) { - token = 'link'; - } - } else if (phase(state) == rx_link_ref2 || - stream.match(rx_link_ref2, false)) { - - switch (stage(state)) { - case 0: - if (!stream.peek() || stream.peek().match(/^\W$/)) { - change(state, to_normal, context(rx_link_ref2, 1)); - } else { - stream.match(rx_link_ref2); - } - break; - case 1: - change(state, to_normal, context(rx_link_ref2, 2)); - stream.match(/^`/); - token = 'link'; - break; - case 2: - change(state, to_normal, context(rx_link_ref2, 3)); - stream.match(rx_TEXT2); - break; - case 3: - change(state, to_normal, context(rx_link_ref2, 4)); - stream.match(/^`_/); - token = 'link'; - break; - default: - change(state, to_normal); - } - } else if (stream.match(rx_verbatim)) { - change(state, to_verbatim); - } - - else { - if (stream.next()) change(state, to_normal); - } - - return token; - } - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - function to_explicit(stream, state) { - var token = null; - - if (phase(state) == rx_substitution || - stream.match(rx_substitution, false)) { - - switch (stage(state)) { - case 0: - change(state, to_explicit, context(rx_substitution, 1)); - stream.match(rx_substitution_text); - token = 'variable-2'; - break; - case 1: - change(state, to_explicit, context(rx_substitution, 2)); - stream.match(rx_substitution_sepa); - break; - case 2: - change(state, to_explicit, context(rx_substitution, 3)); - stream.match(rx_substitution_name); - token = 'keyword'; - break; - case 3: - change(state, to_explicit, context(rx_substitution, 4)); - stream.match(rx_substitution_tail); - token = 'meta'; - break; - default: - change(state, to_normal); - } - } else if (phase(state) == rx_directive || - stream.match(rx_directive, false)) { - - switch (stage(state)) { - case 0: - change(state, to_explicit, context(rx_directive, 1)); - stream.match(rx_directive_name); - token = 'keyword'; - - if (stream.current().match(/^(?:math|latex)/)) - state.tmp_stex = true; - else if (stream.current().match(/^python/)) - state.tmp_py = true; - break; - case 1: - change(state, to_explicit, context(rx_directive, 2)); - stream.match(rx_directive_tail); - token = 'meta'; - - if (stream.match(/^latex\s*$/) || state.tmp_stex) { - state.tmp_stex = undefined; change(state, to_mode, { - mode: mode_stex, local: CodeMirror.startState(mode_stex) - }); - } - break; - case 2: - change(state, to_explicit, context(rx_directive, 3)); - if (stream.match(/^python\s*$/) || state.tmp_py) { - state.tmp_py = undefined; change(state, to_mode, { - mode: mode_python, local: CodeMirror.startState(mode_python) - }); - } - break; - default: - change(state, to_normal); - } - } else if (phase(state) == rx_link || stream.match(rx_link, false)) { - - switch (stage(state)) { - case 0: - change(state, to_explicit, context(rx_link, 1)); - stream.match(rx_link_head); - stream.match(rx_link_name); - token = 'link'; - break; - case 1: - change(state, to_explicit, context(rx_link, 2)); - stream.match(rx_link_tail); - token = 'meta'; - break; - default: - change(state, to_normal); - } - } else if (stream.match(rx_footnote)) { - change(state, to_normal); - token = 'quote'; - } else if (stream.match(rx_citation)) { - change(state, to_normal); - token = 'quote'; - } - - else { - stream.eatSpace(); - if (stream.eol()) { - change(state, to_normal); - } else { - stream.skipToEnd(); - change(state, to_comment); - token = 'comment'; - } - } - - return token; - } - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - function to_comment(stream, state) { - return as_block(stream, state, 'comment'); - } - - function to_verbatim(stream, state) { - return as_block(stream, state, 'meta'); - } - - function as_block(stream, state, token) { - if (stream.eol() || stream.eatSpace()) { - stream.skipToEnd(); - return token; - } else { - change(state, to_normal); - return null; - } - } - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - function to_mode(stream, state) { - - if (state.ctx.mode && state.ctx.local) { - - if (stream.sol()) { - if (!stream.eatSpace()) change(state, to_normal); - return null; - } - - return state.ctx.mode.token(stream, state.ctx.local); - } - - change(state, to_normal); - return null; - } - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - function context(phase, stage, mode, local) { - return {phase: phase, stage: stage, mode: mode, local: local}; - } - - function change(state, tok, ctx) { - state.tok = tok; - state.ctx = ctx || {}; - } - - function stage(state) { - return state.ctx.stage || 0; - } - - function phase(state) { - return state.ctx.phase; - } - - /////////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////////// - - return { - startState: function () { - return {tok: to_normal, ctx: context(undefined, 0)}; - }, - - copyState: function (state) { - var ctx = state.ctx, tmp = state.tmp; - if (ctx.local) - ctx = {mode: ctx.mode, local: CodeMirror.copyState(ctx.mode, ctx.local)}; - if (tmp) - tmp = {mode: tmp.mode, local: CodeMirror.copyState(tmp.mode, tmp.local)}; - return {tok: state.tok, ctx: ctx, tmp: tmp}; - }, - - innerMode: function (state) { - return state.tmp ? {state: state.tmp.local, mode: state.tmp.mode} - : state.ctx.mode ? {state: state.ctx.local, mode: state.ctx.mode} - : null; - }, - - token: function (stream, state) { - return state.tok(stream, state); - } - }; -}, 'python', 'stex'); - -/////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// - -CodeMirror.defineMIME('text/x-rst', 'rst'); - -/////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////// - -}); diff --git a/kallithea/public/codemirror/mode/ruby/ruby.js b/kallithea/public/codemirror/mode/ruby/ruby.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/ruby/ruby.js +++ /dev/null @@ -1,285 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("ruby", function(config) { - function wordObj(words) { - var o = {}; - for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true; - return o; - } - var keywords = wordObj([ - "alias", "and", "BEGIN", "begin", "break", "case", "class", "def", "defined?", "do", "else", - "elsif", "END", "end", "ensure", "false", "for", "if", "in", "module", "next", "not", "or", - "redo", "rescue", "retry", "return", "self", "super", "then", "true", "undef", "unless", - "until", "when", "while", "yield", "nil", "raise", "throw", "catch", "fail", "loop", "callcc", - "caller", "lambda", "proc", "public", "protected", "private", "require", "load", - "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__" - ]); - var indentWords = wordObj(["def", "class", "case", "for", "while", "module", "then", - "catch", "loop", "proc", "begin"]); - var dedentWords = wordObj(["end", "until"]); - var matching = {"[": "]", "{": "}", "(": ")"}; - var curPunc; - - function chain(newtok, stream, state) { - state.tokenize.push(newtok); - return newtok(stream, state); - } - - function tokenBase(stream, state) { - curPunc = null; - if (stream.sol() && stream.match("=begin") && stream.eol()) { - state.tokenize.push(readBlockComment); - return "comment"; - } - if (stream.eatSpace()) return null; - var ch = stream.next(), m; - if (ch == "`" || ch == "'" || ch == '"') { - return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state); - } else if (ch == "/") { - var currentIndex = stream.current().length; - if (stream.skipTo("/")) { - var search_till = stream.current().length; - stream.backUp(stream.current().length - currentIndex); - var balance = 0; // balance brackets - while (stream.current().length < search_till) { - var chchr = stream.next(); - if (chchr == "(") balance += 1; - else if (chchr == ")") balance -= 1; - if (balance < 0) break; - } - stream.backUp(stream.current().length - currentIndex); - if (balance == 0) - return chain(readQuoted(ch, "string-2", true), stream, state); - } - return "operator"; - } else if (ch == "%") { - var style = "string", embed = true; - if (stream.eat("s")) style = "atom"; - else if (stream.eat(/[WQ]/)) style = "string"; - else if (stream.eat(/[r]/)) style = "string-2"; - else if (stream.eat(/[wxq]/)) { style = "string"; embed = false; } - var delim = stream.eat(/[^\w\s=]/); - if (!delim) return "operator"; - if (matching.propertyIsEnumerable(delim)) delim = matching[delim]; - return chain(readQuoted(delim, style, embed, true), stream, state); - } else if (ch == "#") { - stream.skipToEnd(); - return "comment"; - } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) { - return chain(readHereDoc(m[1]), stream, state); - } else if (ch == "0") { - if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/); - else if (stream.eat("b")) stream.eatWhile(/[01]/); - else stream.eatWhile(/[0-7]/); - return "number"; - } else if (/\d/.test(ch)) { - stream.match(/^[\d_]*(?:\.[\d_]+)?(?:[eE][+\-]?[\d_]+)?/); - return "number"; - } else if (ch == "?") { - while (stream.match(/^\\[CM]-/)) {} - if (stream.eat("\\")) stream.eatWhile(/\w/); - else stream.next(); - return "string"; - } else if (ch == ":") { - if (stream.eat("'")) return chain(readQuoted("'", "atom", false), stream, state); - if (stream.eat('"')) return chain(readQuoted('"', "atom", true), stream, state); - - // :> :>> :< :<< are valid symbols - if (stream.eat(/[\<\>]/)) { - stream.eat(/[\<\>]/); - return "atom"; - } - - // :+ :- :/ :* :| :& :! are valid symbols - if (stream.eat(/[\+\-\*\/\&\|\:\!]/)) { - return "atom"; - } - - // Symbols can't start by a digit - if (stream.eat(/[a-zA-Z$@_\xa1-\uffff]/)) { - stream.eatWhile(/[\w$\xa1-\uffff]/); - // Only one ? ! = is allowed and only as the last character - stream.eat(/[\?\!\=]/); - return "atom"; - } - return "operator"; - } else if (ch == "@" && stream.match(/^@?[a-zA-Z_\xa1-\uffff]/)) { - stream.eat("@"); - stream.eatWhile(/[\w\xa1-\uffff]/); - return "variable-2"; - } else if (ch == "$") { - if (stream.eat(/[a-zA-Z_]/)) { - stream.eatWhile(/[\w]/); - } else if (stream.eat(/\d/)) { - stream.eat(/\d/); - } else { - stream.next(); // Must be a special global like $: or $! - } - return "variable-3"; - } else if (/[a-zA-Z_\xa1-\uffff]/.test(ch)) { - stream.eatWhile(/[\w\xa1-\uffff]/); - stream.eat(/[\?\!]/); - if (stream.eat(":")) return "atom"; - return "ident"; - } else if (ch == "|" && (state.varList || state.lastTok == "{" || state.lastTok == "do")) { - curPunc = "|"; - return null; - } else if (/[\(\)\[\]{}\\;]/.test(ch)) { - curPunc = ch; - return null; - } else if (ch == "-" && stream.eat(">")) { - return "arrow"; - } else if (/[=+\-\/*:\.^%<>~|]/.test(ch)) { - var more = stream.eatWhile(/[=+\-\/*:\.^%<>~|]/); - if (ch == "." && !more) curPunc = "."; - return "operator"; - } else { - return null; - } - } - - function tokenBaseUntilBrace(depth) { - if (!depth) depth = 1; - return function(stream, state) { - if (stream.peek() == "}") { - if (depth == 1) { - state.tokenize.pop(); - return state.tokenize[state.tokenize.length-1](stream, state); - } else { - state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth - 1); - } - } else if (stream.peek() == "{") { - state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth + 1); - } - return tokenBase(stream, state); - }; - } - function tokenBaseOnce() { - var alreadyCalled = false; - return function(stream, state) { - if (alreadyCalled) { - state.tokenize.pop(); - return state.tokenize[state.tokenize.length-1](stream, state); - } - alreadyCalled = true; - return tokenBase(stream, state); - }; - } - function readQuoted(quote, style, embed, unescaped) { - return function(stream, state) { - var escaped = false, ch; - - if (state.context.type === 'read-quoted-paused') { - state.context = state.context.prev; - stream.eat("}"); - } - - while ((ch = stream.next()) != null) { - if (ch == quote && (unescaped || !escaped)) { - state.tokenize.pop(); - break; - } - if (embed && ch == "#" && !escaped) { - if (stream.eat("{")) { - if (quote == "}") { - state.context = {prev: state.context, type: 'read-quoted-paused'}; - } - state.tokenize.push(tokenBaseUntilBrace()); - break; - } else if (/[@\$]/.test(stream.peek())) { - state.tokenize.push(tokenBaseOnce()); - break; - } - } - escaped = !escaped && ch == "\\"; - } - return style; - }; - } - function readHereDoc(phrase) { - return function(stream, state) { - if (stream.match(phrase)) state.tokenize.pop(); - else stream.skipToEnd(); - return "string"; - }; - } - function readBlockComment(stream, state) { - if (stream.sol() && stream.match("=end") && stream.eol()) - state.tokenize.pop(); - stream.skipToEnd(); - return "comment"; - } - - return { - startState: function() { - return {tokenize: [tokenBase], - indented: 0, - context: {type: "top", indented: -config.indentUnit}, - continuedLine: false, - lastTok: null, - varList: false}; - }, - - token: function(stream, state) { - if (stream.sol()) state.indented = stream.indentation(); - var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype; - var thisTok = curPunc; - if (style == "ident") { - var word = stream.current(); - style = state.lastTok == "." ? "property" - : keywords.propertyIsEnumerable(stream.current()) ? "keyword" - : /^[A-Z]/.test(word) ? "tag" - : (state.lastTok == "def" || state.lastTok == "class" || state.varList) ? "def" - : "variable"; - if (style == "keyword") { - thisTok = word; - if (indentWords.propertyIsEnumerable(word)) kwtype = "indent"; - else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent"; - else if ((word == "if" || word == "unless") && stream.column() == stream.indentation()) - kwtype = "indent"; - else if (word == "do" && state.context.indented < state.indented) - kwtype = "indent"; - } - } - if (curPunc || (style && style != "comment")) state.lastTok = thisTok; - if (curPunc == "|") state.varList = !state.varList; - - if (kwtype == "indent" || /[\(\[\{]/.test(curPunc)) - state.context = {prev: state.context, type: curPunc || style, indented: state.indented}; - else if ((kwtype == "dedent" || /[\)\]\}]/.test(curPunc)) && state.context.prev) - state.context = state.context.prev; - - if (stream.eol()) - state.continuedLine = (curPunc == "\\" || style == "operator"); - return style; - }, - - indent: function(state, textAfter) { - if (state.tokenize[state.tokenize.length-1] != tokenBase) return 0; - var firstChar = textAfter && textAfter.charAt(0); - var ct = state.context; - var closing = ct.type == matching[firstChar] || - ct.type == "keyword" && /^(?:end|until|else|elsif|when|rescue)\b/.test(textAfter); - return ct.indented + (closing ? 0 : config.indentUnit) + - (state.continuedLine ? config.indentUnit : 0); - }, - - electricChars: "}de", // enD and rescuE - lineComment: "#" - }; -}); - -CodeMirror.defineMIME("text/x-ruby", "ruby"); - -}); diff --git a/kallithea/public/codemirror/mode/rust/rust.js b/kallithea/public/codemirror/mode/rust/rust.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/rust/rust.js +++ /dev/null @@ -1,451 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("rust", function() { - var indentUnit = 4, altIndentUnit = 2; - var valKeywords = { - "if": "if-style", "while": "if-style", "loop": "else-style", "else": "else-style", - "do": "else-style", "ret": "else-style", "fail": "else-style", - "break": "atom", "cont": "atom", "const": "let", "resource": "fn", - "let": "let", "fn": "fn", "for": "for", "alt": "alt", "iface": "iface", - "impl": "impl", "type": "type", "enum": "enum", "mod": "mod", - "as": "op", "true": "atom", "false": "atom", "assert": "op", "check": "op", - "claim": "op", "native": "ignore", "unsafe": "ignore", "import": "else-style", - "export": "else-style", "copy": "op", "log": "op", "log_err": "op", - "use": "op", "bind": "op", "self": "atom", "struct": "enum" - }; - var typeKeywords = function() { - var keywords = {"fn": "fn", "block": "fn", "obj": "obj"}; - var atoms = "bool uint int i8 i16 i32 i64 u8 u16 u32 u64 float f32 f64 str char".split(" "); - for (var i = 0, e = atoms.length; i < e; ++i) keywords[atoms[i]] = "atom"; - return keywords; - }(); - var operatorChar = /[+\-*&%=<>!?|\.@]/; - - // Tokenizer - - // Used as scratch variable to communicate multiple values without - // consing up tons of objects. - var tcat, content; - function r(tc, style) { - tcat = tc; - return style; - } - - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"') { - state.tokenize = tokenString; - return state.tokenize(stream, state); - } - if (ch == "'") { - tcat = "atom"; - if (stream.eat("\\")) { - if (stream.skipTo("'")) { stream.next(); return "string"; } - else { return "error"; } - } else { - stream.next(); - return stream.eat("'") ? "string" : "error"; - } - } - if (ch == "/") { - if (stream.eat("/")) { stream.skipToEnd(); return "comment"; } - if (stream.eat("*")) { - state.tokenize = tokenComment(1); - return state.tokenize(stream, state); - } - } - if (ch == "#") { - if (stream.eat("[")) { tcat = "open-attr"; return null; } - stream.eatWhile(/\w/); - return r("macro", "meta"); - } - if (ch == ":" && stream.match(":<")) { - return r("op", null); - } - if (ch.match(/\d/) || (ch == "." && stream.eat(/\d/))) { - var flp = false; - if (!stream.match(/^x[\da-f]+/i) && !stream.match(/^b[01]+/)) { - stream.eatWhile(/\d/); - if (stream.eat(".")) { flp = true; stream.eatWhile(/\d/); } - if (stream.match(/^e[+\-]?\d+/i)) { flp = true; } - } - if (flp) stream.match(/^f(?:32|64)/); - else stream.match(/^[ui](?:8|16|32|64)/); - return r("atom", "number"); - } - if (ch.match(/[()\[\]{}:;,]/)) return r(ch, null); - if (ch == "-" && stream.eat(">")) return r("->", null); - if (ch.match(operatorChar)) { - stream.eatWhile(operatorChar); - return r("op", null); - } - stream.eatWhile(/\w/); - content = stream.current(); - if (stream.match(/^::\w/)) { - stream.backUp(1); - return r("prefix", "variable-2"); - } - if (state.keywords.propertyIsEnumerable(content)) - return r(state.keywords[content], content.match(/true|false/) ? "atom" : "keyword"); - return r("name", "variable"); - } - - function tokenString(stream, state) { - var ch, escaped = false; - while (ch = stream.next()) { - if (ch == '"' && !escaped) { - state.tokenize = tokenBase; - return r("atom", "string"); - } - escaped = !escaped && ch == "\\"; - } - // Hack to not confuse the parser when a string is split in - // pieces. - return r("op", "string"); - } - - function tokenComment(depth) { - return function(stream, state) { - var lastCh = null, ch; - while (ch = stream.next()) { - if (ch == "/" && lastCh == "*") { - if (depth == 1) { - state.tokenize = tokenBase; - break; - } else { - state.tokenize = tokenComment(depth - 1); - return state.tokenize(stream, state); - } - } - if (ch == "*" && lastCh == "/") { - state.tokenize = tokenComment(depth + 1); - return state.tokenize(stream, state); - } - lastCh = ch; - } - return "comment"; - }; - } - - // Parser - - var cx = {state: null, stream: null, marked: null, cc: null}; - function pass() { - for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]); - } - function cont() { - pass.apply(null, arguments); - return true; - } - - function pushlex(type, info) { - var result = function() { - var state = cx.state; - state.lexical = {indented: state.indented, column: cx.stream.column(), - type: type, prev: state.lexical, info: info}; - }; - result.lex = true; - return result; - } - function poplex() { - var state = cx.state; - if (state.lexical.prev) { - if (state.lexical.type == ")") - state.indented = state.lexical.indented; - state.lexical = state.lexical.prev; - } - } - function typecx() { cx.state.keywords = typeKeywords; } - function valcx() { cx.state.keywords = valKeywords; } - poplex.lex = typecx.lex = valcx.lex = true; - - function commasep(comb, end) { - function more(type) { - if (type == ",") return cont(comb, more); - if (type == end) return cont(); - return cont(more); - } - return function(type) { - if (type == end) return cont(); - return pass(comb, more); - }; - } - - function stat_of(comb, tag) { - return cont(pushlex("stat", tag), comb, poplex, block); - } - function block(type) { - if (type == "}") return cont(); - if (type == "let") return stat_of(letdef1, "let"); - if (type == "fn") return stat_of(fndef); - if (type == "type") return cont(pushlex("stat"), tydef, endstatement, poplex, block); - if (type == "enum") return stat_of(enumdef); - if (type == "mod") return stat_of(mod); - if (type == "iface") return stat_of(iface); - if (type == "impl") return stat_of(impl); - if (type == "open-attr") return cont(pushlex("]"), commasep(expression, "]"), poplex); - if (type == "ignore" || type.match(/[\]\);,]/)) return cont(block); - return pass(pushlex("stat"), expression, poplex, endstatement, block); - } - function endstatement(type) { - if (type == ";") return cont(); - return pass(); - } - function expression(type) { - if (type == "atom" || type == "name") return cont(maybeop); - if (type == "{") return cont(pushlex("}"), exprbrace, poplex); - if (type.match(/[\[\(]/)) return matchBrackets(type, expression); - if (type.match(/[\]\)\};,]/)) return pass(); - if (type == "if-style") return cont(expression, expression); - if (type == "else-style" || type == "op") return cont(expression); - if (type == "for") return cont(pattern, maybetype, inop, expression, expression); - if (type == "alt") return cont(expression, altbody); - if (type == "fn") return cont(fndef); - if (type == "macro") return cont(macro); - return cont(); - } - function maybeop(type) { - if (content == ".") return cont(maybeprop); - if (content == "::<"){return cont(typarams, maybeop);} - if (type == "op" || content == ":") return cont(expression); - if (type == "(" || type == "[") return matchBrackets(type, expression); - return pass(); - } - function maybeprop() { - if (content.match(/^\w+$/)) {cx.marked = "variable"; return cont(maybeop);} - return pass(expression); - } - function exprbrace(type) { - if (type == "op") { - if (content == "|") return cont(blockvars, poplex, pushlex("}", "block"), block); - if (content == "||") return cont(poplex, pushlex("}", "block"), block); - } - if (content == "mutable" || (content.match(/^\w+$/) && cx.stream.peek() == ":" - && !cx.stream.match("::", false))) - return pass(record_of(expression)); - return pass(block); - } - function record_of(comb) { - function ro(type) { - if (content == "mutable" || content == "with") {cx.marked = "keyword"; return cont(ro);} - if (content.match(/^\w*$/)) {cx.marked = "variable"; return cont(ro);} - if (type == ":") return cont(comb, ro); - if (type == "}") return cont(); - return cont(ro); - } - return ro; - } - function blockvars(type) { - if (type == "name") {cx.marked = "def"; return cont(blockvars);} - if (type == "op" && content == "|") return cont(); - return cont(blockvars); - } - - function letdef1(type) { - if (type.match(/[\]\)\};]/)) return cont(); - if (content == "=") return cont(expression, letdef2); - if (type == ",") return cont(letdef1); - return pass(pattern, maybetype, letdef1); - } - function letdef2(type) { - if (type.match(/[\]\)\};,]/)) return pass(letdef1); - else return pass(expression, letdef2); - } - function maybetype(type) { - if (type == ":") return cont(typecx, rtype, valcx); - return pass(); - } - function inop(type) { - if (type == "name" && content == "in") {cx.marked = "keyword"; return cont();} - return pass(); - } - function fndef(type) { - if (content == "@" || content == "~") {cx.marked = "keyword"; return cont(fndef);} - if (type == "name") {cx.marked = "def"; return cont(fndef);} - if (content == "<") return cont(typarams, fndef); - if (type == "{") return pass(expression); - if (type == "(") return cont(pushlex(")"), commasep(argdef, ")"), poplex, fndef); - if (type == "->") return cont(typecx, rtype, valcx, fndef); - if (type == ";") return cont(); - return cont(fndef); - } - function tydef(type) { - if (type == "name") {cx.marked = "def"; return cont(tydef);} - if (content == "<") return cont(typarams, tydef); - if (content == "=") return cont(typecx, rtype, valcx); - return cont(tydef); - } - function enumdef(type) { - if (type == "name") {cx.marked = "def"; return cont(enumdef);} - if (content == "<") return cont(typarams, enumdef); - if (content == "=") return cont(typecx, rtype, valcx, endstatement); - if (type == "{") return cont(pushlex("}"), typecx, enumblock, valcx, poplex); - return cont(enumdef); - } - function enumblock(type) { - if (type == "}") return cont(); - if (type == "(") return cont(pushlex(")"), commasep(rtype, ")"), poplex, enumblock); - if (content.match(/^\w+$/)) cx.marked = "def"; - return cont(enumblock); - } - function mod(type) { - if (type == "name") {cx.marked = "def"; return cont(mod);} - if (type == "{") return cont(pushlex("}"), block, poplex); - return pass(); - } - function iface(type) { - if (type == "name") {cx.marked = "def"; return cont(iface);} - if (content == "<") return cont(typarams, iface); - if (type == "{") return cont(pushlex("}"), block, poplex); - return pass(); - } - function impl(type) { - if (content == "<") return cont(typarams, impl); - if (content == "of" || content == "for") {cx.marked = "keyword"; return cont(rtype, impl);} - if (type == "name") {cx.marked = "def"; return cont(impl);} - if (type == "{") return cont(pushlex("}"), block, poplex); - return pass(); - } - function typarams() { - if (content == ">") return cont(); - if (content == ",") return cont(typarams); - if (content == ":") return cont(rtype, typarams); - return pass(rtype, typarams); - } - function argdef(type) { - if (type == "name") {cx.marked = "def"; return cont(argdef);} - if (type == ":") return cont(typecx, rtype, valcx); - return pass(); - } - function rtype(type) { - if (type == "name") {cx.marked = "variable-3"; return cont(rtypemaybeparam); } - if (content == "mutable") {cx.marked = "keyword"; return cont(rtype);} - if (type == "atom") return cont(rtypemaybeparam); - if (type == "op" || type == "obj") return cont(rtype); - if (type == "fn") return cont(fntype); - if (type == "{") return cont(pushlex("{"), record_of(rtype), poplex); - return matchBrackets(type, rtype); - } - function rtypemaybeparam() { - if (content == "<") return cont(typarams); - return pass(); - } - function fntype(type) { - if (type == "(") return cont(pushlex("("), commasep(rtype, ")"), poplex, fntype); - if (type == "->") return cont(rtype); - return pass(); - } - function pattern(type) { - if (type == "name") {cx.marked = "def"; return cont(patternmaybeop);} - if (type == "atom") return cont(patternmaybeop); - if (type == "op") return cont(pattern); - if (type.match(/[\]\)\};,]/)) return pass(); - return matchBrackets(type, pattern); - } - function patternmaybeop(type) { - if (type == "op" && content == ".") return cont(); - if (content == "to") {cx.marked = "keyword"; return cont(pattern);} - else return pass(); - } - function altbody(type) { - if (type == "{") return cont(pushlex("}", "alt"), altblock1, poplex); - return pass(); - } - function altblock1(type) { - if (type == "}") return cont(); - if (type == "|") return cont(altblock1); - if (content == "when") {cx.marked = "keyword"; return cont(expression, altblock2);} - if (type.match(/[\]\);,]/)) return cont(altblock1); - return pass(pattern, altblock2); - } - function altblock2(type) { - if (type == "{") return cont(pushlex("}", "alt"), block, poplex, altblock1); - else return pass(altblock1); - } - - function macro(type) { - if (type.match(/[\[\(\{]/)) return matchBrackets(type, expression); - return pass(); - } - function matchBrackets(type, comb) { - if (type == "[") return cont(pushlex("]"), commasep(comb, "]"), poplex); - if (type == "(") return cont(pushlex(")"), commasep(comb, ")"), poplex); - if (type == "{") return cont(pushlex("}"), commasep(comb, "}"), poplex); - return cont(); - } - - function parse(state, stream, style) { - var cc = state.cc; - // Communicate our context to the combinators. - // (Less wasteful than consing up a hundred closures on every call.) - cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; - - while (true) { - var combinator = cc.length ? cc.pop() : block; - if (combinator(tcat)) { - while(cc.length && cc[cc.length - 1].lex) - cc.pop()(); - return cx.marked || style; - } - } - } - - return { - startState: function() { - return { - tokenize: tokenBase, - cc: [], - lexical: {indented: -indentUnit, column: 0, type: "top", align: false}, - keywords: valKeywords, - indented: 0 - }; - }, - - token: function(stream, state) { - if (stream.sol()) { - if (!state.lexical.hasOwnProperty("align")) - state.lexical.align = false; - state.indented = stream.indentation(); - } - if (stream.eatSpace()) return null; - tcat = content = null; - var style = state.tokenize(stream, state); - if (style == "comment") return style; - if (!state.lexical.hasOwnProperty("align")) - state.lexical.align = true; - if (tcat == "prefix") return style; - if (!content) content = stream.current(); - return parse(state, stream, style); - }, - - indent: function(state, textAfter) { - if (state.tokenize != tokenBase) return 0; - var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, - type = lexical.type, closing = firstChar == type; - if (type == "stat") return lexical.indented + indentUnit; - if (lexical.align) return lexical.column + (closing ? 0 : 1); - return lexical.indented + (closing ? 0 : (lexical.info == "alt" ? altIndentUnit : indentUnit)); - }, - - electricChars: "{}", - blockCommentStart: "/*", - blockCommentEnd: "*/", - lineComment: "//", - fold: "brace" - }; -}); - -CodeMirror.defineMIME("text/x-rustsrc", "rust"); - -}); diff --git a/kallithea/public/codemirror/mode/sass/sass.js b/kallithea/public/codemirror/mode/sass/sass.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/sass/sass.js +++ /dev/null @@ -1,327 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("sass", function(config) { - function tokenRegexp(words) { - return new RegExp("^" + words.join("|")); - } - - var keywords = ["true", "false", "null", "auto"]; - var keywordsRegexp = new RegExp("^" + keywords.join("|")); - - var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-", "\\!=", "/", "\\*", "%", "and", "or", "not"]; - var opRegexp = tokenRegexp(operators); - - var pseudoElementsRegexp = /^::?[\w\-]+/; - - function urlTokens(stream, state) { - var ch = stream.peek(); - - if (ch === ")") { - stream.next(); - state.tokenizer = tokenBase; - return "operator"; - } else if (ch === "(") { - stream.next(); - stream.eatSpace(); - - return "operator"; - } else if (ch === "'" || ch === '"') { - state.tokenizer = buildStringTokenizer(stream.next()); - return "string"; - } else { - state.tokenizer = buildStringTokenizer(")", false); - return "string"; - } - } - function comment(indentation, multiLine) { - return function(stream, state) { - if (stream.sol() && stream.indentation() <= indentation) { - state.tokenizer = tokenBase; - return tokenBase(stream, state); - } - - if (multiLine && stream.skipTo("*/")) { - stream.next(); - stream.next(); - state.tokenizer = tokenBase; - } else { - stream.next(); - } - - return "comment"; - }; - } - - function buildStringTokenizer(quote, greedy) { - if(greedy == null) { greedy = true; } - - function stringTokenizer(stream, state) { - var nextChar = stream.next(); - var peekChar = stream.peek(); - var previousChar = stream.string.charAt(stream.pos-2); - - var endingString = ((nextChar !== "\\" && peekChar === quote) || (nextChar === quote && previousChar !== "\\")); - - if (endingString) { - if (nextChar !== quote && greedy) { stream.next(); } - state.tokenizer = tokenBase; - return "string"; - } else if (nextChar === "#" && peekChar === "{") { - state.tokenizer = buildInterpolationTokenizer(stringTokenizer); - stream.next(); - return "operator"; - } else { - return "string"; - } - } - - return stringTokenizer; - } - - function buildInterpolationTokenizer(currentTokenizer) { - return function(stream, state) { - if (stream.peek() === "}") { - stream.next(); - state.tokenizer = currentTokenizer; - return "operator"; - } else { - return tokenBase(stream, state); - } - }; - } - - function indent(state) { - if (state.indentCount == 0) { - state.indentCount++; - var lastScopeOffset = state.scopes[0].offset; - var currentOffset = lastScopeOffset + config.indentUnit; - state.scopes.unshift({ offset:currentOffset }); - } - } - - function dedent(state) { - if (state.scopes.length == 1) return; - - state.scopes.shift(); - } - - function tokenBase(stream, state) { - var ch = stream.peek(); - - // Comment - if (stream.match("/*")) { - state.tokenizer = comment(stream.indentation(), true); - return state.tokenizer(stream, state); - } - if (stream.match("//")) { - state.tokenizer = comment(stream.indentation(), false); - return state.tokenizer(stream, state); - } - - // Interpolation - if (stream.match("#{")) { - state.tokenizer = buildInterpolationTokenizer(tokenBase); - return "operator"; - } - - if (ch === ".") { - stream.next(); - - // Match class selectors - if (stream.match(/^[\w-]+/)) { - indent(state); - return "atom"; - } else if (stream.peek() === "#") { - indent(state); - return "atom"; - } else { - return "operator"; - } - } - - if (ch === "#") { - stream.next(); - - // Hex numbers - if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)) - return "number"; - - // ID selectors - if (stream.match(/^[\w-]+/)) { - indent(state); - return "atom"; - } - - if (stream.peek() === "#") { - indent(state); - return "atom"; - } - } - - // Numbers - if (stream.match(/^-?[0-9\.]+/)) - return "number"; - - // Units - if (stream.match(/^(px|em|in)\b/)) - return "unit"; - - if (stream.match(keywordsRegexp)) - return "keyword"; - - if (stream.match(/^url/) && stream.peek() === "(") { - state.tokenizer = urlTokens; - return "atom"; - } - - // Variables - if (ch === "$") { - stream.next(); - stream.eatWhile(/[\w-]/); - - if (stream.peek() === ":") { - stream.next(); - return "variable-2"; - } else { - return "variable-3"; - } - } - - if (ch === "!") { - stream.next(); - return stream.match(/^[\w]+/) ? "keyword": "operator"; - } - - if (ch === "=") { - stream.next(); - - // Match shortcut mixin definition - if (stream.match(/^[\w-]+/)) { - indent(state); - return "meta"; - } else { - return "operator"; - } - } - - if (ch === "+") { - stream.next(); - - // Match shortcut mixin definition - if (stream.match(/^[\w-]+/)) - return "variable-3"; - else - return "operator"; - } - - // Indent Directives - if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) { - indent(state); - return "meta"; - } - - // Other Directives - if (ch === "@") { - stream.next(); - stream.eatWhile(/[\w-]/); - return "meta"; - } - - // Strings - if (ch === '"' || ch === "'") { - stream.next(); - state.tokenizer = buildStringTokenizer(ch); - return "string"; - } - - // Pseudo element selectors - if (ch == ":" && stream.match(pseudoElementsRegexp)) - return "keyword"; - - // atoms - if (stream.eatWhile(/[\w-&]/)) { - // matches a property definition - if (stream.peek() === ":" && !stream.match(pseudoElementsRegexp, false)) - return "property"; - else - return "atom"; - } - - if (stream.match(opRegexp)) - return "operator"; - - // If we haven't returned by now, we move 1 character - // and return an error - stream.next(); - return null; - } - - function tokenLexer(stream, state) { - if (stream.sol()) state.indentCount = 0; - var style = state.tokenizer(stream, state); - var current = stream.current(); - - if (current === "@return") - dedent(state); - - if (style === "atom") - indent(state); - - if (style !== null) { - var startOfToken = stream.pos - current.length; - var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount); - - var newScopes = []; - - for (var i = 0; i < state.scopes.length; i++) { - var scope = state.scopes[i]; - - if (scope.offset <= withCurrentIndent) - newScopes.push(scope); - } - - state.scopes = newScopes; - } - - - return style; - } - - return { - startState: function() { - return { - tokenizer: tokenBase, - scopes: [{offset: 0, type: "sass"}], - indentCount: 0, - definedVars: [], - definedMixins: [] - }; - }, - token: function(stream, state) { - var style = tokenLexer(stream, state); - - state.lastToken = { style: style, content: stream.current() }; - - return style; - }, - - indent: function(state) { - return state.scopes[0].offset; - } - }; -}); - -CodeMirror.defineMIME("text/x-sass", "sass"); - -}); diff --git a/kallithea/public/codemirror/mode/scheme/scheme.js b/kallithea/public/codemirror/mode/scheme/scheme.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/scheme/scheme.js +++ /dev/null @@ -1,248 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/** - * Author: Koh Zi Han, based on implementation by Koh Zi Chun - */ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("scheme", function () { - var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", - ATOM = "atom", NUMBER = "number", BRACKET = "bracket"; - var INDENT_WORD_SKIP = 2; - - function makeKeywords(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?"); - var indentKeys = makeKeywords("define let letrec let* lambda"); - - function stateStack(indent, type, prev) { // represents a state stack object - this.indent = indent; - this.type = type; - this.prev = prev; - } - - function pushStack(state, indent, type) { - state.indentStack = new stateStack(indent, type, state.indentStack); - } - - function popStack(state) { - state.indentStack = state.indentStack.prev; - } - - var binaryMatcher = new RegExp(/^(?:[-+]i|[-+][01]+#*(?:\/[01]+#*)?i|[-+]?[01]+#*(?:\/[01]+#*)?@[-+]?[01]+#*(?:\/[01]+#*)?|[-+]?[01]+#*(?:\/[01]+#*)?[-+](?:[01]+#*(?:\/[01]+#*)?)?i|[-+]?[01]+#*(?:\/[01]+#*)?)(?=[()\s;"]|$)/i); - var octalMatcher = new RegExp(/^(?:[-+]i|[-+][0-7]+#*(?:\/[0-7]+#*)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?@[-+]?[0-7]+#*(?:\/[0-7]+#*)?|[-+]?[0-7]+#*(?:\/[0-7]+#*)?[-+](?:[0-7]+#*(?:\/[0-7]+#*)?)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?)(?=[()\s;"]|$)/i); - var hexMatcher = new RegExp(/^(?:[-+]i|[-+][\da-f]+#*(?:\/[\da-f]+#*)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?@[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?[-+](?:[\da-f]+#*(?:\/[\da-f]+#*)?)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?)(?=[()\s;"]|$)/i); - var decimalMatcher = new RegExp(/^(?:[-+]i|[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)i|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)@[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)?i|(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*))(?=[()\s;"]|$)/i); - - function isBinaryNumber (stream) { - return stream.match(binaryMatcher); - } - - function isOctalNumber (stream) { - return stream.match(octalMatcher); - } - - function isDecimalNumber (stream, backup) { - if (backup === true) { - stream.backUp(1); - } - return stream.match(decimalMatcher); - } - - function isHexNumber (stream) { - return stream.match(hexMatcher); - } - - return { - startState: function () { - return { - indentStack: null, - indentation: 0, - mode: false, - sExprComment: false - }; - }, - - token: function (stream, state) { - if (state.indentStack == null && stream.sol()) { - // update indentation, but only if indentStack is empty - state.indentation = stream.indentation(); - } - - // skip spaces - if (stream.eatSpace()) { - return null; - } - var returnType = null; - - switch(state.mode){ - case "string": // multi-line string parsing mode - var next, escaped = false; - while ((next = stream.next()) != null) { - if (next == "\"" && !escaped) { - - state.mode = false; - break; - } - escaped = !escaped && next == "\\"; - } - returnType = STRING; // continue on in scheme-string mode - break; - case "comment": // comment parsing mode - var next, maybeEnd = false; - while ((next = stream.next()) != null) { - if (next == "#" && maybeEnd) { - - state.mode = false; - break; - } - maybeEnd = (next == "|"); - } - returnType = COMMENT; - break; - case "s-expr-comment": // s-expr commenting mode - state.mode = false; - if(stream.peek() == "(" || stream.peek() == "["){ - // actually start scheme s-expr commenting mode - state.sExprComment = 0; - }else{ - // if not we just comment the entire of the next token - stream.eatWhile(/[^/s]/); // eat non spaces - returnType = COMMENT; - break; - } - default: // default parsing mode - var ch = stream.next(); - - if (ch == "\"") { - state.mode = "string"; - returnType = STRING; - - } else if (ch == "'") { - returnType = ATOM; - } else if (ch == '#') { - if (stream.eat("|")) { // Multi-line comment - state.mode = "comment"; // toggle to comment mode - returnType = COMMENT; - } else if (stream.eat(/[tf]/i)) { // #t/#f (atom) - returnType = ATOM; - } else if (stream.eat(';')) { // S-Expr comment - state.mode = "s-expr-comment"; - returnType = COMMENT; - } else { - var numTest = null, hasExactness = false, hasRadix = true; - if (stream.eat(/[ei]/i)) { - hasExactness = true; - } else { - stream.backUp(1); // must be radix specifier - } - if (stream.match(/^#b/i)) { - numTest = isBinaryNumber; - } else if (stream.match(/^#o/i)) { - numTest = isOctalNumber; - } else if (stream.match(/^#x/i)) { - numTest = isHexNumber; - } else if (stream.match(/^#d/i)) { - numTest = isDecimalNumber; - } else if (stream.match(/^[-+0-9.]/, false)) { - hasRadix = false; - numTest = isDecimalNumber; - // re-consume the intial # if all matches failed - } else if (!hasExactness) { - stream.eat('#'); - } - if (numTest != null) { - if (hasRadix && !hasExactness) { - // consume optional exactness after radix - stream.match(/^#[ei]/i); - } - if (numTest(stream)) - returnType = NUMBER; - } - } - } else if (/^[-+0-9.]/.test(ch) && isDecimalNumber(stream, true)) { // match non-prefixed number, must be decimal - returnType = NUMBER; - } else if (ch == ";") { // comment - stream.skipToEnd(); // rest of the line is a comment - returnType = COMMENT; - } else if (ch == "(" || ch == "[") { - var keyWord = ''; var indentTemp = stream.column(), letter; - /** - Either - (indent-word .. - (non-indent-word .. - (;something else, bracket, etc. - */ - - while ((letter = stream.eat(/[^\s\(\[\;\)\]]/)) != null) { - keyWord += letter; - } - - if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word - - pushStack(state, indentTemp + INDENT_WORD_SKIP, ch); - } else { // non-indent word - // we continue eating the spaces - stream.eatSpace(); - if (stream.eol() || stream.peek() == ";") { - // nothing significant after - // we restart indentation 1 space after - pushStack(state, indentTemp + 1, ch); - } else { - pushStack(state, indentTemp + stream.current().length, ch); // else we match - } - } - stream.backUp(stream.current().length - 1); // undo all the eating - - if(typeof state.sExprComment == "number") state.sExprComment++; - - returnType = BRACKET; - } else if (ch == ")" || ch == "]") { - returnType = BRACKET; - if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : "[")) { - popStack(state); - - if(typeof state.sExprComment == "number"){ - if(--state.sExprComment == 0){ - returnType = COMMENT; // final closing bracket - state.sExprComment = false; // turn off s-expr commenting mode - } - } - } - } else { - stream.eatWhile(/[\w\$_\-!$%&*+\.\/:<=>?@\^~]/); - - if (keywords && keywords.propertyIsEnumerable(stream.current())) { - returnType = BUILTIN; - } else returnType = "variable"; - } - } - return (typeof state.sExprComment == "number") ? COMMENT : returnType; - }, - - indent: function (state) { - if (state.indentStack == null) return state.indentation; - return state.indentStack.indent; - }, - - lineComment: ";;" - }; -}); - -CodeMirror.defineMIME("text/x-scheme", "scheme"); - -}); diff --git a/kallithea/public/codemirror/mode/shell/shell.js b/kallithea/public/codemirror/mode/shell/shell.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/shell/shell.js +++ /dev/null @@ -1,138 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode('shell', function() { - - var words = {}; - function define(style, string) { - var split = string.split(' '); - for(var i = 0; i < split.length; i++) { - words[split[i]] = style; - } - }; - - // Atoms - define('atom', 'true false'); - - // Keywords - define('keyword', 'if then do else elif while until for in esac fi fin ' + - 'fil done exit set unset export function'); - - // Commands - define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' + - 'curl cut diff echo find gawk gcc get git grep kill killall ln ls make ' + - 'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' + - 'shopt shred source sort sleep ssh start stop su sudo tee telnet top ' + - 'touch vi vim wall wc wget who write yes zsh'); - - function tokenBase(stream, state) { - if (stream.eatSpace()) return null; - - var sol = stream.sol(); - var ch = stream.next(); - - if (ch === '\\') { - stream.next(); - return null; - } - if (ch === '\'' || ch === '"' || ch === '`') { - state.tokens.unshift(tokenString(ch)); - return tokenize(stream, state); - } - if (ch === '#') { - if (sol && stream.eat('!')) { - stream.skipToEnd(); - return 'meta'; // 'comment'? - } - stream.skipToEnd(); - return 'comment'; - } - if (ch === '$') { - state.tokens.unshift(tokenDollar); - return tokenize(stream, state); - } - if (ch === '+' || ch === '=') { - return 'operator'; - } - if (ch === '-') { - stream.eat('-'); - stream.eatWhile(/\w/); - return 'attribute'; - } - if (/\d/.test(ch)) { - stream.eatWhile(/\d/); - if(stream.eol() || !/\w/.test(stream.peek())) { - return 'number'; - } - } - stream.eatWhile(/[\w-]/); - var cur = stream.current(); - if (stream.peek() === '=' && /\w+/.test(cur)) return 'def'; - return words.hasOwnProperty(cur) ? words[cur] : null; - } - - function tokenString(quote) { - return function(stream, state) { - var next, end = false, escaped = false; - while ((next = stream.next()) != null) { - if (next === quote && !escaped) { - end = true; - break; - } - if (next === '$' && !escaped && quote !== '\'') { - escaped = true; - stream.backUp(1); - state.tokens.unshift(tokenDollar); - break; - } - escaped = !escaped && next === '\\'; - } - if (end || !escaped) { - state.tokens.shift(); - } - return (quote === '`' || quote === ')' ? 'quote' : 'string'); - }; - }; - - var tokenDollar = function(stream, state) { - if (state.tokens.length > 1) stream.eat('$'); - var ch = stream.next(), hungry = /\w/; - if (ch === '{') hungry = /[^}]/; - if (ch === '(') { - state.tokens[0] = tokenString(')'); - return tokenize(stream, state); - } - if (!/\d/.test(ch)) { - stream.eatWhile(hungry); - stream.eat('}'); - } - state.tokens.shift(); - return 'def'; - }; - - function tokenize(stream, state) { - return (state.tokens[0] || tokenBase) (stream, state); - }; - - return { - startState: function() {return {tokens:[]};}, - token: function(stream, state) { - return tokenize(stream, state); - }, - lineComment: '#' - }; -}); - -CodeMirror.defineMIME('text/x-sh', 'shell'); - -}); diff --git a/kallithea/public/codemirror/mode/sieve/sieve.js b/kallithea/public/codemirror/mode/sieve/sieve.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/sieve/sieve.js +++ /dev/null @@ -1,193 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("sieve", function(config) { - function words(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - var keywords = words("if elsif else stop require"); - var atoms = words("true false not"); - var indentUnit = config.indentUnit; - - function tokenBase(stream, state) { - - var ch = stream.next(); - if (ch == "/" && stream.eat("*")) { - state.tokenize = tokenCComment; - return tokenCComment(stream, state); - } - - if (ch === '#') { - stream.skipToEnd(); - return "comment"; - } - - if (ch == "\"") { - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } - - if (ch == "(") { - state._indent.push("("); - // add virtual angel wings so that editor behaves... - // ...more sane incase of broken brackets - state._indent.push("{"); - return null; - } - - if (ch === "{") { - state._indent.push("{"); - return null; - } - - if (ch == ")") { - state._indent.pop(); - state._indent.pop(); - } - - if (ch === "}") { - state._indent.pop(); - return null; - } - - if (ch == ",") - return null; - - if (ch == ";") - return null; - - - if (/[{}\(\),;]/.test(ch)) - return null; - - // 1*DIGIT "K" / "M" / "G" - if (/\d/.test(ch)) { - stream.eatWhile(/[\d]/); - stream.eat(/[KkMmGg]/); - return "number"; - } - - // ":" (ALPHA / "_") *(ALPHA / DIGIT / "_") - if (ch == ":") { - stream.eatWhile(/[a-zA-Z_]/); - stream.eatWhile(/[a-zA-Z0-9_]/); - - return "operator"; - } - - stream.eatWhile(/\w/); - var cur = stream.current(); - - // "text:" *(SP / HTAB) (hash-comment / CRLF) - // *(multiline-literal / multiline-dotstart) - // "." CRLF - if ((cur == "text") && stream.eat(":")) - { - state.tokenize = tokenMultiLineString; - return "string"; - } - - if (keywords.propertyIsEnumerable(cur)) - return "keyword"; - - if (atoms.propertyIsEnumerable(cur)) - return "atom"; - - return null; - } - - function tokenMultiLineString(stream, state) - { - state._multiLineString = true; - // the first line is special it may contain a comment - if (!stream.sol()) { - stream.eatSpace(); - - if (stream.peek() == "#") { - stream.skipToEnd(); - return "comment"; - } - - stream.skipToEnd(); - return "string"; - } - - if ((stream.next() == ".") && (stream.eol())) - { - state._multiLineString = false; - state.tokenize = tokenBase; - } - - return "string"; - } - - function tokenCComment(stream, state) { - var maybeEnd = false, ch; - while ((ch = stream.next()) != null) { - if (maybeEnd && ch == "/") { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == quote && !escaped) - break; - escaped = !escaped && ch == "\\"; - } - if (!escaped) state.tokenize = tokenBase; - return "string"; - }; - } - - return { - startState: function(base) { - return {tokenize: tokenBase, - baseIndent: base || 0, - _indent: []}; - }, - - token: function(stream, state) { - if (stream.eatSpace()) - return null; - - return (state.tokenize || tokenBase)(stream, state);; - }, - - indent: function(state, _textAfter) { - var length = state._indent.length; - if (_textAfter && (_textAfter[0] == "}")) - length--; - - if (length <0) - length = 0; - - return length * indentUnit; - }, - - electricChars: "}" - }; -}); - -CodeMirror.defineMIME("application/sieve", "sieve"); - -}); diff --git a/kallithea/public/codemirror/mode/slim/slim.js b/kallithea/public/codemirror/mode/slim/slim.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/slim/slim.js +++ /dev/null @@ -1,575 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -// Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../ruby/ruby")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../ruby/ruby"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - - CodeMirror.defineMode("slim", function(config) { - var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"}); - var rubyMode = CodeMirror.getMode(config, "ruby"); - var modes = { html: htmlMode, ruby: rubyMode }; - var embedded = { - ruby: "ruby", - javascript: "javascript", - css: "text/css", - sass: "text/x-sass", - scss: "text/x-scss", - less: "text/x-less", - styl: "text/x-styl", // no highlighting so far - coffee: "coffeescript", - asciidoc: "text/x-asciidoc", - markdown: "text/x-markdown", - textile: "text/x-textile", // no highlighting so far - creole: "text/x-creole", // no highlighting so far - wiki: "text/x-wiki", // no highlighting so far - mediawiki: "text/x-mediawiki", // no highlighting so far - rdoc: "text/x-rdoc", // no highlighting so far - builder: "text/x-builder", // no highlighting so far - nokogiri: "text/x-nokogiri", // no highlighting so far - erb: "application/x-erb" - }; - var embeddedRegexp = function(map){ - var arr = []; - for(var key in map) arr.push(key); - return new RegExp("^("+arr.join('|')+"):"); - }(embedded); - - var styleMap = { - "commentLine": "comment", - "slimSwitch": "operator special", - "slimTag": "tag", - "slimId": "attribute def", - "slimClass": "attribute qualifier", - "slimAttribute": "attribute", - "slimSubmode": "keyword special", - "closeAttributeTag": null, - "slimDoctype": null, - "lineContinuation": null - }; - var closing = { - "{": "}", - "[": "]", - "(": ")" - }; - - var nameStartChar = "_a-zA-Z\xC0-\xD6\xD8-\xF6\xF8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD"; - var nameChar = nameStartChar + "\\-0-9\xB7\u0300-\u036F\u203F-\u2040"; - var nameRegexp = new RegExp("^[:"+nameStartChar+"](?::["+nameChar+"]|["+nameChar+"]*)"); - var attributeNameRegexp = new RegExp("^[:"+nameStartChar+"][:\\."+nameChar+"]*(?=\\s*=)"); - var wrappedAttributeNameRegexp = new RegExp("^[:"+nameStartChar+"][:\\."+nameChar+"]*"); - var classNameRegexp = /^\.-?[_a-zA-Z]+[\w\-]*/; - var classIdRegexp = /^#[_a-zA-Z]+[\w\-]*/; - - function backup(pos, tokenize, style) { - var restore = function(stream, state) { - state.tokenize = tokenize; - if (stream.pos < pos) { - stream.pos = pos; - return style; - } - return state.tokenize(stream, state); - }; - return function(stream, state) { - state.tokenize = restore; - return tokenize(stream, state); - }; - } - - function maybeBackup(stream, state, pat, offset, style) { - var cur = stream.current(); - var idx = cur.search(pat); - if (idx > -1) { - state.tokenize = backup(stream.pos, state.tokenize, style); - stream.backUp(cur.length - idx - offset); - } - return style; - } - - function continueLine(state, column) { - state.stack = { - parent: state.stack, - style: "continuation", - indented: column, - tokenize: state.line - }; - state.line = state.tokenize; - } - function finishContinue(state) { - if (state.line == state.tokenize) { - state.line = state.stack.tokenize; - state.stack = state.stack.parent; - } - } - - function lineContinuable(column, tokenize) { - return function(stream, state) { - finishContinue(state); - if (stream.match(/^\\$/)) { - continueLine(state, column); - return "lineContinuation"; - } - var style = tokenize(stream, state); - if (stream.eol() && stream.current().match(/(?:^|[^\\])(?:\\\\)*\\$/)) { - stream.backUp(1); - } - return style; - }; - } - function commaContinuable(column, tokenize) { - return function(stream, state) { - finishContinue(state); - var style = tokenize(stream, state); - if (stream.eol() && stream.current().match(/,$/)) { - continueLine(state, column); - } - return style; - }; - } - - function rubyInQuote(endQuote, tokenize) { - // TODO: add multi line support - return function(stream, state) { - var ch = stream.peek(); - if (ch == endQuote && state.rubyState.tokenize.length == 1) { - // step out of ruby context as it seems to complete processing all the braces - stream.next(); - state.tokenize = tokenize; - return "closeAttributeTag"; - } else { - return ruby(stream, state); - } - }; - } - function startRubySplat(tokenize) { - var rubyState; - var runSplat = function(stream, state) { - if (state.rubyState.tokenize.length == 1 && !state.rubyState.context.prev) { - stream.backUp(1); - if (stream.eatSpace()) { - state.rubyState = rubyState; - state.tokenize = tokenize; - return tokenize(stream, state); - } - stream.next(); - } - return ruby(stream, state); - }; - return function(stream, state) { - rubyState = state.rubyState; - state.rubyState = rubyMode.startState(); - state.tokenize = runSplat; - return ruby(stream, state); - }; - } - - function ruby(stream, state) { - return rubyMode.token(stream, state.rubyState); - } - - function htmlLine(stream, state) { - if (stream.match(/^\\$/)) { - return "lineContinuation"; - } - return html(stream, state); - } - function html(stream, state) { - if (stream.match(/^#\{/)) { - state.tokenize = rubyInQuote("}", state.tokenize); - return null; - } - return maybeBackup(stream, state, /[^\\]#\{/, 1, htmlMode.token(stream, state.htmlState)); - } - - function startHtmlLine(lastTokenize) { - return function(stream, state) { - var style = htmlLine(stream, state); - if (stream.eol()) state.tokenize = lastTokenize; - return style; - }; - } - - function startHtmlMode(stream, state, offset) { - state.stack = { - parent: state.stack, - style: "html", - indented: stream.column() + offset, // pipe + space - tokenize: state.line - }; - state.line = state.tokenize = html; - return null; - } - - function comment(stream, state) { - stream.skipToEnd(); - return state.stack.style; - } - - function commentMode(stream, state) { - state.stack = { - parent: state.stack, - style: "comment", - indented: state.indented + 1, - tokenize: state.line - }; - state.line = comment; - return comment(stream, state); - } - - function attributeWrapper(stream, state) { - if (stream.eat(state.stack.endQuote)) { - state.line = state.stack.line; - state.tokenize = state.stack.tokenize; - state.stack = state.stack.parent; - return null; - } - if (stream.match(wrappedAttributeNameRegexp)) { - state.tokenize = attributeWrapperAssign; - return "slimAttribute"; - } - stream.next(); - return null; - } - function attributeWrapperAssign(stream, state) { - if (stream.match(/^==?/)) { - state.tokenize = attributeWrapperValue; - return null; - } - return attributeWrapper(stream, state); - } - function attributeWrapperValue(stream, state) { - var ch = stream.peek(); - if (ch == '"' || ch == "\'") { - state.tokenize = readQuoted(ch, "string", true, false, attributeWrapper); - stream.next(); - return state.tokenize(stream, state); - } - if (ch == '[') { - return startRubySplat(attributeWrapper)(stream, state); - } - if (stream.match(/^(true|false|nil)\b/)) { - state.tokenize = attributeWrapper; - return "keyword"; - } - return startRubySplat(attributeWrapper)(stream, state); - } - - function startAttributeWrapperMode(state, endQuote, tokenize) { - state.stack = { - parent: state.stack, - style: "wrapper", - indented: state.indented + 1, - tokenize: tokenize, - line: state.line, - endQuote: endQuote - }; - state.line = state.tokenize = attributeWrapper; - return null; - } - - function sub(stream, state) { - if (stream.match(/^#\{/)) { - state.tokenize = rubyInQuote("}", state.tokenize); - return null; - } - var subStream = new CodeMirror.StringStream(stream.string.slice(state.stack.indented), stream.tabSize); - subStream.pos = stream.pos - state.stack.indented; - subStream.start = stream.start - state.stack.indented; - subStream.lastColumnPos = stream.lastColumnPos - state.stack.indented; - subStream.lastColumnValue = stream.lastColumnValue - state.stack.indented; - var style = state.subMode.token(subStream, state.subState); - stream.pos = subStream.pos + state.stack.indented; - return style; - } - function firstSub(stream, state) { - state.stack.indented = stream.column(); - state.line = state.tokenize = sub; - return state.tokenize(stream, state); - } - - function createMode(mode) { - var query = embedded[mode]; - var spec = CodeMirror.mimeModes[query]; - if (spec) { - return CodeMirror.getMode(config, spec); - } - var factory = CodeMirror.modes[query]; - if (factory) { - return factory(config, {name: query}); - } - return CodeMirror.getMode(config, "null"); - } - - function getMode(mode) { - if (!modes.hasOwnProperty(mode)) { - return modes[mode] = createMode(mode); - } - return modes[mode]; - } - - function startSubMode(mode, state) { - var subMode = getMode(mode); - var subState = subMode.startState && subMode.startState(); - - state.subMode = subMode; - state.subState = subState; - - state.stack = { - parent: state.stack, - style: "sub", - indented: state.indented + 1, - tokenize: state.line - }; - state.line = state.tokenize = firstSub; - return "slimSubmode"; - } - - function doctypeLine(stream, _state) { - stream.skipToEnd(); - return "slimDoctype"; - } - - function startLine(stream, state) { - var ch = stream.peek(); - if (ch == '<') { - return (state.tokenize = startHtmlLine(state.tokenize))(stream, state); - } - if (stream.match(/^[|']/)) { - return startHtmlMode(stream, state, 1); - } - if (stream.match(/^\/(!|\[\w+])?/)) { - return commentMode(stream, state); - } - if (stream.match(/^(-|==?[<>]?)/)) { - state.tokenize = lineContinuable(stream.column(), commaContinuable(stream.column(), ruby)); - return "slimSwitch"; - } - if (stream.match(/^doctype\b/)) { - state.tokenize = doctypeLine; - return "keyword"; - } - - var m = stream.match(embeddedRegexp); - if (m) { - return startSubMode(m[1], state); - } - - return slimTag(stream, state); - } - - function slim(stream, state) { - if (state.startOfLine) { - return startLine(stream, state); - } - return slimTag(stream, state); - } - - function slimTag(stream, state) { - if (stream.eat('*')) { - state.tokenize = startRubySplat(slimTagExtras); - return null; - } - if (stream.match(nameRegexp)) { - state.tokenize = slimTagExtras; - return "slimTag"; - } - return slimClass(stream, state); - } - function slimTagExtras(stream, state) { - if (stream.match(/^(<>?|> state.indented && state.last != "slimSubmode") { - state.line = state.tokenize = state.stack.tokenize; - state.stack = state.stack.parent; - state.subMode = null; - state.subState = null; - } - } - if (stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - state.startOfLine = false; - if (style) state.last = style; - return styleMap.hasOwnProperty(style) ? styleMap[style] : style; - }, - - blankLine: function(state) { - if (state.subMode && state.subMode.blankLine) { - return state.subMode.blankLine(state.subState); - } - }, - - innerMode: function(state) { - if (state.subMode) return {state: state.subState, mode: state.subMode}; - return {state: state, mode: mode}; - } - - //indent: function(state) { - // return state.indented; - //} - }; - return mode; - }, "htmlmixed", "ruby"); - - CodeMirror.defineMIME("text/x-slim", "slim"); - CodeMirror.defineMIME("application/x-slim", "slim"); -}); diff --git a/kallithea/public/codemirror/mode/smalltalk/smalltalk.js b/kallithea/public/codemirror/mode/smalltalk/smalltalk.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/smalltalk/smalltalk.js +++ /dev/null @@ -1,168 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode('smalltalk', function(config) { - - var specialChars = /[+\-\/\\*~<>=@%|&?!.,:;^]/; - var keywords = /true|false|nil|self|super|thisContext/; - - var Context = function(tokenizer, parent) { - this.next = tokenizer; - this.parent = parent; - }; - - var Token = function(name, context, eos) { - this.name = name; - this.context = context; - this.eos = eos; - }; - - var State = function() { - this.context = new Context(next, null); - this.expectVariable = true; - this.indentation = 0; - this.userIndentationDelta = 0; - }; - - State.prototype.userIndent = function(indentation) { - this.userIndentationDelta = indentation > 0 ? (indentation / config.indentUnit - this.indentation) : 0; - }; - - var next = function(stream, context, state) { - var token = new Token(null, context, false); - var aChar = stream.next(); - - if (aChar === '"') { - token = nextComment(stream, new Context(nextComment, context)); - - } else if (aChar === '\'') { - token = nextString(stream, new Context(nextString, context)); - - } else if (aChar === '#') { - if (stream.peek() === '\'') { - stream.next(); - token = nextSymbol(stream, new Context(nextSymbol, context)); - } else { - if (stream.eatWhile(/[^\s.{}\[\]()]/)) - token.name = 'string-2'; - else - token.name = 'meta'; - } - - } else if (aChar === '$') { - if (stream.next() === '<') { - stream.eatWhile(/[^\s>]/); - stream.next(); - } - token.name = 'string-2'; - - } else if (aChar === '|' && state.expectVariable) { - token.context = new Context(nextTemporaries, context); - - } else if (/[\[\]{}()]/.test(aChar)) { - token.name = 'bracket'; - token.eos = /[\[{(]/.test(aChar); - - if (aChar === '[') { - state.indentation++; - } else if (aChar === ']') { - state.indentation = Math.max(0, state.indentation - 1); - } - - } else if (specialChars.test(aChar)) { - stream.eatWhile(specialChars); - token.name = 'operator'; - token.eos = aChar !== ';'; // ; cascaded message expression - - } else if (/\d/.test(aChar)) { - stream.eatWhile(/[\w\d]/); - token.name = 'number'; - - } else if (/[\w_]/.test(aChar)) { - stream.eatWhile(/[\w\d_]/); - token.name = state.expectVariable ? (keywords.test(stream.current()) ? 'keyword' : 'variable') : null; - - } else { - token.eos = state.expectVariable; - } - - return token; - }; - - var nextComment = function(stream, context) { - stream.eatWhile(/[^"]/); - return new Token('comment', stream.eat('"') ? context.parent : context, true); - }; - - var nextString = function(stream, context) { - stream.eatWhile(/[^']/); - return new Token('string', stream.eat('\'') ? context.parent : context, false); - }; - - var nextSymbol = function(stream, context) { - stream.eatWhile(/[^']/); - return new Token('string-2', stream.eat('\'') ? context.parent : context, false); - }; - - var nextTemporaries = function(stream, context) { - var token = new Token(null, context, false); - var aChar = stream.next(); - - if (aChar === '|') { - token.context = context.parent; - token.eos = true; - - } else { - stream.eatWhile(/[^|]/); - token.name = 'variable'; - } - - return token; - }; - - return { - startState: function() { - return new State; - }, - - token: function(stream, state) { - state.userIndent(stream.indentation()); - - if (stream.eatSpace()) { - return null; - } - - var token = state.context.next(stream, state.context, state); - state.context = token.context; - state.expectVariable = token.eos; - - return token.name; - }, - - blankLine: function(state) { - state.userIndent(0); - }, - - indent: function(state, textAfter) { - var i = state.context.next === next && textAfter && textAfter.charAt(0) === ']' ? -1 : state.userIndentationDelta; - return (state.indentation + i) * config.indentUnit; - }, - - electricChars: ']' - }; - -}); - -CodeMirror.defineMIME('text/x-stsrc', {name: 'smalltalk'}); - -}); diff --git a/kallithea/public/codemirror/mode/smarty/smarty.js b/kallithea/public/codemirror/mode/smarty/smarty.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/smarty/smarty.js +++ /dev/null @@ -1,221 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/** - * Smarty 2 and 3 mode. - */ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("smarty", function(config) { - "use strict"; - - // our default settings; check to see if they're overridden - var settings = { - rightDelimiter: '}', - leftDelimiter: '{', - smartyVersion: 2 // for backward compatibility - }; - if (config.hasOwnProperty("leftDelimiter")) { - settings.leftDelimiter = config.leftDelimiter; - } - if (config.hasOwnProperty("rightDelimiter")) { - settings.rightDelimiter = config.rightDelimiter; - } - if (config.hasOwnProperty("smartyVersion") && config.smartyVersion === 3) { - settings.smartyVersion = 3; - } - - var keyFunctions = ["debug", "extends", "function", "include", "literal"]; - var last; - var regs = { - operatorChars: /[+\-*&%=<>!?]/, - validIdentifier: /[a-zA-Z0-9_]/, - stringChar: /['"]/ - }; - - var helpers = { - cont: function(style, lastType) { - last = lastType; - return style; - }, - chain: function(stream, state, parser) { - state.tokenize = parser; - return parser(stream, state); - } - }; - - - // our various parsers - var parsers = { - - // the main tokenizer - tokenizer: function(stream, state) { - if (stream.match(settings.leftDelimiter, true)) { - if (stream.eat("*")) { - return helpers.chain(stream, state, parsers.inBlock("comment", "*" + settings.rightDelimiter)); - } else { - // Smarty 3 allows { and } surrounded by whitespace to NOT slip into Smarty mode - state.depth++; - var isEol = stream.eol(); - var isFollowedByWhitespace = /\s/.test(stream.peek()); - if (settings.smartyVersion === 3 && settings.leftDelimiter === "{" && (isEol || isFollowedByWhitespace)) { - state.depth--; - return null; - } else { - state.tokenize = parsers.smarty; - last = "startTag"; - return "tag"; - } - } - } else { - stream.next(); - return null; - } - }, - - // parsing Smarty content - smarty: function(stream, state) { - if (stream.match(settings.rightDelimiter, true)) { - if (settings.smartyVersion === 3) { - state.depth--; - if (state.depth <= 0) { - state.tokenize = parsers.tokenizer; - } - } else { - state.tokenize = parsers.tokenizer; - } - return helpers.cont("tag", null); - } - - if (stream.match(settings.leftDelimiter, true)) { - state.depth++; - return helpers.cont("tag", "startTag"); - } - - var ch = stream.next(); - if (ch == "$") { - stream.eatWhile(regs.validIdentifier); - return helpers.cont("variable-2", "variable"); - } else if (ch == "|") { - return helpers.cont("operator", "pipe"); - } else if (ch == ".") { - return helpers.cont("operator", "property"); - } else if (regs.stringChar.test(ch)) { - state.tokenize = parsers.inAttribute(ch); - return helpers.cont("string", "string"); - } else if (regs.operatorChars.test(ch)) { - stream.eatWhile(regs.operatorChars); - return helpers.cont("operator", "operator"); - } else if (ch == "[" || ch == "]") { - return helpers.cont("bracket", "bracket"); - } else if (ch == "(" || ch == ")") { - return helpers.cont("bracket", "operator"); - } else if (/\d/.test(ch)) { - stream.eatWhile(/\d/); - return helpers.cont("number", "number"); - } else { - - if (state.last == "variable") { - if (ch == "@") { - stream.eatWhile(regs.validIdentifier); - return helpers.cont("property", "property"); - } else if (ch == "|") { - stream.eatWhile(regs.validIdentifier); - return helpers.cont("qualifier", "modifier"); - } - } else if (state.last == "pipe") { - stream.eatWhile(regs.validIdentifier); - return helpers.cont("qualifier", "modifier"); - } else if (state.last == "whitespace") { - stream.eatWhile(regs.validIdentifier); - return helpers.cont("attribute", "modifier"); - } if (state.last == "property") { - stream.eatWhile(regs.validIdentifier); - return helpers.cont("property", null); - } else if (/\s/.test(ch)) { - last = "whitespace"; - return null; - } - - var str = ""; - if (ch != "/") { - str += ch; - } - var c = null; - while (c = stream.eat(regs.validIdentifier)) { - str += c; - } - for (var i=0, j=keyFunctions.length; i -* @version 3.0 -* @date 05.07.2013 -*/ - -// Warning: Don't base other modes on this one. This here is a -// terrible way to write a mixed mode. - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../smarty/smarty")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../smarty/smarty"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("smartymixed", function(config) { - var htmlMixedMode = CodeMirror.getMode(config, "htmlmixed"); - var smartyMode = CodeMirror.getMode(config, "smarty"); - - var settings = { - rightDelimiter: '}', - leftDelimiter: '{' - }; - - if (config.hasOwnProperty("leftDelimiter")) { - settings.leftDelimiter = config.leftDelimiter; - } - if (config.hasOwnProperty("rightDelimiter")) { - settings.rightDelimiter = config.rightDelimiter; - } - - function reEsc(str) { return str.replace(/[^\s\w]/g, "\\$&"); } - - var reLeft = reEsc(settings.leftDelimiter), reRight = reEsc(settings.rightDelimiter); - var regs = { - smartyComment: new RegExp("^" + reRight + "\\*"), - literalOpen: new RegExp(reLeft + "literal" + reRight), - literalClose: new RegExp(reLeft + "\/literal" + reRight), - hasLeftDelimeter: new RegExp(".*" + reLeft), - htmlHasLeftDelimeter: new RegExp("[^<>]*" + reLeft) - }; - - var helpers = { - chain: function(stream, state, parser) { - state.tokenize = parser; - return parser(stream, state); - }, - - cleanChain: function(stream, state, parser) { - state.tokenize = null; - state.localState = null; - state.localMode = null; - return (typeof parser == "string") ? (parser ? parser : null) : parser(stream, state); - }, - - maybeBackup: function(stream, pat, style) { - var cur = stream.current(); - var close = cur.search(pat), - m; - if (close > - 1) stream.backUp(cur.length - close); - else if (m = cur.match(/<\/?$/)) { - stream.backUp(cur.length); - if (!stream.match(pat, false)) stream.match(cur[0]); - } - return style; - } - }; - - var parsers = { - html: function(stream, state) { - var htmlTagName = state.htmlMixedState.htmlState.context && state.htmlMixedState.htmlState.context.tagName - ? state.htmlMixedState.htmlState.context.tagName - : null; - - if (!state.inLiteral && stream.match(regs.htmlHasLeftDelimeter, false) && htmlTagName === null) { - state.tokenize = parsers.smarty; - state.localMode = smartyMode; - state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, "")); - return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState)); - } else if (!state.inLiteral && stream.match(settings.leftDelimiter, false)) { - state.tokenize = parsers.smarty; - state.localMode = smartyMode; - state.localState = smartyMode.startState(htmlMixedMode.indent(state.htmlMixedState, "")); - return helpers.maybeBackup(stream, settings.leftDelimiter, smartyMode.token(stream, state.localState)); - } - return htmlMixedMode.token(stream, state.htmlMixedState); - }, - - smarty: function(stream, state) { - if (stream.match(settings.leftDelimiter, false)) { - if (stream.match(regs.smartyComment, false)) { - return helpers.chain(stream, state, parsers.inBlock("comment", "*" + settings.rightDelimiter)); - } - } else if (stream.match(settings.rightDelimiter, false)) { - stream.eat(settings.rightDelimiter); - state.tokenize = parsers.html; - state.localMode = htmlMixedMode; - state.localState = state.htmlMixedState; - return "tag"; - } - - return helpers.maybeBackup(stream, settings.rightDelimiter, smartyMode.token(stream, state.localState)); - }, - - inBlock: function(style, terminator) { - return function(stream, state) { - while (!stream.eol()) { - if (stream.match(terminator)) { - helpers.cleanChain(stream, state, ""); - break; - } - stream.next(); - } - return style; - }; - } - }; - - return { - startState: function() { - var state = htmlMixedMode.startState(); - return { - token: parsers.html, - localMode: null, - localState: null, - htmlMixedState: state, - tokenize: null, - inLiteral: false - }; - }, - - copyState: function(state) { - var local = null, tok = (state.tokenize || state.token); - if (state.localState) { - local = CodeMirror.copyState((tok != parsers.html ? smartyMode : htmlMixedMode), state.localState); - } - return { - token: state.token, - tokenize: state.tokenize, - localMode: state.localMode, - localState: local, - htmlMixedState: CodeMirror.copyState(htmlMixedMode, state.htmlMixedState), - inLiteral: state.inLiteral - }; - }, - - token: function(stream, state) { - if (stream.match(settings.leftDelimiter, false)) { - if (!state.inLiteral && stream.match(regs.literalOpen, true)) { - state.inLiteral = true; - return "keyword"; - } else if (state.inLiteral && stream.match(regs.literalClose, true)) { - state.inLiteral = false; - return "keyword"; - } - } - if (state.inLiteral && state.localState != state.htmlMixedState) { - state.tokenize = parsers.html; - state.localMode = htmlMixedMode; - state.localState = state.htmlMixedState; - } - - var style = (state.tokenize || state.token)(stream, state); - return style; - }, - - indent: function(state, textAfter) { - if (state.localMode == smartyMode - || (state.inLiteral && !state.localMode) - || regs.hasLeftDelimeter.test(textAfter)) { - return CodeMirror.Pass; - } - return htmlMixedMode.indent(state.htmlMixedState, textAfter); - }, - - innerMode: function(state) { - return { - state: state.localState || state.htmlMixedState, - mode: state.localMode || htmlMixedMode - }; - } - }; -}, "htmlmixed", "smarty"); - -CodeMirror.defineMIME("text/x-smarty", "smartymixed"); -// vim: et ts=2 sts=2 sw=2 - -}); diff --git a/kallithea/public/codemirror/mode/solr/solr.js b/kallithea/public/codemirror/mode/solr/solr.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/solr/solr.js +++ /dev/null @@ -1,104 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("solr", function() { - "use strict"; - - var isStringChar = /[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\^\"\\]/; - var isOperatorChar = /[\|\!\+\-\*\?\~\^\&]/; - var isOperatorString = /^(OR|AND|NOT|TO)$/i; - - function isNumber(word) { - return parseFloat(word, 10).toString() === word; - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) break; - escaped = !escaped && next == "\\"; - } - - if (!escaped) state.tokenize = tokenBase; - return "string"; - }; - } - - function tokenOperator(operator) { - return function(stream, state) { - var style = "operator"; - if (operator == "+") - style += " positive"; - else if (operator == "-") - style += " negative"; - else if (operator == "|") - stream.eat(/\|/); - else if (operator == "&") - stream.eat(/\&/); - else if (operator == "^") - style += " boost"; - - state.tokenize = tokenBase; - return style; - }; - } - - function tokenWord(ch) { - return function(stream, state) { - var word = ch; - while ((ch = stream.peek()) && ch.match(isStringChar) != null) { - word += stream.next(); - } - - state.tokenize = tokenBase; - if (isOperatorString.test(word)) - return "operator"; - else if (isNumber(word)) - return "number"; - else if (stream.peek() == ":") - return "field"; - else - return "string"; - }; - } - - function tokenBase(stream, state) { - var ch = stream.next(); - if (ch == '"') - state.tokenize = tokenString(ch); - else if (isOperatorChar.test(ch)) - state.tokenize = tokenOperator(ch); - else if (isStringChar.test(ch)) - state.tokenize = tokenWord(ch); - - return (state.tokenize != tokenBase) ? state.tokenize(stream, state) : null; - } - - return { - startState: function() { - return { - tokenize: tokenBase - }; - }, - - token: function(stream, state) { - if (stream.eatSpace()) return null; - return state.tokenize(stream, state); - } - }; -}); - -CodeMirror.defineMIME("text/x-solr", "solr"); - -}); diff --git a/kallithea/public/codemirror/mode/sparql/sparql.js b/kallithea/public/codemirror/mode/sparql/sparql.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/sparql/sparql.js +++ /dev/null @@ -1,160 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("sparql", function(config) { - var indentUnit = config.indentUnit; - var curPunc; - - function wordRegexp(words) { - return new RegExp("^(?:" + words.join("|") + ")$", "i"); - } - var ops = wordRegexp(["str", "lang", "langmatches", "datatype", "bound", "sameterm", "isiri", "isuri", - "isblank", "isliteral", "a"]); - var keywords = wordRegexp(["base", "prefix", "select", "distinct", "reduced", "construct", "describe", - "ask", "from", "named", "where", "order", "limit", "offset", "filter", "optional", - "graph", "by", "asc", "desc", "as", "having", "undef", "values", "group", - "minus", "in", "not", "service", "silent", "using", "insert", "delete", "union", - "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]); - var operatorChars = /[*+\-<>=&|]/; - - function tokenBase(stream, state) { - var ch = stream.next(); - curPunc = null; - if (ch == "$" || ch == "?") { - stream.match(/^[\w\d]*/); - return "variable-2"; - } - else if (ch == "<" && !stream.match(/^[\s\u00a0=]/, false)) { - stream.match(/^[^\s\u00a0>]*>?/); - return "atom"; - } - else if (ch == "\"" || ch == "'") { - state.tokenize = tokenLiteral(ch); - return state.tokenize(stream, state); - } - else if (/[{}\(\),\.;\[\]]/.test(ch)) { - curPunc = ch; - return null; - } - else if (ch == "#") { - stream.skipToEnd(); - return "comment"; - } - else if (operatorChars.test(ch)) { - stream.eatWhile(operatorChars); - return null; - } - else if (ch == ":") { - stream.eatWhile(/[\w\d\._\-]/); - return "atom"; - } - else { - stream.eatWhile(/[_\w\d]/); - if (stream.eat(":")) { - stream.eatWhile(/[\w\d_\-]/); - return "atom"; - } - var word = stream.current(); - if (ops.test(word)) - return null; - else if (keywords.test(word)) - return "keyword"; - else - return "variable"; - } - } - - function tokenLiteral(quote) { - return function(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == quote && !escaped) { - state.tokenize = tokenBase; - break; - } - escaped = !escaped && ch == "\\"; - } - return "string"; - }; - } - - function pushContext(state, type, col) { - state.context = {prev: state.context, indent: state.indent, col: col, type: type}; - } - function popContext(state) { - state.indent = state.context.indent; - state.context = state.context.prev; - } - - return { - startState: function() { - return {tokenize: tokenBase, - context: null, - indent: 0, - col: 0}; - }, - - token: function(stream, state) { - if (stream.sol()) { - if (state.context && state.context.align == null) state.context.align = false; - state.indent = stream.indentation(); - } - if (stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - - if (style != "comment" && state.context && state.context.align == null && state.context.type != "pattern") { - state.context.align = true; - } - - if (curPunc == "(") pushContext(state, ")", stream.column()); - else if (curPunc == "[") pushContext(state, "]", stream.column()); - else if (curPunc == "{") pushContext(state, "}", stream.column()); - else if (/[\]\}\)]/.test(curPunc)) { - while (state.context && state.context.type == "pattern") popContext(state); - if (state.context && curPunc == state.context.type) popContext(state); - } - else if (curPunc == "." && state.context && state.context.type == "pattern") popContext(state); - else if (/atom|string|variable/.test(style) && state.context) { - if (/[\}\]]/.test(state.context.type)) - pushContext(state, "pattern", stream.column()); - else if (state.context.type == "pattern" && !state.context.align) { - state.context.align = true; - state.context.col = stream.column(); - } - } - - return style; - }, - - indent: function(state, textAfter) { - var firstChar = textAfter && textAfter.charAt(0); - var context = state.context; - if (/[\]\}]/.test(firstChar)) - while (context && context.type == "pattern") context = context.prev; - - var closing = context && firstChar == context.type; - if (!context) - return 0; - else if (context.type == "pattern") - return context.col; - else if (context.align) - return context.col + (closing ? 0 : 1); - else - return context.indent + (closing ? 0 : indentUnit); - } - }; -}); - -CodeMirror.defineMIME("application/x-sparql-query", "sparql"); - -}); diff --git a/kallithea/public/codemirror/mode/sql/sql.js b/kallithea/public/codemirror/mode/sql/sql.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/sql/sql.js +++ /dev/null @@ -1,393 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("sql", function(config, parserConfig) { - "use strict"; - - var client = parserConfig.client || {}, - atoms = parserConfig.atoms || {"false": true, "true": true, "null": true}, - builtin = parserConfig.builtin || {}, - keywords = parserConfig.keywords || {}, - operatorChars = parserConfig.operatorChars || /^[*+\-%<>!=&|~^]/, - support = parserConfig.support || {}, - hooks = parserConfig.hooks || {}, - dateSQL = parserConfig.dateSQL || {"date" : true, "time" : true, "timestamp" : true}; - - function tokenBase(stream, state) { - var ch = stream.next(); - - // call hooks from the mime type - if (hooks[ch]) { - var result = hooks[ch](stream, state); - if (result !== false) return result; - } - - if (support.hexNumber == true && - ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/)) - || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]+'/))) { - // hex - // ref: http://dev.mysql.com/doc/refman/5.5/en/hexadecimal-literals.html - return "number"; - } else if (support.binaryNumber == true && - (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/)) - || (ch == "0" && stream.match(/^b[01]+/)))) { - // bitstring - // ref: http://dev.mysql.com/doc/refman/5.5/en/bit-field-literals.html - return "number"; - } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) { - // numbers - // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html - stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/); - support.decimallessFloat == true && stream.eat('.'); - return "number"; - } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) { - // placeholders - return "variable-3"; - } else if (ch == "'" || (ch == '"' && support.doubleQuote)) { - // strings - // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html - state.tokenize = tokenLiteral(ch); - return state.tokenize(stream, state); - } else if ((((support.nCharCast == true && (ch == "n" || ch == "N")) - || (support.charsetCast == true && ch == "_" && stream.match(/[a-z][a-z0-9]*/i))) - && (stream.peek() == "'" || stream.peek() == '"'))) { - // charset casting: _utf8'str', N'str', n'str' - // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html - return "keyword"; - } else if (/^[\(\),\;\[\]]/.test(ch)) { - // no highlightning - return null; - } else if (support.commentSlashSlash && ch == "/" && stream.eat("/")) { - // 1-line comment - stream.skipToEnd(); - return "comment"; - } else if ((support.commentHash && ch == "#") - || (ch == "-" && stream.eat("-") && (!support.commentSpaceRequired || stream.eat(" ")))) { - // 1-line comments - // ref: https://kb.askmonty.org/en/comment-syntax/ - stream.skipToEnd(); - return "comment"; - } else if (ch == "/" && stream.eat("*")) { - // multi-line comments - // ref: https://kb.askmonty.org/en/comment-syntax/ - state.tokenize = tokenComment; - return state.tokenize(stream, state); - } else if (ch == ".") { - // .1 for 0.1 - if (support.zerolessFloat == true && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i)) { - return "number"; - } - // .table_name (ODBC) - // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html - if (support.ODBCdotTable == true && stream.match(/^[a-zA-Z_]+/)) { - return "variable-2"; - } - } else if (operatorChars.test(ch)) { - // operators - stream.eatWhile(operatorChars); - return null; - } else if (ch == '{' && - (stream.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/) || stream.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/))) { - // dates (weird ODBC syntax) - // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html - return "number"; - } else { - stream.eatWhile(/^[_\w\d]/); - var word = stream.current().toLowerCase(); - // dates (standard SQL syntax) - // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html - if (dateSQL.hasOwnProperty(word) && (stream.match(/^( )+'[^']*'/) || stream.match(/^( )+"[^"]*"/))) - return "number"; - if (atoms.hasOwnProperty(word)) return "atom"; - if (builtin.hasOwnProperty(word)) return "builtin"; - if (keywords.hasOwnProperty(word)) return "keyword"; - if (client.hasOwnProperty(word)) return "string-2"; - return null; - } - } - - // 'string', with char specified in quote escaped by '\' - function tokenLiteral(quote) { - return function(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == quote && !escaped) { - state.tokenize = tokenBase; - break; - } - escaped = !escaped && ch == "\\"; - } - return "string"; - }; - } - function tokenComment(stream, state) { - while (true) { - if (stream.skipTo("*")) { - stream.next(); - if (stream.eat("/")) { - state.tokenize = tokenBase; - break; - } - } else { - stream.skipToEnd(); - break; - } - } - return "comment"; - } - - function pushContext(stream, state, type) { - state.context = { - prev: state.context, - indent: stream.indentation(), - col: stream.column(), - type: type - }; - } - - function popContext(state) { - state.indent = state.context.indent; - state.context = state.context.prev; - } - - return { - startState: function() { - return {tokenize: tokenBase, context: null}; - }, - - token: function(stream, state) { - if (stream.sol()) { - if (state.context && state.context.align == null) - state.context.align = false; - } - if (stream.eatSpace()) return null; - - var style = state.tokenize(stream, state); - if (style == "comment") return style; - - if (state.context && state.context.align == null) - state.context.align = true; - - var tok = stream.current(); - if (tok == "(") - pushContext(stream, state, ")"); - else if (tok == "[") - pushContext(stream, state, "]"); - else if (state.context && state.context.type == tok) - popContext(state); - return style; - }, - - indent: function(state, textAfter) { - var cx = state.context; - if (!cx) return 0; - var closing = textAfter.charAt(0) == cx.type; - if (cx.align) return cx.col + (closing ? 0 : 1); - else return cx.indent + (closing ? 0 : config.indentUnit); - }, - - blockCommentStart: "/*", - blockCommentEnd: "*/", - lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : null - }; -}); - -(function() { - "use strict"; - - // `identifier` - function hookIdentifier(stream) { - // MySQL/MariaDB identifiers - // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html - var ch; - while ((ch = stream.next()) != null) { - if (ch == "`" && !stream.eat("`")) return "variable-2"; - } - stream.backUp(stream.current().length - 1); - return stream.eatWhile(/\w/) ? "variable-2" : null; - } - - // variable token - function hookVar(stream) { - // variables - // @@prefix.varName @varName - // varName can be quoted with ` or ' or " - // ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html - if (stream.eat("@")) { - stream.match(/^session\./); - stream.match(/^local\./); - stream.match(/^global\./); - } - - if (stream.eat("'")) { - stream.match(/^.*'/); - return "variable-2"; - } else if (stream.eat('"')) { - stream.match(/^.*"/); - return "variable-2"; - } else if (stream.eat("`")) { - stream.match(/^.*`/); - return "variable-2"; - } else if (stream.match(/^[0-9a-zA-Z$\.\_]+/)) { - return "variable-2"; - } - return null; - }; - - // short client keyword token - function hookClient(stream) { - // \N means NULL - // ref: http://dev.mysql.com/doc/refman/5.5/en/null-values.html - if (stream.eat("N")) { - return "atom"; - } - // \g, etc - // ref: http://dev.mysql.com/doc/refman/5.5/en/mysql-commands.html - return stream.match(/^[a-zA-Z.#!?]/) ? "variable-2" : null; - } - - // these keywords are used by all SQL dialects (however, a mode can still overwrite it) - var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from having in insert into is join like not on or order select set table union update values where "; - - // turn a space-separated list into an array - function set(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - // A generic SQL Mode. It's not a standard, it just try to support what is generally supported - CodeMirror.defineMIME("text/x-sql", { - name: "sql", - keywords: set(sqlKeywords + "begin"), - builtin: set("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"), - atoms: set("false true null unknown"), - operatorChars: /^[*+\-%<>!=]/, - dateSQL: set("date time timestamp"), - support: set("ODBCdotTable doubleQuote binaryNumber hexNumber") - }); - - CodeMirror.defineMIME("text/x-mssql", { - name: "sql", - client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"), - keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered"), - builtin: set("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "), - atoms: set("false true null unknown"), - operatorChars: /^[*+\-%<>!=]/, - dateSQL: set("date datetimeoffset datetime2 smalldatetime datetime time"), - hooks: { - "@": hookVar - } - }); - - CodeMirror.defineMIME("text/x-mysql", { - name: "sql", - client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"), - keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group groupby_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"), - builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"), - atoms: set("false true null unknown"), - operatorChars: /^[*+\-%<>!=&|^]/, - dateSQL: set("date time timestamp"), - support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"), - hooks: { - "@": hookVar, - "`": hookIdentifier, - "\\": hookClient - } - }); - - CodeMirror.defineMIME("text/x-mariadb", { - name: "sql", - client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"), - keywords: set(sqlKeywords + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"), - builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"), - atoms: set("false true null unknown"), - operatorChars: /^[*+\-%<>!=&|^]/, - dateSQL: set("date time timestamp"), - support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"), - hooks: { - "@": hookVar, - "`": hookIdentifier, - "\\": hookClient - } - }); - - // the query language used by Apache Cassandra is called CQL, but this mime type - // is called Cassandra to avoid confusion with Contextual Query Language - CodeMirror.defineMIME("text/x-cassandra", { - name: "sql", - client: { }, - keywords: set("use select from using consistency where limit first reversed first and in insert into values using consistency ttl update set delete truncate begin batch apply create keyspace with columnfamily primary key index on drop alter type add any one quorum all local_quorum each_quorum"), - builtin: set("ascii bigint blob boolean counter decimal double float int text timestamp uuid varchar varint"), - atoms: set("false true"), - operatorChars: /^[<>=]/, - dateSQL: { }, - support: set("commentSlashSlash decimallessFloat"), - hooks: { } - }); - - // this is based on Peter Raganitsch's 'plsql' mode - CodeMirror.defineMIME("text/x-plsql", { - name: "sql", - client: set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"), - keywords: set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"), - builtin: set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"), - operatorChars: /^[*+\-%<>!=~]/, - dateSQL: set("date time timestamp"), - support: set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber") - }); - - // Created to support specific hive keywords - CodeMirror.defineMIME("text/x-hive", { - name: "sql", - keywords: set("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with"), - builtin: set("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"), - atoms: set("false true null unknown"), - operatorChars: /^[*+\-%<>!=]/, - dateSQL: set("date timestamp"), - support: set("ODBCdotTable doubleQuote binaryNumber hexNumber") - }); -}()); - -}); - -/* - How Properties of Mime Types are used by SQL Mode - ================================================= - - keywords: - A list of keywords you want to be highlighted. - functions: - A list of function names you want to be highlighted. - builtin: - A list of builtin types you want to be highlighted (if you want types to be of class "builtin" instead of "keyword"). - operatorChars: - All characters that must be handled as operators. - client: - Commands parsed and executed by the client (not the server). - support: - A list of supported syntaxes which are not common, but are supported by more than 1 DBMS. - * ODBCdotTable: .tableName - * zerolessFloat: .1 - * doubleQuote - * nCharCast: N'string' - * charsetCast: _utf8'string' - * commentHash: use # char for comments - * commentSlashSlash: use // for comments - * commentSpaceRequired: require a space after -- for comments - atoms: - Keywords that must be highlighted as atoms,. Some DBMS's support more atoms than others: - UNKNOWN, INFINITY, UNDERFLOW, NaN... - dateSQL: - Used for date/time SQL standard syntax, because not all DBMS's support same temporal types. -*/ diff --git a/kallithea/public/codemirror/mode/stex/stex.js b/kallithea/public/codemirror/mode/stex/stex.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/stex/stex.js +++ /dev/null @@ -1,262 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/* - * Author: Constantin Jucovschi (c.jucovschi@jacobs-university.de) - * Licence: MIT - */ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("stex", function() { - "use strict"; - - function pushCommand(state, command) { - state.cmdState.push(command); - } - - function peekCommand(state) { - if (state.cmdState.length > 0) { - return state.cmdState[state.cmdState.length - 1]; - } else { - return null; - } - } - - function popCommand(state) { - var plug = state.cmdState.pop(); - if (plug) { - plug.closeBracket(); - } - } - - // returns the non-default plugin closest to the end of the list - function getMostPowerful(state) { - var context = state.cmdState; - for (var i = context.length - 1; i >= 0; i--) { - var plug = context[i]; - if (plug.name == "DEFAULT") { - continue; - } - return plug; - } - return { styleIdentifier: function() { return null; } }; - } - - function addPluginPattern(pluginName, cmdStyle, styles) { - return function () { - this.name = pluginName; - this.bracketNo = 0; - this.style = cmdStyle; - this.styles = styles; - this.argument = null; // \begin and \end have arguments that follow. These are stored in the plugin - - this.styleIdentifier = function() { - return this.styles[this.bracketNo - 1] || null; - }; - this.openBracket = function() { - this.bracketNo++; - return "bracket"; - }; - this.closeBracket = function() {}; - }; - } - - var plugins = {}; - - plugins["importmodule"] = addPluginPattern("importmodule", "tag", ["string", "builtin"]); - plugins["documentclass"] = addPluginPattern("documentclass", "tag", ["", "atom"]); - plugins["usepackage"] = addPluginPattern("usepackage", "tag", ["atom"]); - plugins["begin"] = addPluginPattern("begin", "tag", ["atom"]); - plugins["end"] = addPluginPattern("end", "tag", ["atom"]); - - plugins["DEFAULT"] = function () { - this.name = "DEFAULT"; - this.style = "tag"; - - this.styleIdentifier = this.openBracket = this.closeBracket = function() {}; - }; - - function setState(state, f) { - state.f = f; - } - - // called when in a normal (no environment) context - function normal(source, state) { - var plug; - // Do we look like '\command' ? If so, attempt to apply the plugin 'command' - if (source.match(/^\\[a-zA-Z@]+/)) { - var cmdName = source.current().slice(1); - plug = plugins[cmdName] || plugins["DEFAULT"]; - plug = new plug(); - pushCommand(state, plug); - setState(state, beginParams); - return plug.style; - } - - // escape characters - if (source.match(/^\\[$&%#{}_]/)) { - return "tag"; - } - - // white space control characters - if (source.match(/^\\[,;!\/\\]/)) { - return "tag"; - } - - // find if we're starting various math modes - if (source.match("\\[")) { - setState(state, function(source, state){ return inMathMode(source, state, "\\]"); }); - return "keyword"; - } - if (source.match("$$")) { - setState(state, function(source, state){ return inMathMode(source, state, "$$"); }); - return "keyword"; - } - if (source.match("$")) { - setState(state, function(source, state){ return inMathMode(source, state, "$"); }); - return "keyword"; - } - - var ch = source.next(); - if (ch == "%") { - // special case: % at end of its own line; stay in same state - if (!source.eol()) { - setState(state, inCComment); - } - return "comment"; - } - else if (ch == '}' || ch == ']') { - plug = peekCommand(state); - if (plug) { - plug.closeBracket(ch); - setState(state, beginParams); - } else { - return "error"; - } - return "bracket"; - } else if (ch == '{' || ch == '[') { - plug = plugins["DEFAULT"]; - plug = new plug(); - pushCommand(state, plug); - return "bracket"; - } - else if (/\d/.test(ch)) { - source.eatWhile(/[\w.%]/); - return "atom"; - } - else { - source.eatWhile(/[\w\-_]/); - plug = getMostPowerful(state); - if (plug.name == 'begin') { - plug.argument = source.current(); - } - return plug.styleIdentifier(); - } - } - - function inCComment(source, state) { - source.skipToEnd(); - setState(state, normal); - return "comment"; - } - - function inMathMode(source, state, endModeSeq) { - if (source.eatSpace()) { - return null; - } - if (source.match(endModeSeq)) { - setState(state, normal); - return "keyword"; - } - if (source.match(/^\\[a-zA-Z@]+/)) { - return "tag"; - } - if (source.match(/^[a-zA-Z]+/)) { - return "variable-2"; - } - // escape characters - if (source.match(/^\\[$&%#{}_]/)) { - return "tag"; - } - // white space control characters - if (source.match(/^\\[,;!\/]/)) { - return "tag"; - } - // special math-mode characters - if (source.match(/^[\^_&]/)) { - return "tag"; - } - // non-special characters - if (source.match(/^[+\-<>|=,\/@!*:;'"`~#?]/)) { - return null; - } - if (source.match(/^(\d+\.\d*|\d*\.\d+|\d+)/)) { - return "number"; - } - var ch = source.next(); - if (ch == "{" || ch == "}" || ch == "[" || ch == "]" || ch == "(" || ch == ")") { - return "bracket"; - } - - // eat comments here, because inCComment returns us to normal state! - if (ch == "%") { - if (!source.eol()) { - source.skipToEnd(); - } - return "comment"; - } - return "error"; - } - - function beginParams(source, state) { - var ch = source.peek(), lastPlug; - if (ch == '{' || ch == '[') { - lastPlug = peekCommand(state); - lastPlug.openBracket(ch); - source.eat(ch); - setState(state, normal); - return "bracket"; - } - if (/[ \t\r]/.test(ch)) { - source.eat(ch); - return null; - } - setState(state, normal); - popCommand(state); - - return normal(source, state); - } - - return { - startState: function() { - return { - cmdState: [], - f: normal - }; - }, - copyState: function(s) { - return { - cmdState: s.cmdState.slice(), - f: s.f - }; - }, - token: function(stream, state) { - return state.f(stream, state); - }, - lineComment: "%" - }; -}); - -CodeMirror.defineMIME("text/x-stex", "stex"); -CodeMirror.defineMIME("text/x-latex", "stex"); - -}); diff --git a/kallithea/public/codemirror/mode/tcl/tcl.js b/kallithea/public/codemirror/mode/tcl/tcl.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/tcl/tcl.js +++ /dev/null @@ -1,147 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -//tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("tcl", function() { - function parseWords(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - var keywords = parseWords("Tcl safe after append array auto_execok auto_import auto_load " + - "auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror " + - "binary break catch cd close concat continue dde eof encoding error " + - "eval exec exit expr fblocked fconfigure fcopy file fileevent filename " + - "filename flush for foreach format gets glob global history http if " + - "incr info interp join lappend lindex linsert list llength load lrange " + - "lreplace lsearch lset lsort memory msgcat namespace open package parray " + - "pid pkg::create pkg_mkIndex proc puts pwd re_syntax read regex regexp " + - "registry regsub rename resource return scan seek set socket source split " + - "string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord " + - "tcl_wordBreakAfter tcl_startOfPreviousWord tcl_wordBreakBefore tcltest " + - "tclvars tell time trace unknown unset update uplevel upvar variable " + - "vwait"); - var functions = parseWords("if elseif else and not or eq ne in ni for foreach while switch"); - var isOperatorChar = /[+\-*&%=<>!?^\/\|]/; - function chain(stream, state, f) { - state.tokenize = f; - return f(stream, state); - } - function tokenBase(stream, state) { - var beforeParams = state.beforeParams; - state.beforeParams = false; - var ch = stream.next(); - if ((ch == '"' || ch == "'") && state.inParams) - return chain(stream, state, tokenString(ch)); - else if (/[\[\]{}\(\),;\.]/.test(ch)) { - if (ch == "(" && beforeParams) state.inParams = true; - else if (ch == ")") state.inParams = false; - return null; - } - else if (/\d/.test(ch)) { - stream.eatWhile(/[\w\.]/); - return "number"; - } - else if (ch == "#" && stream.eat("*")) { - return chain(stream, state, tokenComment); - } - else if (ch == "#" && stream.match(/ *\[ *\[/)) { - return chain(stream, state, tokenUnparsed); - } - else if (ch == "#" && stream.eat("#")) { - stream.skipToEnd(); - return "comment"; - } - else if (ch == '"') { - stream.skipTo(/"/); - return "comment"; - } - else if (ch == "$") { - stream.eatWhile(/[$_a-z0-9A-Z\.{:]/); - stream.eatWhile(/}/); - state.beforeParams = true; - return "builtin"; - } - else if (isOperatorChar.test(ch)) { - stream.eatWhile(isOperatorChar); - return "comment"; - } - else { - stream.eatWhile(/[\w\$_{}\xa1-\uffff]/); - var word = stream.current().toLowerCase(); - if (keywords && keywords.propertyIsEnumerable(word)) - return "keyword"; - if (functions && functions.propertyIsEnumerable(word)) { - state.beforeParams = true; - return "keyword"; - } - return null; - } - } - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next, end = false; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) { - end = true; - break; - } - escaped = !escaped && next == "\\"; - } - if (end) state.tokenize = tokenBase; - return "string"; - }; - } - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "#" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - function tokenUnparsed(stream, state) { - var maybeEnd = 0, ch; - while (ch = stream.next()) { - if (ch == "#" && maybeEnd == 2) { - state.tokenize = tokenBase; - break; - } - if (ch == "]") - maybeEnd++; - else if (ch != " ") - maybeEnd = 0; - } - return "meta"; - } - return { - startState: function() { - return { - tokenize: tokenBase, - beforeParams: false, - inParams: false - }; - }, - token: function(stream, state) { - if (stream.eatSpace()) return null; - return state.tokenize(stream, state); - } - }; -}); -CodeMirror.defineMIME("text/x-tcl", "tcl"); - -}); diff --git a/kallithea/public/codemirror/mode/textile/textile.js b/kallithea/public/codemirror/mode/textile/textile.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/textile/textile.js +++ /dev/null @@ -1,553 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == 'object' && typeof module == 'object') { // CommonJS - mod(require('../../lib/codemirror')); - } else if (typeof define == 'function' && define.amd) { // AMD - define(['../../lib/codemirror'], mod); - } else { // Plain browser env - mod(CodeMirror); - } -})(function(CodeMirror) { -'use strict'; - -var TOKEN_STYLES = { - addition: 'positive', - attributes: 'attribute', - bold: 'strong', - cite: 'keyword', - code: 'atom', - definitionList: 'number', - deletion: 'negative', - div: 'punctuation', - em: 'em', - footnote: 'variable', - footCite: 'qualifier', - header: 'header', - html: 'comment', - image: 'string', - italic: 'em', - link: 'link', - linkDefinition: 'link', - list1: 'variable-2', - list2: 'variable-3', - list3: 'keyword', - notextile: 'string-2', - pre: 'operator', - p: 'property', - quote: 'bracket', - span: 'quote', - specialChar: 'tag', - strong: 'strong', - sub: 'builtin', - sup: 'builtin', - table: 'variable-3', - tableHeading: 'operator' -}; - -function Parser(regExpFactory, state, stream) { - this.regExpFactory = regExpFactory; - this.state = state; - this.stream = stream; - this.styles = TOKEN_STYLES; - - this.state.specialChar = null; -} - -Parser.prototype.eat = function(name) { - return this.stream.match(this.regExpFactory.pattern(name), true); -}; - -Parser.prototype.check = function(name) { - return this.stream.match(this.regExpFactory.pattern(name), false); -}; - -Parser.prototype.setModeForNextToken = function(mode) { - return this.state.mode = mode; -}; - -Parser.prototype.execMode = function(newMode) { - return this.setModeForNextToken(newMode).call(this); -}; - -Parser.prototype.startNewLine = function() { - this.setModeForNextToken(Modes.newLayout); - this.state.tableHeading = false; - - if (this.state.layoutType === 'definitionList' && this.state.spanningLayout) { - if (this.check('definitionListEnd')) { - this.state.spanningLayout = false; - } - } -}; - -Parser.prototype.nextToken = function() { - return this.state.mode.call(this); -}; - -Parser.prototype.styleFor = function(token) { - if (this.styles.hasOwnProperty(token)) { - return this.styles[token]; - } - throw 'unknown token'; -}; - -Parser.prototype.handlePhraseModifier = function(ch) { - if (ch === '_') { - if (this.stream.eat('_')) { - return this.togglePhraseModifier('italic', /^.*__/); - } - return this.togglePhraseModifier('em', /^.*_/); - } - - if (ch === '*') { - if (this.stream.eat('*')) { - return this.togglePhraseModifier('bold', /^.*\*\*/); - } - return this.togglePhraseModifier('strong', /^.*\*/); - } - - if (ch === '[') { - if (this.stream.match(/\d+\]/)) { - this.state.footCite = true; - } - return this.tokenStyles(); - } - - if (ch === '(') { - if (this.stream.match('r)')) { - this.state.specialChar = 'r'; - } else if (this.stream.match('tm)')) { - this.state.specialChar = 'tm'; - } else if (this.stream.match('c)')) { - this.state.specialChar = 'c'; - } - return this.tokenStyles(); - } - - if (ch === '<') { - if (this.stream.match(/(\w+)[^>]+>[^<]+<\/\1>/)) { - return this.tokenStylesWith(this.styleFor('html')); - } - } - - if (ch === '?' && this.stream.eat('?')) { - return this.togglePhraseModifier('cite', /^.*\?\?/); - } - if (ch === '=' && this.stream.eat('=')) { - return this.togglePhraseModifier('notextile', /^.*==/); - } - if (ch === '-') { - return this.togglePhraseModifier('deletion', /^.*-/); - } - if (ch === '+') { - return this.togglePhraseModifier('addition', /^.*\+/); - } - if (ch === '~') { - return this.togglePhraseModifier('sub', /^.*~/); - } - if (ch === '^') { - return this.togglePhraseModifier('sup', /^.*\^/); - } - if (ch === '%') { - return this.togglePhraseModifier('span', /^.*%/); - } - if (ch === '@') { - return this.togglePhraseModifier('code', /^.*@/); - } - if (ch === '!') { - var type = this.togglePhraseModifier('image', /^.*(?:\([^\)]+\))?!/); - this.stream.match(/^:\S+/); // optional Url portion - return type; - } - return this.tokenStyles(); -}; - -Parser.prototype.togglePhraseModifier = function(phraseModifier, closeRE) { - if (this.state[phraseModifier]) { // remove phrase modifier - var type = this.tokenStyles(); - this.state[phraseModifier] = false; - return type; - } - if (this.stream.match(closeRE, false)) { // add phrase modifier - this.state[phraseModifier] = true; - this.setModeForNextToken(Modes.attributes); - } - return this.tokenStyles(); -}; - -Parser.prototype.tokenStyles = function() { - var disabled = this.textileDisabled(), - styles = []; - - if (disabled) return disabled; - - if (this.state.layoutType) { - styles.push(this.styleFor(this.state.layoutType)); - } - - styles = styles.concat(this.activeStyles('addition', 'bold', 'cite', 'code', - 'deletion', 'em', 'footCite', 'image', 'italic', 'link', 'span', 'specialChar', 'strong', - 'sub', 'sup', 'table', 'tableHeading')); - - if (this.state.layoutType === 'header') { - styles.push(this.styleFor('header') + '-' + this.state.header); - } - return styles.length ? styles.join(' ') : null; -}; - -Parser.prototype.textileDisabled = function() { - var type = this.state.layoutType; - - switch(type) { - case 'notextile': - case 'code': - case 'pre': - return this.styleFor(type); - default: - if (this.state.notextile) { - return this.styleFor('notextile') + (type ? (' ' + this.styleFor(type)) : ''); - } - - return null; - } -}; - -Parser.prototype.tokenStylesWith = function(extraStyles) { - var disabled = this.textileDisabled(), - type; - - if (disabled) return disabled; - - type = this.tokenStyles(); - if(extraStyles) { - return type ? (type + ' ' + extraStyles) : extraStyles; - } - return type; -}; - -Parser.prototype.activeStyles = function() { - var styles = [], - i; - for (i = 0; i < arguments.length; ++i) { - if (this.state[arguments[i]]) { - styles.push(this.styleFor(arguments[i])); - } - } - return styles; -}; - -Parser.prototype.blankLine = function() { - var spanningLayout = this.state.spanningLayout, - type = this.state.layoutType, - key; - - for (key in this.state) { - if (this.state.hasOwnProperty(key)) { - delete this.state[key]; - } - } - - this.setModeForNextToken(Modes.newLayout); - if (spanningLayout) { - this.state.layoutType = type; - this.state.spanningLayout = true; - } -}; - - -function RegExpFactory() { - this.cache = {}; - this.single = { - bc: 'bc', - bq: 'bq', - definitionList: /- [^(?::=)]+:=+/, - definitionListEnd: /.*=:\s*$/, - div: 'div', - drawTable: /\|.*\|/, - foot: /fn\d+/, - header: /h[1-6]/, - html: /\s*<(?:\/)?(\w+)(?:[^>]+)?>(?:[^<]+<\/\1>)?/, - link: /[^"]+":\S/, - linkDefinition: /\[[^\s\]]+\]\S+/, - list: /(?:#+|\*+)/, - notextile: 'notextile', - para: 'p', - pre: 'pre', - table: 'table', - tableCellAttributes: /[/\\]\d+/, - tableHeading: /\|_\./, - tableText: /[^"_\*\[\(\?\+~\^%@|-]+/, - text: /[^!"_=\*\[\(<\?\+~\^%@-]+/ - }; - this.attributes = { - align: /(?:<>|<|>|=)/, - selector: /\([^\(][^\)]+\)/, - lang: /\[[^\[\]]+\]/, - pad: /(?:\(+|\)+){1,2}/, - css: /\{[^\}]+\}/ - }; -} - -RegExpFactory.prototype.pattern = function(name) { - return (this.cache[name] || this.createRe(name)); -}; - -RegExpFactory.prototype.createRe = function(name) { - switch (name) { - case 'drawTable': - return this.makeRe('^', this.single.drawTable, '$'); - case 'html': - return this.makeRe('^', this.single.html, '(?:', this.single.html, ')*', '$'); - case 'linkDefinition': - return this.makeRe('^', this.single.linkDefinition, '$'); - case 'listLayout': - return this.makeRe('^', this.single.list, this.pattern('allAttributes'), '*\\s+'); - case 'tableCellAttributes': - return this.makeRe('^', this.choiceRe(this.single.tableCellAttributes, - this.pattern('allAttributes')), '+\\.'); - case 'type': - return this.makeRe('^', this.pattern('allTypes')); - case 'typeLayout': - return this.makeRe('^', this.pattern('allTypes'), this.pattern('allAttributes'), - '*\\.\\.?', '(\\s+|$)'); - case 'attributes': - return this.makeRe('^', this.pattern('allAttributes'), '+'); - - case 'allTypes': - return this.choiceRe(this.single.div, this.single.foot, - this.single.header, this.single.bc, this.single.bq, - this.single.notextile, this.single.pre, this.single.table, - this.single.para); - - case 'allAttributes': - return this.choiceRe(this.attributes.selector, this.attributes.css, - this.attributes.lang, this.attributes.align, this.attributes.pad); - - default: - return this.makeRe('^', this.single[name]); - } -}; - - -RegExpFactory.prototype.makeRe = function() { - var pattern = '', - i, - arg; - - for (i = 0; i < arguments.length; ++i) { - arg = arguments[i]; - pattern += (typeof arg === 'string') ? arg : arg.source; - } - return new RegExp(pattern); -}; - -RegExpFactory.prototype.choiceRe = function() { - var parts = [arguments[0]], - i; - - for (i = 1; i < arguments.length; ++i) { - parts[i * 2 - 1] = '|'; - parts[i * 2] = arguments[i]; - } - - parts.unshift('(?:'); - parts.push(')'); - return this.makeRe.apply(this, parts); -}; - - -var Modes = { - newLayout: function() { - if (this.check('typeLayout')) { - this.state.spanningLayout = false; - return this.execMode(Modes.blockType); - } - if (!this.textileDisabled()) { - if (this.check('listLayout')) { - return this.execMode(Modes.list); - } else if (this.check('drawTable')) { - return this.execMode(Modes.table); - } else if (this.check('linkDefinition')) { - return this.execMode(Modes.linkDefinition); - } else if (this.check('definitionList')) { - return this.execMode(Modes.definitionList); - } else if (this.check('html')) { - return this.execMode(Modes.html); - } - } - return this.execMode(Modes.text); - }, - - blockType: function() { - var match, - type; - this.state.layoutType = null; - - if (match = this.eat('type')) { - type = match[0]; - } else { - return this.execMode(Modes.text); - } - - if(match = type.match(this.regExpFactory.pattern('header'))) { - this.state.layoutType = 'header'; - this.state.header = parseInt(match[0][1]); - } else if (type.match(this.regExpFactory.pattern('bq'))) { - this.state.layoutType = 'quote'; - } else if (type.match(this.regExpFactory.pattern('bc'))) { - this.state.layoutType = 'code'; - } else if (type.match(this.regExpFactory.pattern('foot'))) { - this.state.layoutType = 'footnote'; - } else if (type.match(this.regExpFactory.pattern('notextile'))) { - this.state.layoutType = 'notextile'; - } else if (type.match(this.regExpFactory.pattern('pre'))) { - this.state.layoutType = 'pre'; - } else if (type.match(this.regExpFactory.pattern('div'))) { - this.state.layoutType = 'div'; - } else if (type.match(this.regExpFactory.pattern('table'))) { - this.state.layoutType = 'table'; - } - - this.setModeForNextToken(Modes.attributes); - return this.tokenStyles(); - }, - - text: function() { - if (this.eat('text')) { - return this.tokenStyles(); - } - - var ch = this.stream.next(); - - if (ch === '"') { - return this.execMode(Modes.link); - } - return this.handlePhraseModifier(ch); - }, - - attributes: function() { - this.setModeForNextToken(Modes.layoutLength); - - if (this.eat('attributes')) { - return this.tokenStylesWith(this.styleFor('attributes')); - } - return this.tokenStyles(); - }, - - layoutLength: function() { - if (this.stream.eat('.') && this.stream.eat('.')) { - this.state.spanningLayout = true; - } - - this.setModeForNextToken(Modes.text); - return this.tokenStyles(); - }, - - list: function() { - var match = this.eat('list'), - listMod; - this.state.listDepth = match[0].length; - listMod = (this.state.listDepth - 1) % 3; - if (!listMod) { - this.state.layoutType = 'list1'; - } else if (listMod === 1) { - this.state.layoutType = 'list2'; - } else { - this.state.layoutType = 'list3'; - } - this.setModeForNextToken(Modes.attributes); - return this.tokenStyles(); - }, - - link: function() { - this.setModeForNextToken(Modes.text); - if (this.eat('link')) { - this.stream.match(/\S+/); - return this.tokenStylesWith(this.styleFor('link')); - } - return this.tokenStyles(); - }, - - linkDefinition: function() { - this.stream.skipToEnd(); - return this.tokenStylesWith(this.styleFor('linkDefinition')); - }, - - definitionList: function() { - this.eat('definitionList'); - - this.state.layoutType = 'definitionList'; - - if (this.stream.match(/\s*$/)) { - this.state.spanningLayout = true; - } else { - this.setModeForNextToken(Modes.attributes); - } - return this.tokenStyles(); - }, - - html: function() { - this.stream.skipToEnd(); - return this.tokenStylesWith(this.styleFor('html')); - }, - - table: function() { - this.state.layoutType = 'table'; - return this.execMode(Modes.tableCell); - }, - - tableCell: function() { - if (this.eat('tableHeading')) { - this.state.tableHeading = true; - } else { - this.stream.eat('|'); - } - this.setModeForNextToken(Modes.tableCellAttributes); - return this.tokenStyles(); - }, - - tableCellAttributes: function() { - this.setModeForNextToken(Modes.tableText); - - if (this.eat('tableCellAttributes')) { - return this.tokenStylesWith(this.styleFor('attributes')); - } - return this.tokenStyles(); - }, - - tableText: function() { - if (this.eat('tableText')) { - return this.tokenStyles(); - } - - if (this.stream.peek() === '|') { // end of cell - this.setModeForNextToken(Modes.tableCell); - return this.tokenStyles(); - } - return this.handlePhraseModifier(this.stream.next()); - } -}; - - -CodeMirror.defineMode('textile', function() { - var regExpFactory = new RegExpFactory(); - - return { - startState: function() { - return { mode: Modes.newLayout }; - }, - token: function(stream, state) { - var parser = new Parser(regExpFactory, state, stream); - if (stream.sol()) { parser.startNewLine(); } - return parser.nextToken(); - }, - blankLine: function(state) { - new Parser(regExpFactory, state).blankLine(); - } - }; -}); - -CodeMirror.defineMIME('text/x-textile', 'textile'); -}); diff --git a/kallithea/public/codemirror/mode/tiddlywiki/tiddlywiki.css b/kallithea/public/codemirror/mode/tiddlywiki/tiddlywiki.css deleted file mode 100644 --- a/kallithea/public/codemirror/mode/tiddlywiki/tiddlywiki.css +++ /dev/null @@ -1,14 +0,0 @@ -span.cm-underlined { - text-decoration: underline; -} -span.cm-strikethrough { - text-decoration: line-through; -} -span.cm-brace { - color: #170; - font-weight: bold; -} -span.cm-table { - color: blue; - font-weight: bold; -} diff --git a/kallithea/public/codemirror/mode/tiddlywiki/tiddlywiki.js b/kallithea/public/codemirror/mode/tiddlywiki/tiddlywiki.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/tiddlywiki/tiddlywiki.js +++ /dev/null @@ -1,369 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/*** - |''Name''|tiddlywiki.js| - |''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror| - |''Author''|PMario| - |''Version''|0.1.7| - |''Status''|''stable''| - |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]| - |''Documentation''|http://codemirror.tiddlyspace.com/| - |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]| - |''CoreVersion''|2.5.0| - |''Requires''|codemirror.js| - |''Keywords''|syntax highlighting color code mirror codemirror| - ! Info - CoreVersion parameter is needed for TiddlyWiki only! -***/ -//{{{ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("tiddlywiki", function () { - // Tokenizer - var textwords = {}; - - var keywords = function () { - function kw(type) { - return { type: type, style: "macro"}; - } - return { - "allTags": kw('allTags'), "closeAll": kw('closeAll'), "list": kw('list'), - "newJournal": kw('newJournal'), "newTiddler": kw('newTiddler'), - "permaview": kw('permaview'), "saveChanges": kw('saveChanges'), - "search": kw('search'), "slider": kw('slider'), "tabs": kw('tabs'), - "tag": kw('tag'), "tagging": kw('tagging'), "tags": kw('tags'), - "tiddler": kw('tiddler'), "timeline": kw('timeline'), - "today": kw('today'), "version": kw('version'), "option": kw('option'), - - "with": kw('with'), - "filter": kw('filter') - }; - }(); - - var isSpaceName = /[\w_\-]/i, - reHR = /^\-\-\-\-+$/, //
- reWikiCommentStart = /^\/\*\*\*$/, // /*** - reWikiCommentStop = /^\*\*\*\/$/, // ***/ - reBlockQuote = /^<<<$/, - - reJsCodeStart = /^\/\/\{\{\{$/, // //{{{ js block start - reJsCodeStop = /^\/\/\}\}\}$/, // //}}} js stop - reXmlCodeStart = /^$/, // xml block start - reXmlCodeStop = /^$/, // xml stop - - reCodeBlockStart = /^\{\{\{$/, // {{{ TW text div block start - reCodeBlockStop = /^\}\}\}$/, // }}} TW text stop - - reUntilCodeStop = /.*?\}\}\}/; - - function chain(stream, state, f) { - state.tokenize = f; - return f(stream, state); - } - - // Used as scratch variables to communicate multiple values without - // consing up tons of objects. - var type, content; - - function ret(tp, style, cont) { - type = tp; - content = cont; - return style; - } - - function jsTokenBase(stream, state) { - var sol = stream.sol(), ch; - - state.block = false; // indicates the start of a code block. - - ch = stream.peek(); // don't eat, to make matching simpler - - // check start of blocks - if (sol && /[<\/\*{}\-]/.test(ch)) { - if (stream.match(reCodeBlockStart)) { - state.block = true; - return chain(stream, state, twTokenCode); - } - if (stream.match(reBlockQuote)) { - return ret('quote', 'quote'); - } - if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) { - return ret('code', 'comment'); - } - if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) { - return ret('code', 'comment'); - } - if (stream.match(reHR)) { - return ret('hr', 'hr'); - } - } // sol - ch = stream.next(); - - if (sol && /[\/\*!#;:>|]/.test(ch)) { - if (ch == "!") { // tw header - stream.skipToEnd(); - return ret("header", "header"); - } - if (ch == "*") { // tw list - stream.eatWhile('*'); - return ret("list", "comment"); - } - if (ch == "#") { // tw numbered list - stream.eatWhile('#'); - return ret("list", "comment"); - } - if (ch == ";") { // definition list, term - stream.eatWhile(';'); - return ret("list", "comment"); - } - if (ch == ":") { // definition list, description - stream.eatWhile(':'); - return ret("list", "comment"); - } - if (ch == ">") { // single line quote - stream.eatWhile(">"); - return ret("quote", "quote"); - } - if (ch == '|') { - return ret('table', 'header'); - } - } - - if (ch == '{' && stream.match(/\{\{/)) { - return chain(stream, state, twTokenCode); - } - - // rudimentary html:// file:// link matching. TW knows much more ... - if (/[hf]/i.test(ch)) { - if (/[ti]/i.test(stream.peek()) && stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i)) { - return ret("link", "link"); - } - } - // just a little string indicator, don't want to have the whole string covered - if (ch == '"') { - return ret('string', 'string'); - } - if (ch == '~') { // _no_ CamelCase indicator should be bold - return ret('text', 'brace'); - } - if (/[\[\]]/.test(ch)) { // check for [[..]] - if (stream.peek() == ch) { - stream.next(); - return ret('brace', 'brace'); - } - } - if (ch == "@") { // check for space link. TODO fix @@...@@ highlighting - stream.eatWhile(isSpaceName); - return ret("link", "link"); - } - if (/\d/.test(ch)) { // numbers - stream.eatWhile(/\d/); - return ret("number", "number"); - } - if (ch == "/") { // tw invisible comment - if (stream.eat("%")) { - return chain(stream, state, twTokenComment); - } - else if (stream.eat("/")) { // - return chain(stream, state, twTokenEm); - } - } - if (ch == "_") { // tw underline - if (stream.eat("_")) { - return chain(stream, state, twTokenUnderline); - } - } - // strikethrough and mdash handling - if (ch == "-") { - if (stream.eat("-")) { - // if strikethrough looks ugly, change CSS. - if (stream.peek() != ' ') - return chain(stream, state, twTokenStrike); - // mdash - if (stream.peek() == ' ') - return ret('text', 'brace'); - } - } - if (ch == "'") { // tw bold - if (stream.eat("'")) { - return chain(stream, state, twTokenStrong); - } - } - if (ch == "<") { // tw macro - if (stream.eat("<")) { - return chain(stream, state, twTokenMacro); - } - } - else { - return ret(ch); - } - - // core macro handling - stream.eatWhile(/[\w\$_]/); - var word = stream.current(), - known = textwords.propertyIsEnumerable(word) && textwords[word]; - - return known ? ret(known.type, known.style, word) : ret("text", null, word); - - } // jsTokenBase() - - // tw invisible comment - function twTokenComment(stream, state) { - var maybeEnd = false, - ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = jsTokenBase; - break; - } - maybeEnd = (ch == "%"); - } - return ret("comment", "comment"); - } - - // tw strong / bold - function twTokenStrong(stream, state) { - var maybeEnd = false, - ch; - while (ch = stream.next()) { - if (ch == "'" && maybeEnd) { - state.tokenize = jsTokenBase; - break; - } - maybeEnd = (ch == "'"); - } - return ret("text", "strong"); - } - - // tw code - function twTokenCode(stream, state) { - var ch, sb = state.block; - - if (sb && stream.current()) { - return ret("code", "comment"); - } - - if (!sb && stream.match(reUntilCodeStop)) { - state.tokenize = jsTokenBase; - return ret("code", "comment"); - } - - if (sb && stream.sol() && stream.match(reCodeBlockStop)) { - state.tokenize = jsTokenBase; - return ret("code", "comment"); - } - - ch = stream.next(); - return (sb) ? ret("code", "comment") : ret("code", "comment"); - } - - // tw em / italic - function twTokenEm(stream, state) { - var maybeEnd = false, - ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = jsTokenBase; - break; - } - maybeEnd = (ch == "/"); - } - return ret("text", "em"); - } - - // tw underlined text - function twTokenUnderline(stream, state) { - var maybeEnd = false, - ch; - while (ch = stream.next()) { - if (ch == "_" && maybeEnd) { - state.tokenize = jsTokenBase; - break; - } - maybeEnd = (ch == "_"); - } - return ret("text", "underlined"); - } - - // tw strike through text looks ugly - // change CSS if needed - function twTokenStrike(stream, state) { - var maybeEnd = false, ch; - - while (ch = stream.next()) { - if (ch == "-" && maybeEnd) { - state.tokenize = jsTokenBase; - break; - } - maybeEnd = (ch == "-"); - } - return ret("text", "strikethrough"); - } - - // macro - function twTokenMacro(stream, state) { - var ch, word, known; - - if (stream.current() == '<<') { - return ret('brace', 'macro'); - } - - ch = stream.next(); - if (!ch) { - state.tokenize = jsTokenBase; - return ret(ch); - } - if (ch == ">") { - if (stream.peek() == '>') { - stream.next(); - state.tokenize = jsTokenBase; - return ret("brace", "macro"); - } - } - - stream.eatWhile(/[\w\$_]/); - word = stream.current(); - known = keywords.propertyIsEnumerable(word) && keywords[word]; - - if (known) { - return ret(known.type, known.style, word); - } - else { - return ret("macro", null, word); - } - } - - // Interface - return { - startState: function () { - return { - tokenize: jsTokenBase, - indented: 0, - level: 0 - }; - }, - - token: function (stream, state) { - if (stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - return style; - }, - - electricChars: "" - }; -}); - -CodeMirror.defineMIME("text/x-tiddlywiki", "tiddlywiki"); -}); - -//}}} diff --git a/kallithea/public/codemirror/mode/tiki/tiki.css b/kallithea/public/codemirror/mode/tiki/tiki.css deleted file mode 100644 --- a/kallithea/public/codemirror/mode/tiki/tiki.css +++ /dev/null @@ -1,26 +0,0 @@ -.cm-tw-syntaxerror { - color: #FFF; - background-color: #900; -} - -.cm-tw-deleted { - text-decoration: line-through; -} - -.cm-tw-header5 { - font-weight: bold; -} -.cm-tw-listitem:first-child { /*Added first child to fix duplicate padding when highlighting*/ - padding-left: 10px; -} - -.cm-tw-box { - border-top-width: 0px ! important; - border-style: solid; - border-width: 1px; - border-color: inherit; -} - -.cm-tw-underline { - text-decoration: underline; -} \ No newline at end of file diff --git a/kallithea/public/codemirror/mode/tiki/tiki.js b/kallithea/public/codemirror/mode/tiki/tiki.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/tiki/tiki.js +++ /dev/null @@ -1,323 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode('tiki', function(config) { - function inBlock(style, terminator, returnTokenizer) { - return function(stream, state) { - while (!stream.eol()) { - if (stream.match(terminator)) { - state.tokenize = inText; - break; - } - stream.next(); - } - - if (returnTokenizer) state.tokenize = returnTokenizer; - - return style; - }; - } - - function inLine(style) { - return function(stream, state) { - while(!stream.eol()) { - stream.next(); - } - state.tokenize = inText; - return style; - }; - } - - function inText(stream, state) { - function chain(parser) { - state.tokenize = parser; - return parser(stream, state); - } - - var sol = stream.sol(); - var ch = stream.next(); - - //non start of line - switch (ch) { //switch is generally much faster than if, so it is used here - case "{": //plugin - stream.eat("/"); - stream.eatSpace(); - var tagName = ""; - var c; - while ((c = stream.eat(/[^\s\u00a0=\"\'\/?(}]/))) tagName += c; - state.tokenize = inPlugin; - return "tag"; - break; - case "_": //bold - if (stream.eat("_")) { - return chain(inBlock("strong", "__", inText)); - } - break; - case "'": //italics - if (stream.eat("'")) { - // Italic text - return chain(inBlock("em", "''", inText)); - } - break; - case "(":// Wiki Link - if (stream.eat("(")) { - return chain(inBlock("variable-2", "))", inText)); - } - break; - case "[":// Weblink - return chain(inBlock("variable-3", "]", inText)); - break; - case "|": //table - if (stream.eat("|")) { - return chain(inBlock("comment", "||")); - } - break; - case "-": - if (stream.eat("=")) {//titleBar - return chain(inBlock("header string", "=-", inText)); - } else if (stream.eat("-")) {//deleted - return chain(inBlock("error tw-deleted", "--", inText)); - } - break; - case "=": //underline - if (stream.match("==")) { - return chain(inBlock("tw-underline", "===", inText)); - } - break; - case ":": - if (stream.eat(":")) { - return chain(inBlock("comment", "::")); - } - break; - case "^": //box - return chain(inBlock("tw-box", "^")); - break; - case "~": //np - if (stream.match("np~")) { - return chain(inBlock("meta", "~/np~")); - } - break; - } - - //start of line types - if (sol) { - switch (ch) { - case "!": //header at start of line - if (stream.match('!!!!!')) { - return chain(inLine("header string")); - } else if (stream.match('!!!!')) { - return chain(inLine("header string")); - } else if (stream.match('!!!')) { - return chain(inLine("header string")); - } else if (stream.match('!!')) { - return chain(inLine("header string")); - } else { - return chain(inLine("header string")); - } - break; - case "*": //unordered list line item, or
  • at start of line - case "#": //ordered list line item, or
  • at start of line - case "+": //ordered list line item, or
  • at start of line - return chain(inLine("tw-listitem bracket")); - break; - } - } - - //stream.eatWhile(/[&{]/); was eating up plugins, turned off to act less like html and more like tiki - return null; - } - - var indentUnit = config.indentUnit; - - // Return variables for tokenizers - var pluginName, type; - function inPlugin(stream, state) { - var ch = stream.next(); - var peek = stream.peek(); - - if (ch == "}") { - state.tokenize = inText; - //type = ch == ")" ? "endPlugin" : "selfclosePlugin"; inPlugin - return "tag"; - } else if (ch == "(" || ch == ")") { - return "bracket"; - } else if (ch == "=") { - type = "equals"; - - if (peek == ">") { - ch = stream.next(); - peek = stream.peek(); - } - - //here we detect values directly after equal character with no quotes - if (!/[\'\"]/.test(peek)) { - state.tokenize = inAttributeNoQuote(); - } - //end detect values - - return "operator"; - } else if (/[\'\"]/.test(ch)) { - state.tokenize = inAttribute(ch); - return state.tokenize(stream, state); - } else { - stream.eatWhile(/[^\s\u00a0=\"\'\/?]/); - return "keyword"; - } - } - - function inAttribute(quote) { - return function(stream, state) { - while (!stream.eol()) { - if (stream.next() == quote) { - state.tokenize = inPlugin; - break; - } - } - return "string"; - }; - } - - function inAttributeNoQuote() { - return function(stream, state) { - while (!stream.eol()) { - var ch = stream.next(); - var peek = stream.peek(); - if (ch == " " || ch == "," || /[ )}]/.test(peek)) { - state.tokenize = inPlugin; - break; - } - } - return "string"; -}; - } - -var curState, setStyle; -function pass() { - for (var i = arguments.length - 1; i >= 0; i--) curState.cc.push(arguments[i]); -} - -function cont() { - pass.apply(null, arguments); - return true; -} - -function pushContext(pluginName, startOfLine) { - var noIndent = curState.context && curState.context.noIndent; - curState.context = { - prev: curState.context, - pluginName: pluginName, - indent: curState.indented, - startOfLine: startOfLine, - noIndent: noIndent - }; -} - -function popContext() { - if (curState.context) curState.context = curState.context.prev; -} - -function element(type) { - if (type == "openPlugin") {curState.pluginName = pluginName; return cont(attributes, endplugin(curState.startOfLine));} - else if (type == "closePlugin") { - var err = false; - if (curState.context) { - err = curState.context.pluginName != pluginName; - popContext(); - } else { - err = true; - } - if (err) setStyle = "error"; - return cont(endcloseplugin(err)); - } - else if (type == "string") { - if (!curState.context || curState.context.name != "!cdata") pushContext("!cdata"); - if (curState.tokenize == inText) popContext(); - return cont(); - } - else return cont(); -} - -function endplugin(startOfLine) { - return function(type) { - if ( - type == "selfclosePlugin" || - type == "endPlugin" - ) - return cont(); - if (type == "endPlugin") {pushContext(curState.pluginName, startOfLine); return cont();} - return cont(); - }; -} - -function endcloseplugin(err) { - return function(type) { - if (err) setStyle = "error"; - if (type == "endPlugin") return cont(); - return pass(); - }; -} - -function attributes(type) { - if (type == "keyword") {setStyle = "attribute"; return cont(attributes);} - if (type == "equals") return cont(attvalue, attributes); - return pass(); -} -function attvalue(type) { - if (type == "keyword") {setStyle = "string"; return cont();} - if (type == "string") return cont(attvaluemaybe); - return pass(); -} -function attvaluemaybe(type) { - if (type == "string") return cont(attvaluemaybe); - else return pass(); -} -return { - startState: function() { - return {tokenize: inText, cc: [], indented: 0, startOfLine: true, pluginName: null, context: null}; - }, - token: function(stream, state) { - if (stream.sol()) { - state.startOfLine = true; - state.indented = stream.indentation(); - } - if (stream.eatSpace()) return null; - - setStyle = type = pluginName = null; - var style = state.tokenize(stream, state); - if ((style || type) && style != "comment") { - curState = state; - while (true) { - var comb = state.cc.pop() || element; - if (comb(type || style)) break; - } - } - state.startOfLine = false; - return setStyle || style; - }, - indent: function(state, textAfter) { - var context = state.context; - if (context && context.noIndent) return 0; - if (context && /^{\//.test(textAfter)) - context = context.prev; - while (context && !context.startOfLine) - context = context.prev; - if (context) return context.indent + indentUnit; - else return 0; - }, - electricChars: "/" - }; -}); - -CodeMirror.defineMIME("text/tiki", "tiki"); - -}); diff --git a/kallithea/public/codemirror/mode/toml/toml.js b/kallithea/public/codemirror/mode/toml/toml.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/toml/toml.js +++ /dev/null @@ -1,88 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("toml", function () { - return { - startState: function () { - return { - inString: false, - stringType: "", - lhs: true, - inArray: 0 - }; - }, - token: function (stream, state) { - //check for state changes - if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) { - state.stringType = stream.peek(); - stream.next(); // Skip quote - state.inString = true; // Update state - } - if (stream.sol() && state.inArray === 0) { - state.lhs = true; - } - //return state - if (state.inString) { - while (state.inString && !stream.eol()) { - if (stream.peek() === state.stringType) { - stream.next(); // Skip quote - state.inString = false; // Clear flag - } else if (stream.peek() === '\\') { - stream.next(); - stream.next(); - } else { - stream.match(/^.[^\\\"\']*/); - } - } - return state.lhs ? "property string" : "string"; // Token style - } else if (state.inArray && stream.peek() === ']') { - stream.next(); - state.inArray--; - return 'bracket'; - } else if (state.lhs && stream.peek() === '[' && stream.skipTo(']')) { - stream.next();//skip closing ] - // array of objects has an extra open & close [] - if (stream.peek() === ']') stream.next(); - return "atom"; - } else if (stream.peek() === "#") { - stream.skipToEnd(); - return "comment"; - } else if (stream.eatSpace()) { - return null; - } else if (state.lhs && stream.eatWhile(function (c) { return c != '=' && c != ' '; })) { - return "property"; - } else if (state.lhs && stream.peek() === "=") { - stream.next(); - state.lhs = false; - return null; - } else if (!state.lhs && stream.match(/^\d\d\d\d[\d\-\:\.T]*Z/)) { - return 'atom'; //date - } else if (!state.lhs && (stream.match('true') || stream.match('false'))) { - return 'atom'; - } else if (!state.lhs && stream.peek() === '[') { - state.inArray++; - stream.next(); - return 'bracket'; - } else if (!state.lhs && stream.match(/^\-?\d+(?:\.\d+)?/)) { - return 'number'; - } else if (!stream.eatSpace()) { - stream.next(); - } - return null; - } - }; -}); - -CodeMirror.defineMIME('text/x-toml', 'toml'); - -}); diff --git a/kallithea/public/codemirror/mode/tornado/tornado.js b/kallithea/public/codemirror/mode/tornado/tornado.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/tornado/tornado.js +++ /dev/null @@ -1,68 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), - require("../../addon/mode/overlay")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror", "../htmlmixed/htmlmixed", - "../../addon/mode/overlay"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { - "use strict"; - - CodeMirror.defineMode("tornado:inner", function() { - var keywords = ["and","as","assert","autoescape","block","break","class","comment","context", - "continue","datetime","def","del","elif","else","end","escape","except", - "exec","extends","false","finally","for","from","global","if","import","in", - "include","is","json_encode","lambda","length","linkify","load","module", - "none","not","or","pass","print","put","raise","raw","return","self","set", - "squeeze","super","true","try","url_escape","while","with","without","xhtml_escape","yield"]; - keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b"); - - function tokenBase (stream, state) { - stream.eatWhile(/[^\{]/); - var ch = stream.next(); - if (ch == "{") { - if (ch = stream.eat(/\{|%|#/)) { - state.tokenize = inTag(ch); - return "tag"; - } - } - } - function inTag (close) { - if (close == "{") { - close = "}"; - } - return function (stream, state) { - var ch = stream.next(); - if ((ch == close) && stream.eat("}")) { - state.tokenize = tokenBase; - return "tag"; - } - if (stream.match(keywords)) { - return "keyword"; - } - return close == "#" ? "comment" : "string"; - }; - } - return { - startState: function () { - return {tokenize: tokenBase}; - }, - token: function (stream, state) { - return state.tokenize(stream, state); - } - }; - }); - - CodeMirror.defineMode("tornado", function(config) { - var htmlBase = CodeMirror.getMode(config, "text/html"); - var tornadoInner = CodeMirror.getMode(config, "tornado:inner"); - return CodeMirror.overlayMode(htmlBase, tornadoInner); - }); - - CodeMirror.defineMIME("text/x-tornado", "tornado"); -}); diff --git a/kallithea/public/codemirror/mode/turtle/turtle.js b/kallithea/public/codemirror/mode/turtle/turtle.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/turtle/turtle.js +++ /dev/null @@ -1,160 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("turtle", function(config) { - var indentUnit = config.indentUnit; - var curPunc; - - function wordRegexp(words) { - return new RegExp("^(?:" + words.join("|") + ")$", "i"); - } - var ops = wordRegexp([]); - var keywords = wordRegexp(["@prefix", "@base", "a"]); - var operatorChars = /[*+\-<>=&|]/; - - function tokenBase(stream, state) { - var ch = stream.next(); - curPunc = null; - if (ch == "<" && !stream.match(/^[\s\u00a0=]/, false)) { - stream.match(/^[^\s\u00a0>]*>?/); - return "atom"; - } - else if (ch == "\"" || ch == "'") { - state.tokenize = tokenLiteral(ch); - return state.tokenize(stream, state); - } - else if (/[{}\(\),\.;\[\]]/.test(ch)) { - curPunc = ch; - return null; - } - else if (ch == "#") { - stream.skipToEnd(); - return "comment"; - } - else if (operatorChars.test(ch)) { - stream.eatWhile(operatorChars); - return null; - } - else if (ch == ":") { - return "operator"; - } else { - stream.eatWhile(/[_\w\d]/); - if(stream.peek() == ":") { - return "variable-3"; - } else { - var word = stream.current(); - - if(keywords.test(word)) { - return "meta"; - } - - if(ch >= "A" && ch <= "Z") { - return "comment"; - } else { - return "keyword"; - } - } - var word = stream.current(); - if (ops.test(word)) - return null; - else if (keywords.test(word)) - return "meta"; - else - return "variable"; - } - } - - function tokenLiteral(quote) { - return function(stream, state) { - var escaped = false, ch; - while ((ch = stream.next()) != null) { - if (ch == quote && !escaped) { - state.tokenize = tokenBase; - break; - } - escaped = !escaped && ch == "\\"; - } - return "string"; - }; - } - - function pushContext(state, type, col) { - state.context = {prev: state.context, indent: state.indent, col: col, type: type}; - } - function popContext(state) { - state.indent = state.context.indent; - state.context = state.context.prev; - } - - return { - startState: function() { - return {tokenize: tokenBase, - context: null, - indent: 0, - col: 0}; - }, - - token: function(stream, state) { - if (stream.sol()) { - if (state.context && state.context.align == null) state.context.align = false; - state.indent = stream.indentation(); - } - if (stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - - if (style != "comment" && state.context && state.context.align == null && state.context.type != "pattern") { - state.context.align = true; - } - - if (curPunc == "(") pushContext(state, ")", stream.column()); - else if (curPunc == "[") pushContext(state, "]", stream.column()); - else if (curPunc == "{") pushContext(state, "}", stream.column()); - else if (/[\]\}\)]/.test(curPunc)) { - while (state.context && state.context.type == "pattern") popContext(state); - if (state.context && curPunc == state.context.type) popContext(state); - } - else if (curPunc == "." && state.context && state.context.type == "pattern") popContext(state); - else if (/atom|string|variable/.test(style) && state.context) { - if (/[\}\]]/.test(state.context.type)) - pushContext(state, "pattern", stream.column()); - else if (state.context.type == "pattern" && !state.context.align) { - state.context.align = true; - state.context.col = stream.column(); - } - } - - return style; - }, - - indent: function(state, textAfter) { - var firstChar = textAfter && textAfter.charAt(0); - var context = state.context; - if (/[\]\}]/.test(firstChar)) - while (context && context.type == "pattern") context = context.prev; - - var closing = context && firstChar == context.type; - if (!context) - return 0; - else if (context.type == "pattern") - return context.col; - else if (context.align) - return context.col + (closing ? 0 : 1); - else - return context.indent + (closing ? 0 : indentUnit); - } - }; -}); - -CodeMirror.defineMIME("text/turtle", "turtle"); - -}); diff --git a/kallithea/public/codemirror/mode/vb/vb.js b/kallithea/public/codemirror/mode/vb/vb.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/vb/vb.js +++ /dev/null @@ -1,274 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("vb", function(conf, parserConf) { - var ERRORCLASS = 'error'; - - function wordRegexp(words) { - return new RegExp("^((" + words.join(")|(") + "))\\b", "i"); - } - - var singleOperators = new RegExp("^[\\+\\-\\*/%&\\\\|\\^~<>!]"); - var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]'); - var doubleOperators = new RegExp("^((==)|(<>)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))"); - var doubleDelimiters = new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))"); - var tripleDelimiters = new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))"); - var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*"); - - var openingKeywords = ['class','module', 'sub','enum','select','while','if','function', 'get','set','property', 'try']; - var middleKeywords = ['else','elseif','case', 'catch']; - var endKeywords = ['next','loop']; - - var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'in']); - var commonkeywords = ['as', 'dim', 'break', 'continue','optional', 'then', 'until', - 'goto', 'byval','byref','new','handles','property', 'return', - 'const','private', 'protected', 'friend', 'public', 'shared', 'static', 'true','false']; - var commontypes = ['integer','string','double','decimal','boolean','short','char', 'float','single']; - - var keywords = wordRegexp(commonkeywords); - var types = wordRegexp(commontypes); - var stringPrefixes = '"'; - - var opening = wordRegexp(openingKeywords); - var middle = wordRegexp(middleKeywords); - var closing = wordRegexp(endKeywords); - var doubleClosing = wordRegexp(['end']); - var doOpening = wordRegexp(['do']); - - var indentInfo = null; - - - - - function indent(_stream, state) { - state.currentIndent++; - } - - function dedent(_stream, state) { - state.currentIndent--; - } - // tokenizers - function tokenBase(stream, state) { - if (stream.eatSpace()) { - return null; - } - - var ch = stream.peek(); - - // Handle Comments - if (ch === "'") { - stream.skipToEnd(); - return 'comment'; - } - - - // Handle Number Literals - if (stream.match(/^((&H)|(&O))?[0-9\.a-f]/i, false)) { - var floatLiteral = false; - // Floats - if (stream.match(/^\d*\.\d+F?/i)) { floatLiteral = true; } - else if (stream.match(/^\d+\.\d*F?/)) { floatLiteral = true; } - else if (stream.match(/^\.\d+F?/)) { floatLiteral = true; } - - if (floatLiteral) { - // Float literals may be "imaginary" - stream.eat(/J/i); - return 'number'; - } - // Integers - var intLiteral = false; - // Hex - if (stream.match(/^&H[0-9a-f]+/i)) { intLiteral = true; } - // Octal - else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; } - // Decimal - else if (stream.match(/^[1-9]\d*F?/)) { - // Decimal literals may be "imaginary" - stream.eat(/J/i); - // TODO - Can you have imaginary longs? - intLiteral = true; - } - // Zero by itself with no other piece of number. - else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; } - if (intLiteral) { - // Integer literals may be "long" - stream.eat(/L/i); - return 'number'; - } - } - - // Handle Strings - if (stream.match(stringPrefixes)) { - state.tokenize = tokenStringFactory(stream.current()); - return state.tokenize(stream, state); - } - - // Handle operators and Delimiters - if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) { - return null; - } - if (stream.match(doubleOperators) - || stream.match(singleOperators) - || stream.match(wordOperators)) { - return 'operator'; - } - if (stream.match(singleDelimiters)) { - return null; - } - if (stream.match(doOpening)) { - indent(stream,state); - state.doInCurrentLine = true; - return 'keyword'; - } - if (stream.match(opening)) { - if (! state.doInCurrentLine) - indent(stream,state); - else - state.doInCurrentLine = false; - return 'keyword'; - } - if (stream.match(middle)) { - return 'keyword'; - } - - if (stream.match(doubleClosing)) { - dedent(stream,state); - dedent(stream,state); - return 'keyword'; - } - if (stream.match(closing)) { - dedent(stream,state); - return 'keyword'; - } - - if (stream.match(types)) { - return 'keyword'; - } - - if (stream.match(keywords)) { - return 'keyword'; - } - - if (stream.match(identifiers)) { - return 'variable'; - } - - // Handle non-detected items - stream.next(); - return ERRORCLASS; - } - - function tokenStringFactory(delimiter) { - var singleline = delimiter.length == 1; - var OUTCLASS = 'string'; - - return function(stream, state) { - while (!stream.eol()) { - stream.eatWhile(/[^'"]/); - if (stream.match(delimiter)) { - state.tokenize = tokenBase; - return OUTCLASS; - } else { - stream.eat(/['"]/); - } - } - if (singleline) { - if (parserConf.singleLineStringErrors) { - return ERRORCLASS; - } else { - state.tokenize = tokenBase; - } - } - return OUTCLASS; - }; - } - - - function tokenLexer(stream, state) { - var style = state.tokenize(stream, state); - var current = stream.current(); - - // Handle '.' connected identifiers - if (current === '.') { - style = state.tokenize(stream, state); - current = stream.current(); - if (style === 'variable') { - return 'variable'; - } else { - return ERRORCLASS; - } - } - - - var delimiter_index = '[({'.indexOf(current); - if (delimiter_index !== -1) { - indent(stream, state ); - } - if (indentInfo === 'dedent') { - if (dedent(stream, state)) { - return ERRORCLASS; - } - } - delimiter_index = '])}'.indexOf(current); - if (delimiter_index !== -1) { - if (dedent(stream, state)) { - return ERRORCLASS; - } - } - - return style; - } - - var external = { - electricChars:"dDpPtTfFeE ", - startState: function() { - return { - tokenize: tokenBase, - lastToken: null, - currentIndent: 0, - nextLineIndent: 0, - doInCurrentLine: false - - - }; - }, - - token: function(stream, state) { - if (stream.sol()) { - state.currentIndent += state.nextLineIndent; - state.nextLineIndent = 0; - state.doInCurrentLine = 0; - } - var style = tokenLexer(stream, state); - - state.lastToken = {style:style, content: stream.current()}; - - - - return style; - }, - - indent: function(state, textAfter) { - var trueText = textAfter.replace(/^\s+|\s+$/g, '') ; - if (trueText.match(closing) || trueText.match(doubleClosing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1); - if(state.currentIndent < 0) return 0; - return state.currentIndent * conf.indentUnit; - } - - }; - return external; -}); - -CodeMirror.defineMIME("text/x-vb", "vb"); - -}); diff --git a/kallithea/public/codemirror/mode/vbscript/vbscript.js b/kallithea/public/codemirror/mode/vbscript/vbscript.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/vbscript/vbscript.js +++ /dev/null @@ -1,350 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -/* -For extra ASP classic objects, initialize CodeMirror instance with this option: - isASP: true - -E.G.: - var editor = CodeMirror.fromTextArea(document.getElementById("code"), { - lineNumbers: true, - isASP: true - }); -*/ - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("vbscript", function(conf, parserConf) { - var ERRORCLASS = 'error'; - - function wordRegexp(words) { - return new RegExp("^((" + words.join(")|(") + "))\\b", "i"); - } - - var singleOperators = new RegExp("^[\\+\\-\\*/&\\\\\\^<>=]"); - var doubleOperators = new RegExp("^((<>)|(<=)|(>=))"); - var singleDelimiters = new RegExp('^[\\.,]'); - var brakets = new RegExp('^[\\(\\)]'); - var identifiers = new RegExp("^[A-Za-z][_A-Za-z0-9]*"); - - var openingKeywords = ['class','sub','select','while','if','function', 'property', 'with', 'for']; - var middleKeywords = ['else','elseif','case']; - var endKeywords = ['next','loop','wend']; - - var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'is', 'mod', 'eqv', 'imp']); - var commonkeywords = ['dim', 'redim', 'then', 'until', 'randomize', - 'byval','byref','new','property', 'exit', 'in', - 'const','private', 'public', - 'get','set','let', 'stop', 'on error resume next', 'on error goto 0', 'option explicit', 'call', 'me']; - - //This list was from: http://msdn.microsoft.com/en-us/library/f8tbc79x(v=vs.84).aspx - var atomWords = ['true', 'false', 'nothing', 'empty', 'null']; - //This list was from: http://msdn.microsoft.com/en-us/library/3ca8tfek(v=vs.84).aspx - var builtinFuncsWords = ['abs', 'array', 'asc', 'atn', 'cbool', 'cbyte', 'ccur', 'cdate', 'cdbl', 'chr', 'cint', 'clng', 'cos', 'csng', 'cstr', 'date', 'dateadd', 'datediff', 'datepart', - 'dateserial', 'datevalue', 'day', 'escape', 'eval', 'execute', 'exp', 'filter', 'formatcurrency', 'formatdatetime', 'formatnumber', 'formatpercent', 'getlocale', 'getobject', - 'getref', 'hex', 'hour', 'inputbox', 'instr', 'instrrev', 'int', 'fix', 'isarray', 'isdate', 'isempty', 'isnull', 'isnumeric', 'isobject', 'join', 'lbound', 'lcase', 'left', - 'len', 'loadpicture', 'log', 'ltrim', 'rtrim', 'trim', 'maths', 'mid', 'minute', 'month', 'monthname', 'msgbox', 'now', 'oct', 'replace', 'rgb', 'right', 'rnd', 'round', - 'scriptengine', 'scriptenginebuildversion', 'scriptenginemajorversion', 'scriptengineminorversion', 'second', 'setlocale', 'sgn', 'sin', 'space', 'split', 'sqr', 'strcomp', - 'string', 'strreverse', 'tan', 'time', 'timer', 'timeserial', 'timevalue', 'typename', 'ubound', 'ucase', 'unescape', 'vartype', 'weekday', 'weekdayname', 'year']; - - //This list was from: http://msdn.microsoft.com/en-us/library/ydz4cfk3(v=vs.84).aspx - var builtinConsts = ['vbBlack', 'vbRed', 'vbGreen', 'vbYellow', 'vbBlue', 'vbMagenta', 'vbCyan', 'vbWhite', 'vbBinaryCompare', 'vbTextCompare', - 'vbSunday', 'vbMonday', 'vbTuesday', 'vbWednesday', 'vbThursday', 'vbFriday', 'vbSaturday', 'vbUseSystemDayOfWeek', 'vbFirstJan1', 'vbFirstFourDays', 'vbFirstFullWeek', - 'vbGeneralDate', 'vbLongDate', 'vbShortDate', 'vbLongTime', 'vbShortTime', 'vbObjectError', - 'vbOKOnly', 'vbOKCancel', 'vbAbortRetryIgnore', 'vbYesNoCancel', 'vbYesNo', 'vbRetryCancel', 'vbCritical', 'vbQuestion', 'vbExclamation', 'vbInformation', 'vbDefaultButton1', 'vbDefaultButton2', - 'vbDefaultButton3', 'vbDefaultButton4', 'vbApplicationModal', 'vbSystemModal', 'vbOK', 'vbCancel', 'vbAbort', 'vbRetry', 'vbIgnore', 'vbYes', 'vbNo', - 'vbCr', 'VbCrLf', 'vbFormFeed', 'vbLf', 'vbNewLine', 'vbNullChar', 'vbNullString', 'vbTab', 'vbVerticalTab', 'vbUseDefault', 'vbTrue', 'vbFalse', - 'vbEmpty', 'vbNull', 'vbInteger', 'vbLong', 'vbSingle', 'vbDouble', 'vbCurrency', 'vbDate', 'vbString', 'vbObject', 'vbError', 'vbBoolean', 'vbVariant', 'vbDataObject', 'vbDecimal', 'vbByte', 'vbArray']; - //This list was from: http://msdn.microsoft.com/en-us/library/hkc375ea(v=vs.84).aspx - var builtinObjsWords = ['WScript', 'err', 'debug', 'RegExp']; - var knownProperties = ['description', 'firstindex', 'global', 'helpcontext', 'helpfile', 'ignorecase', 'length', 'number', 'pattern', 'source', 'value', 'count']; - var knownMethods = ['clear', 'execute', 'raise', 'replace', 'test', 'write', 'writeline', 'close', 'open', 'state', 'eof', 'update', 'addnew', 'end', 'createobject', 'quit']; - - var aspBuiltinObjsWords = ['server', 'response', 'request', 'session', 'application']; - var aspKnownProperties = ['buffer', 'cachecontrol', 'charset', 'contenttype', 'expires', 'expiresabsolute', 'isclientconnected', 'pics', 'status', //response - 'clientcertificate', 'cookies', 'form', 'querystring', 'servervariables', 'totalbytes', //request - 'contents', 'staticobjects', //application - 'codepage', 'lcid', 'sessionid', 'timeout', //session - 'scripttimeout']; //server - var aspKnownMethods = ['addheader', 'appendtolog', 'binarywrite', 'end', 'flush', 'redirect', //response - 'binaryread', //request - 'remove', 'removeall', 'lock', 'unlock', //application - 'abandon', //session - 'getlasterror', 'htmlencode', 'mappath', 'transfer', 'urlencode']; //server - - var knownWords = knownMethods.concat(knownProperties); - - builtinObjsWords = builtinObjsWords.concat(builtinConsts); - - if (conf.isASP){ - builtinObjsWords = builtinObjsWords.concat(aspBuiltinObjsWords); - knownWords = knownWords.concat(aspKnownMethods, aspKnownProperties); - }; - - var keywords = wordRegexp(commonkeywords); - var atoms = wordRegexp(atomWords); - var builtinFuncs = wordRegexp(builtinFuncsWords); - var builtinObjs = wordRegexp(builtinObjsWords); - var known = wordRegexp(knownWords); - var stringPrefixes = '"'; - - var opening = wordRegexp(openingKeywords); - var middle = wordRegexp(middleKeywords); - var closing = wordRegexp(endKeywords); - var doubleClosing = wordRegexp(['end']); - var doOpening = wordRegexp(['do']); - var noIndentWords = wordRegexp(['on error resume next', 'exit']); - var comment = wordRegexp(['rem']); - - - function indent(_stream, state) { - state.currentIndent++; - } - - function dedent(_stream, state) { - state.currentIndent--; - } - // tokenizers - function tokenBase(stream, state) { - if (stream.eatSpace()) { - return 'space'; - //return null; - } - - var ch = stream.peek(); - - // Handle Comments - if (ch === "'") { - stream.skipToEnd(); - return 'comment'; - } - if (stream.match(comment)){ - stream.skipToEnd(); - return 'comment'; - } - - - // Handle Number Literals - if (stream.match(/^((&H)|(&O))?[0-9\.]/i, false) && !stream.match(/^((&H)|(&O))?[0-9\.]+[a-z_]/i, false)) { - var floatLiteral = false; - // Floats - if (stream.match(/^\d*\.\d+/i)) { floatLiteral = true; } - else if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; } - else if (stream.match(/^\.\d+/)) { floatLiteral = true; } - - if (floatLiteral) { - // Float literals may be "imaginary" - stream.eat(/J/i); - return 'number'; - } - // Integers - var intLiteral = false; - // Hex - if (stream.match(/^&H[0-9a-f]+/i)) { intLiteral = true; } - // Octal - else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; } - // Decimal - else if (stream.match(/^[1-9]\d*F?/)) { - // Decimal literals may be "imaginary" - stream.eat(/J/i); - // TODO - Can you have imaginary longs? - intLiteral = true; - } - // Zero by itself with no other piece of number. - else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; } - if (intLiteral) { - // Integer literals may be "long" - stream.eat(/L/i); - return 'number'; - } - } - - // Handle Strings - if (stream.match(stringPrefixes)) { - state.tokenize = tokenStringFactory(stream.current()); - return state.tokenize(stream, state); - } - - // Handle operators and Delimiters - if (stream.match(doubleOperators) - || stream.match(singleOperators) - || stream.match(wordOperators)) { - return 'operator'; - } - if (stream.match(singleDelimiters)) { - return null; - } - - if (stream.match(brakets)) { - return "bracket"; - } - - if (stream.match(noIndentWords)) { - state.doInCurrentLine = true; - - return 'keyword'; - } - - if (stream.match(doOpening)) { - indent(stream,state); - state.doInCurrentLine = true; - - return 'keyword'; - } - if (stream.match(opening)) { - if (! state.doInCurrentLine) - indent(stream,state); - else - state.doInCurrentLine = false; - - return 'keyword'; - } - if (stream.match(middle)) { - return 'keyword'; - } - - - if (stream.match(doubleClosing)) { - dedent(stream,state); - dedent(stream,state); - - return 'keyword'; - } - if (stream.match(closing)) { - if (! state.doInCurrentLine) - dedent(stream,state); - else - state.doInCurrentLine = false; - - return 'keyword'; - } - - if (stream.match(keywords)) { - return 'keyword'; - } - - if (stream.match(atoms)) { - return 'atom'; - } - - if (stream.match(known)) { - return 'variable-2'; - } - - if (stream.match(builtinFuncs)) { - return 'builtin'; - } - - if (stream.match(builtinObjs)){ - return 'variable-2'; - } - - if (stream.match(identifiers)) { - return 'variable'; - } - - // Handle non-detected items - stream.next(); - return ERRORCLASS; - } - - function tokenStringFactory(delimiter) { - var singleline = delimiter.length == 1; - var OUTCLASS = 'string'; - - return function(stream, state) { - while (!stream.eol()) { - stream.eatWhile(/[^'"]/); - if (stream.match(delimiter)) { - state.tokenize = tokenBase; - return OUTCLASS; - } else { - stream.eat(/['"]/); - } - } - if (singleline) { - if (parserConf.singleLineStringErrors) { - return ERRORCLASS; - } else { - state.tokenize = tokenBase; - } - } - return OUTCLASS; - }; - } - - - function tokenLexer(stream, state) { - var style = state.tokenize(stream, state); - var current = stream.current(); - - // Handle '.' connected identifiers - if (current === '.') { - style = state.tokenize(stream, state); - - current = stream.current(); - if (style && (style.substr(0, 8) === 'variable' || style==='builtin' || style==='keyword')){//|| knownWords.indexOf(current.substring(1)) > -1) { - if (style === 'builtin' || style === 'keyword') style='variable'; - if (knownWords.indexOf(current.substr(1)) > -1) style='variable-2'; - - return style; - } else { - return ERRORCLASS; - } - } - - return style; - } - - var external = { - electricChars:"dDpPtTfFeE ", - startState: function() { - return { - tokenize: tokenBase, - lastToken: null, - currentIndent: 0, - nextLineIndent: 0, - doInCurrentLine: false, - ignoreKeyword: false - - - }; - }, - - token: function(stream, state) { - if (stream.sol()) { - state.currentIndent += state.nextLineIndent; - state.nextLineIndent = 0; - state.doInCurrentLine = 0; - } - var style = tokenLexer(stream, state); - - state.lastToken = {style:style, content: stream.current()}; - - if (style==='space') style=null; - - return style; - }, - - indent: function(state, textAfter) { - var trueText = textAfter.replace(/^\s+|\s+$/g, '') ; - if (trueText.match(closing) || trueText.match(doubleClosing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1); - if(state.currentIndent < 0) return 0; - return state.currentIndent * conf.indentUnit; - } - - }; - return external; -}); - -CodeMirror.defineMIME("text/vbscript", "vbscript"); - -}); diff --git a/kallithea/public/codemirror/mode/velocity/velocity.js b/kallithea/public/codemirror/mode/velocity/velocity.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/velocity/velocity.js +++ /dev/null @@ -1,201 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("velocity", function() { - function parseWords(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - var keywords = parseWords("#end #else #break #stop #[[ #]] " + - "#{end} #{else} #{break} #{stop}"); - var functions = parseWords("#if #elseif #foreach #set #include #parse #macro #define #evaluate " + - "#{if} #{elseif} #{foreach} #{set} #{include} #{parse} #{macro} #{define} #{evaluate}"); - var specials = parseWords("$foreach.count $foreach.hasNext $foreach.first $foreach.last $foreach.topmost $foreach.parent.count $foreach.parent.hasNext $foreach.parent.first $foreach.parent.last $foreach.parent $velocityCount $!bodyContent $bodyContent"); - var isOperatorChar = /[+\-*&%=<>!?:\/|]/; - - function chain(stream, state, f) { - state.tokenize = f; - return f(stream, state); - } - function tokenBase(stream, state) { - var beforeParams = state.beforeParams; - state.beforeParams = false; - var ch = stream.next(); - // start of unparsed string? - if ((ch == "'") && state.inParams) { - state.lastTokenWasBuiltin = false; - return chain(stream, state, tokenString(ch)); - } - // start of parsed string? - else if ((ch == '"')) { - state.lastTokenWasBuiltin = false; - if (state.inString) { - state.inString = false; - return "string"; - } - else if (state.inParams) - return chain(stream, state, tokenString(ch)); - } - // is it one of the special signs []{}().,;? Seperator? - else if (/[\[\]{}\(\),;\.]/.test(ch)) { - if (ch == "(" && beforeParams) - state.inParams = true; - else if (ch == ")") { - state.inParams = false; - state.lastTokenWasBuiltin = true; - } - return null; - } - // start of a number value? - else if (/\d/.test(ch)) { - state.lastTokenWasBuiltin = false; - stream.eatWhile(/[\w\.]/); - return "number"; - } - // multi line comment? - else if (ch == "#" && stream.eat("*")) { - state.lastTokenWasBuiltin = false; - return chain(stream, state, tokenComment); - } - // unparsed content? - else if (ch == "#" && stream.match(/ *\[ *\[/)) { - state.lastTokenWasBuiltin = false; - return chain(stream, state, tokenUnparsed); - } - // single line comment? - else if (ch == "#" && stream.eat("#")) { - state.lastTokenWasBuiltin = false; - stream.skipToEnd(); - return "comment"; - } - // variable? - else if (ch == "$") { - stream.eatWhile(/[\w\d\$_\.{}]/); - // is it one of the specials? - if (specials && specials.propertyIsEnumerable(stream.current())) { - return "keyword"; - } - else { - state.lastTokenWasBuiltin = true; - state.beforeParams = true; - return "builtin"; - } - } - // is it a operator? - else if (isOperatorChar.test(ch)) { - state.lastTokenWasBuiltin = false; - stream.eatWhile(isOperatorChar); - return "operator"; - } - else { - // get the whole word - stream.eatWhile(/[\w\$_{}@]/); - var word = stream.current(); - // is it one of the listed keywords? - if (keywords && keywords.propertyIsEnumerable(word)) - return "keyword"; - // is it one of the listed functions? - if (functions && functions.propertyIsEnumerable(word) || - (stream.current().match(/^#@?[a-z0-9_]+ *$/i) && stream.peek()=="(") && - !(functions && functions.propertyIsEnumerable(word.toLowerCase()))) { - state.beforeParams = true; - state.lastTokenWasBuiltin = false; - return "keyword"; - } - if (state.inString) { - state.lastTokenWasBuiltin = false; - return "string"; - } - if (stream.pos > word.length && stream.string.charAt(stream.pos-word.length-1)=="." && state.lastTokenWasBuiltin) - return "builtin"; - // default: just a "word" - state.lastTokenWasBuiltin = false; - return null; - } - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next, end = false; - while ((next = stream.next()) != null) { - if ((next == quote) && !escaped) { - end = true; - break; - } - if (quote=='"' && stream.peek() == '$' && !escaped) { - state.inString = true; - end = true; - break; - } - escaped = !escaped && next == "\\"; - } - if (end) state.tokenize = tokenBase; - return "string"; - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "#" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function tokenUnparsed(stream, state) { - var maybeEnd = 0, ch; - while (ch = stream.next()) { - if (ch == "#" && maybeEnd == 2) { - state.tokenize = tokenBase; - break; - } - if (ch == "]") - maybeEnd++; - else if (ch != " ") - maybeEnd = 0; - } - return "meta"; - } - // Interface - - return { - startState: function() { - return { - tokenize: tokenBase, - beforeParams: false, - inParams: false, - inString: false, - lastTokenWasBuiltin: false - }; - }, - - token: function(stream, state) { - if (stream.eatSpace()) return null; - return state.tokenize(stream, state); - }, - blockCommentStart: "#*", - blockCommentEnd: "*#", - lineComment: "##", - fold: "velocity" - }; -}); - -CodeMirror.defineMIME("text/velocity", "velocity"); - -}); diff --git a/kallithea/public/codemirror/mode/verilog/verilog.js b/kallithea/public/codemirror/mode/verilog/verilog.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/verilog/verilog.js +++ /dev/null @@ -1,364 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("verilog", function(config, parserConfig) { - - var indentUnit = config.indentUnit, - statementIndentUnit = parserConfig.statementIndentUnit || indentUnit, - dontAlignCalls = parserConfig.dontAlignCalls, - noIndentKeywords = parserConfig.noIndentKeywords || [], - multiLineStrings = parserConfig.multiLineStrings; - - function words(str) { - var obj = {}, words = str.split(" "); - for (var i = 0; i < words.length; ++i) obj[words[i]] = true; - return obj; - } - - /** - * Keywords from IEEE 1800-2012 - */ - var keywords = words( - "accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind " + - "bins binsof bit break buf bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config " + - "const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable " + - "dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup " + - "endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask " + - "enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin " + - "function generate genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import " + - "incdir include initial inout input inside instance int integer interconnect interface intersect join join_any " + - "join_none large let liblist library local localparam logic longint macromodule matches medium modport module " + - "nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 null or output package packed " + - "parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup " + - "pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg " + - "reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime " + - "s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify " + - "specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on " + - "table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior " + - "trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void " + - "wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor"); - - /** Operators from IEEE 1800-2012 - unary_operator ::= - + | - | ! | ~ | & | ~& | | | ~| | ^ | ~^ | ^~ - binary_operator ::= - + | - | * | / | % | == | != | === | !== | ==? | !=? | && | || | ** - | < | <= | > | >= | & | | | ^ | ^~ | ~^ | >> | << | >>> | <<< - | -> | <-> - inc_or_dec_operator ::= ++ | -- - unary_module_path_operator ::= - ! | ~ | & | ~& | | | ~| | ^ | ~^ | ^~ - binary_module_path_operator ::= - == | != | && | || | & | | | ^ | ^~ | ~^ - */ - var isOperatorChar = /[\+\-\*\/!~&|^%=?:]/; - var isBracketChar = /[\[\]{}()]/; - - var unsignedNumber = /\d[0-9_]*/; - var decimalLiteral = /\d*\s*'s?d\s*\d[0-9_]*/i; - var binaryLiteral = /\d*\s*'s?b\s*[xz01][xz01_]*/i; - var octLiteral = /\d*\s*'s?o\s*[xz0-7][xz0-7_]*/i; - var hexLiteral = /\d*\s*'s?h\s*[0-9a-fxz?][0-9a-fxz?_]*/i; - var realLiteral = /(\d[\d_]*(\.\d[\d_]*)?E-?[\d_]+)|(\d[\d_]*\.\d[\d_]*)/i; - - var closingBracketOrWord = /^((\w+)|[)}\]])/; - var closingBracket = /[)}\]]/; - - var curPunc; - var curKeyword; - - // Block openings which are closed by a matching keyword in the form of ("end" + keyword) - // E.g. "task" => "endtask" - var blockKeywords = words( - "case checker class clocking config function generate interface module package" + - "primitive program property specify sequence table task" - ); - - // Opening/closing pairs - var openClose = {}; - for (var keyword in blockKeywords) { - openClose[keyword] = "end" + keyword; - } - openClose["begin"] = "end"; - openClose["casex"] = "endcase"; - openClose["casez"] = "endcase"; - openClose["do" ] = "while"; - openClose["fork" ] = "join;join_any;join_none"; - openClose["covergroup"] = "endgroup"; - - for (var i in noIndentKeywords) { - var keyword = noIndentKeywords[i]; - if (openClose[keyword]) { - openClose[keyword] = undefined; - } - } - - // Keywords which open statements that are ended with a semi-colon - var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while"); - - function tokenBase(stream, state) { - var ch = stream.peek(); - if (/[,;:\.]/.test(ch)) { - curPunc = stream.next(); - return null; - } - if (isBracketChar.test(ch)) { - curPunc = stream.next(); - return "bracket"; - } - // Macros (tick-defines) - if (ch == '`') { - stream.next(); - if (stream.eatWhile(/[\w\$_]/)) { - return "def"; - } else { - return null; - } - } - // System calls - if (ch == '$') { - stream.next(); - if (stream.eatWhile(/[\w\$_]/)) { - return "meta"; - } else { - return null; - } - } - // Time literals - if (ch == '#') { - stream.next(); - stream.eatWhile(/[\d_.]/); - return "def"; - } - // Strings - if (ch == '"') { - stream.next(); - state.tokenize = tokenString(ch); - return state.tokenize(stream, state); - } - // Comments - if (ch == "/") { - stream.next(); - if (stream.eat("*")) { - state.tokenize = tokenComment; - return tokenComment(stream, state); - } - if (stream.eat("/")) { - stream.skipToEnd(); - return "comment"; - } - stream.backUp(1); - } - - // Numeric literals - if (stream.match(realLiteral) || - stream.match(decimalLiteral) || - stream.match(binaryLiteral) || - stream.match(octLiteral) || - stream.match(hexLiteral) || - stream.match(unsignedNumber) || - stream.match(realLiteral)) { - return "number"; - } - - // Operators - if (stream.eatWhile(isOperatorChar)) { - return "meta"; - } - - // Keywords / plain variables - if (stream.eatWhile(/[\w\$_]/)) { - var cur = stream.current(); - if (keywords[cur]) { - if (openClose[cur]) { - curPunc = "newblock"; - } - if (statementKeywords[cur]) { - curPunc = "newstatement"; - } - curKeyword = cur; - return "keyword"; - } - return "variable"; - } - - stream.next(); - return null; - } - - function tokenString(quote) { - return function(stream, state) { - var escaped = false, next, end = false; - while ((next = stream.next()) != null) { - if (next == quote && !escaped) {end = true; break;} - escaped = !escaped && next == "\\"; - } - if (end || !(escaped || multiLineStrings)) - state.tokenize = tokenBase; - return "string"; - }; - } - - function tokenComment(stream, state) { - var maybeEnd = false, ch; - while (ch = stream.next()) { - if (ch == "/" && maybeEnd) { - state.tokenize = tokenBase; - break; - } - maybeEnd = (ch == "*"); - } - return "comment"; - } - - function Context(indented, column, type, align, prev) { - this.indented = indented; - this.column = column; - this.type = type; - this.align = align; - this.prev = prev; - } - function pushContext(state, col, type) { - var indent = state.indented; - var c = new Context(indent, col, type, null, state.context); - return state.context = c; - } - function popContext(state) { - var t = state.context.type; - if (t == ")" || t == "]" || t == "}") { - state.indented = state.context.indented; - } - return state.context = state.context.prev; - } - - function isClosing(text, contextClosing) { - if (text == contextClosing) { - return true; - } else { - // contextClosing may be mulitple keywords separated by ; - var closingKeywords = contextClosing.split(";"); - for (var i in closingKeywords) { - if (text == closingKeywords[i]) { - return true; - } - } - return false; - } - } - - function buildElectricInputRegEx() { - // Reindentation should occur on any bracket char: {}()[] - // or on a match of any of the block closing keywords, at - // the end of a line - var allClosings = []; - for (var i in openClose) { - if (openClose[i]) { - var closings = openClose[i].split(";"); - for (var j in closings) { - allClosings.push(closings[j]); - } - } - } - var re = new RegExp("[{}()\\[\\]]|(" + allClosings.join("|") + ")$"); - return re; - } - - // Interface - return { - - // Regex to force current line to reindent - electricInput: buildElectricInputRegEx(), - - startState: function(basecolumn) { - return { - tokenize: null, - context: new Context((basecolumn || 0) - indentUnit, 0, "top", false), - indented: 0, - startOfLine: true - }; - }, - - token: function(stream, state) { - var ctx = state.context; - if (stream.sol()) { - if (ctx.align == null) ctx.align = false; - state.indented = stream.indentation(); - state.startOfLine = true; - } - if (stream.eatSpace()) return null; - curPunc = null; - curKeyword = null; - var style = (state.tokenize || tokenBase)(stream, state); - if (style == "comment" || style == "meta" || style == "variable") return style; - if (ctx.align == null) ctx.align = true; - - if (curPunc == ctx.type) { - popContext(state); - } - else if ((curPunc == ";" && ctx.type == "statement") || - (ctx.type && isClosing(curKeyword, ctx.type))) { - ctx = popContext(state); - while (ctx && ctx.type == "statement") ctx = popContext(state); - } - else if (curPunc == "{") { pushContext(state, stream.column(), "}"); } - else if (curPunc == "[") { pushContext(state, stream.column(), "]"); } - else if (curPunc == "(") { pushContext(state, stream.column(), ")"); } - else if (ctx && ctx.type == "endcase" && curPunc == ":") { pushContext(state, stream.column(), "statement"); } - else if (curPunc == "newstatement") { - pushContext(state, stream.column(), "statement"); - } else if (curPunc == "newblock") { - if (curKeyword == "function" && ctx && (ctx.type == "statement" || ctx.type == "endgroup")) { - // The 'function' keyword can appear in some other contexts where it actually does not - // indicate a function (import/export DPI and covergroup definitions). - // Do nothing in this case - } else if (curKeyword == "task" && ctx && ctx.type == "statement") { - // Same thing for task - } else { - var close = openClose[curKeyword]; - pushContext(state, stream.column(), close); - } - } - - state.startOfLine = false; - return style; - }, - - indent: function(state, textAfter) { - if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass; - var ctx = state.context, firstChar = textAfter && textAfter.charAt(0); - if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev; - var closing = false; - var possibleClosing = textAfter.match(closingBracketOrWord); - if (possibleClosing) { - closing = isClosing(possibleClosing[0], ctx.type); - } - if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit); - else if (closingBracket.test(ctx.type) && ctx.align && !dontAlignCalls) return ctx.column + (closing ? 0 : 1); - else if (ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit; - else return ctx.indented + (closing ? 0 : indentUnit); - }, - - blockCommentStart: "/*", - blockCommentEnd: "*/", - lineComment: "//" - }; -}); - -CodeMirror.defineMIME("text/x-verilog", { - name: "verilog" -}); -CodeMirror.defineMIME("text/x-systemverilog", { - name: "systemverilog" -}); - -}); diff --git a/kallithea/public/codemirror/mode/xml/xml.js b/kallithea/public/codemirror/mode/xml/xml.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/xml/xml.js +++ /dev/null @@ -1,384 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("xml", function(config, parserConfig) { - var indentUnit = config.indentUnit; - var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1; - var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag; - if (multilineTagIndentPastTag == null) multilineTagIndentPastTag = true; - - var Kludges = parserConfig.htmlMode ? { - autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true, - 'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true, - 'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true, - 'track': true, 'wbr': true, 'menuitem': true}, - implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true, - 'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true, - 'th': true, 'tr': true}, - contextGrabbers: { - 'dd': {'dd': true, 'dt': true}, - 'dt': {'dd': true, 'dt': true}, - 'li': {'li': true}, - 'option': {'option': true, 'optgroup': true}, - 'optgroup': {'optgroup': true}, - 'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true, - 'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true, - 'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true, - 'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true, - 'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true}, - 'rp': {'rp': true, 'rt': true}, - 'rt': {'rp': true, 'rt': true}, - 'tbody': {'tbody': true, 'tfoot': true}, - 'td': {'td': true, 'th': true}, - 'tfoot': {'tbody': true}, - 'th': {'td': true, 'th': true}, - 'thead': {'tbody': true, 'tfoot': true}, - 'tr': {'tr': true} - }, - doNotIndent: {"pre": true}, - allowUnquoted: true, - allowMissing: true, - caseFold: true - } : { - autoSelfClosers: {}, - implicitlyClosed: {}, - contextGrabbers: {}, - doNotIndent: {}, - allowUnquoted: false, - allowMissing: false, - caseFold: false - }; - var alignCDATA = parserConfig.alignCDATA; - - // Return variables for tokenizers - var type, setStyle; - - function inText(stream, state) { - function chain(parser) { - state.tokenize = parser; - return parser(stream, state); - } - - var ch = stream.next(); - if (ch == "<") { - if (stream.eat("!")) { - if (stream.eat("[")) { - if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>")); - else return null; - } else if (stream.match("--")) { - return chain(inBlock("comment", "-->")); - } else if (stream.match("DOCTYPE", true, true)) { - stream.eatWhile(/[\w\._\-]/); - return chain(doctype(1)); - } else { - return null; - } - } else if (stream.eat("?")) { - stream.eatWhile(/[\w\._\-]/); - state.tokenize = inBlock("meta", "?>"); - return "meta"; - } else { - type = stream.eat("/") ? "closeTag" : "openTag"; - state.tokenize = inTag; - return "tag bracket"; - } - } else if (ch == "&") { - var ok; - if (stream.eat("#")) { - if (stream.eat("x")) { - ok = stream.eatWhile(/[a-fA-F\d]/) && stream.eat(";"); - } else { - ok = stream.eatWhile(/[\d]/) && stream.eat(";"); - } - } else { - ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";"); - } - return ok ? "atom" : "error"; - } else { - stream.eatWhile(/[^&<]/); - return null; - } - } - - function inTag(stream, state) { - var ch = stream.next(); - if (ch == ">" || (ch == "/" && stream.eat(">"))) { - state.tokenize = inText; - type = ch == ">" ? "endTag" : "selfcloseTag"; - return "tag bracket"; - } else if (ch == "=") { - type = "equals"; - return null; - } else if (ch == "<") { - state.tokenize = inText; - state.state = baseState; - state.tagName = state.tagStart = null; - var next = state.tokenize(stream, state); - return next ? next + " tag error" : "tag error"; - } else if (/[\'\"]/.test(ch)) { - state.tokenize = inAttribute(ch); - state.stringStartCol = stream.column(); - return state.tokenize(stream, state); - } else { - stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/); - return "word"; - } - } - - function inAttribute(quote) { - var closure = function(stream, state) { - while (!stream.eol()) { - if (stream.next() == quote) { - state.tokenize = inTag; - break; - } - } - return "string"; - }; - closure.isInAttribute = true; - return closure; - } - - function inBlock(style, terminator) { - return function(stream, state) { - while (!stream.eol()) { - if (stream.match(terminator)) { - state.tokenize = inText; - break; - } - stream.next(); - } - return style; - }; - } - function doctype(depth) { - return function(stream, state) { - var ch; - while ((ch = stream.next()) != null) { - if (ch == "<") { - state.tokenize = doctype(depth + 1); - return state.tokenize(stream, state); - } else if (ch == ">") { - if (depth == 1) { - state.tokenize = inText; - break; - } else { - state.tokenize = doctype(depth - 1); - return state.tokenize(stream, state); - } - } - } - return "meta"; - }; - } - - function Context(state, tagName, startOfLine) { - this.prev = state.context; - this.tagName = tagName; - this.indent = state.indented; - this.startOfLine = startOfLine; - if (Kludges.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent)) - this.noIndent = true; - } - function popContext(state) { - if (state.context) state.context = state.context.prev; - } - function maybePopContext(state, nextTagName) { - var parentTagName; - while (true) { - if (!state.context) { - return; - } - parentTagName = state.context.tagName; - if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) || - !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) { - return; - } - popContext(state); - } - } - - function baseState(type, stream, state) { - if (type == "openTag") { - state.tagStart = stream.column(); - return tagNameState; - } else if (type == "closeTag") { - return closeTagNameState; - } else { - return baseState; - } - } - function tagNameState(type, stream, state) { - if (type == "word") { - state.tagName = stream.current(); - setStyle = "tag"; - return attrState; - } else { - setStyle = "error"; - return tagNameState; - } - } - function closeTagNameState(type, stream, state) { - if (type == "word") { - var tagName = stream.current(); - if (state.context && state.context.tagName != tagName && - Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName)) - popContext(state); - if (state.context && state.context.tagName == tagName) { - setStyle = "tag"; - return closeState; - } else { - setStyle = "tag error"; - return closeStateErr; - } - } else { - setStyle = "error"; - return closeStateErr; - } - } - - function closeState(type, _stream, state) { - if (type != "endTag") { - setStyle = "error"; - return closeState; - } - popContext(state); - return baseState; - } - function closeStateErr(type, stream, state) { - setStyle = "error"; - return closeState(type, stream, state); - } - - function attrState(type, _stream, state) { - if (type == "word") { - setStyle = "attribute"; - return attrEqState; - } else if (type == "endTag" || type == "selfcloseTag") { - var tagName = state.tagName, tagStart = state.tagStart; - state.tagName = state.tagStart = null; - if (type == "selfcloseTag" || - Kludges.autoSelfClosers.hasOwnProperty(tagName)) { - maybePopContext(state, tagName); - } else { - maybePopContext(state, tagName); - state.context = new Context(state, tagName, tagStart == state.indented); - } - return baseState; - } - setStyle = "error"; - return attrState; - } - function attrEqState(type, stream, state) { - if (type == "equals") return attrValueState; - if (!Kludges.allowMissing) setStyle = "error"; - return attrState(type, stream, state); - } - function attrValueState(type, stream, state) { - if (type == "string") return attrContinuedState; - if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return attrState;} - setStyle = "error"; - return attrState(type, stream, state); - } - function attrContinuedState(type, stream, state) { - if (type == "string") return attrContinuedState; - return attrState(type, stream, state); - } - - return { - startState: function() { - return {tokenize: inText, - state: baseState, - indented: 0, - tagName: null, tagStart: null, - context: null}; - }, - - token: function(stream, state) { - if (!state.tagName && stream.sol()) - state.indented = stream.indentation(); - - if (stream.eatSpace()) return null; - type = null; - var style = state.tokenize(stream, state); - if ((style || type) && style != "comment") { - setStyle = null; - state.state = state.state(type || style, stream, state); - if (setStyle) - style = setStyle == "error" ? style + " error" : setStyle; - } - return style; - }, - - indent: function(state, textAfter, fullLine) { - var context = state.context; - // Indent multi-line strings (e.g. css). - if (state.tokenize.isInAttribute) { - if (state.tagStart == state.indented) - return state.stringStartCol + 1; - else - return state.indented + indentUnit; - } - if (context && context.noIndent) return CodeMirror.Pass; - if (state.tokenize != inTag && state.tokenize != inText) - return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0; - // Indent the starts of attribute names. - if (state.tagName) { - if (multilineTagIndentPastTag) - return state.tagStart + state.tagName.length + 2; - else - return state.tagStart + indentUnit * multilineTagIndentFactor; - } - if (alignCDATA && /$/, - blockCommentStart: "", - - configuration: parserConfig.htmlMode ? "html" : "xml", - helperType: parserConfig.htmlMode ? "html" : "xml" - }; -}); - -CodeMirror.defineMIME("text/xml", "xml"); -CodeMirror.defineMIME("application/xml", "xml"); -if (!CodeMirror.mimeModes.hasOwnProperty("text/html")) - CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true}); - -}); diff --git a/kallithea/public/codemirror/mode/xquery/xquery.js b/kallithea/public/codemirror/mode/xquery/xquery.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/xquery/xquery.js +++ /dev/null @@ -1,447 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("xquery", function() { - - // The keywords object is set to the result of this self executing - // function. Each keyword is a property of the keywords object whose - // value is {type: atype, style: astyle} - var keywords = function(){ - // conveinence functions used to build keywords object - function kw(type) {return {type: type, style: "keyword"};} - var A = kw("keyword a") - , B = kw("keyword b") - , C = kw("keyword c") - , operator = kw("operator") - , atom = {type: "atom", style: "atom"} - , punctuation = {type: "punctuation", style: null} - , qualifier = {type: "axis_specifier", style: "qualifier"}; - - // kwObj is what is return from this function at the end - var kwObj = { - 'if': A, 'switch': A, 'while': A, 'for': A, - 'else': B, 'then': B, 'try': B, 'finally': B, 'catch': B, - 'element': C, 'attribute': C, 'let': C, 'implements': C, 'import': C, 'module': C, 'namespace': C, - 'return': C, 'super': C, 'this': C, 'throws': C, 'where': C, 'private': C, - ',': punctuation, - 'null': atom, 'fn:false()': atom, 'fn:true()': atom - }; - - // a list of 'basic' keywords. For each add a property to kwObj with the value of - // {type: basic[i], style: "keyword"} e.g. 'after' --> {type: "after", style: "keyword"} - var basic = ['after','ancestor','ancestor-or-self','and','as','ascending','assert','attribute','before', - 'by','case','cast','child','comment','declare','default','define','descendant','descendant-or-self', - 'descending','document','document-node','element','else','eq','every','except','external','following', - 'following-sibling','follows','for','function','if','import','in','instance','intersect','item', - 'let','module','namespace','node','node','of','only','or','order','parent','precedes','preceding', - 'preceding-sibling','processing-instruction','ref','return','returns','satisfies','schema','schema-element', - 'self','some','sortby','stable','text','then','to','treat','typeswitch','union','variable','version','where', - 'xquery', 'empty-sequence']; - for(var i=0, l=basic.length; i < l; i++) { kwObj[basic[i]] = kw(basic[i]);}; - - // a list of types. For each add a property to kwObj with the value of - // {type: "atom", style: "atom"} - var types = ['xs:string', 'xs:float', 'xs:decimal', 'xs:double', 'xs:integer', 'xs:boolean', 'xs:date', 'xs:dateTime', - 'xs:time', 'xs:duration', 'xs:dayTimeDuration', 'xs:time', 'xs:yearMonthDuration', 'numeric', 'xs:hexBinary', - 'xs:base64Binary', 'xs:anyURI', 'xs:QName', 'xs:byte','xs:boolean','xs:anyURI','xf:yearMonthDuration']; - for(var i=0, l=types.length; i < l; i++) { kwObj[types[i]] = atom;}; - - // each operator will add a property to kwObj with value of {type: "operator", style: "keyword"} - var operators = ['eq', 'ne', 'lt', 'le', 'gt', 'ge', ':=', '=', '>', '>=', '<', '<=', '.', '|', '?', 'and', 'or', 'div', 'idiv', 'mod', '*', '/', '+', '-']; - for(var i=0, l=operators.length; i < l; i++) { kwObj[operators[i]] = operator;}; - - // each axis_specifiers will add a property to kwObj with value of {type: "axis_specifier", style: "qualifier"} - var axis_specifiers = ["self::", "attribute::", "child::", "descendant::", "descendant-or-self::", "parent::", - "ancestor::", "ancestor-or-self::", "following::", "preceding::", "following-sibling::", "preceding-sibling::"]; - for(var i=0, l=axis_specifiers.length; i < l; i++) { kwObj[axis_specifiers[i]] = qualifier; }; - - return kwObj; - }(); - - // Used as scratch variables to communicate multiple values without - // consing up tons of objects. - var type, content; - - function ret(tp, style, cont) { - type = tp; content = cont; - return style; - } - - function chain(stream, state, f) { - state.tokenize = f; - return f(stream, state); - } - - // the primary mode tokenizer - function tokenBase(stream, state) { - var ch = stream.next(), - mightBeFunction = false, - isEQName = isEQNameAhead(stream); - - // an XML tag (if not in some sub, chained tokenizer) - if (ch == "<") { - if(stream.match("!--", true)) - return chain(stream, state, tokenXMLComment); - - if(stream.match("![CDATA", false)) { - state.tokenize = tokenCDATA; - return ret("tag", "tag"); - } - - if(stream.match("?", false)) { - return chain(stream, state, tokenPreProcessing); - } - - var isclose = stream.eat("/"); - stream.eatSpace(); - var tagName = "", c; - while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c; - - return chain(stream, state, tokenTag(tagName, isclose)); - } - // start code block - else if(ch == "{") { - pushStateStack(state,{ type: "codeblock"}); - return ret("", null); - } - // end code block - else if(ch == "}") { - popStateStack(state); - return ret("", null); - } - // if we're in an XML block - else if(isInXmlBlock(state)) { - if(ch == ">") - return ret("tag", "tag"); - else if(ch == "/" && stream.eat(">")) { - popStateStack(state); - return ret("tag", "tag"); - } - else - return ret("word", "variable"); - } - // if a number - else if (/\d/.test(ch)) { - stream.match(/^\d*(?:\.\d*)?(?:E[+\-]?\d+)?/); - return ret("number", "atom"); - } - // comment start - else if (ch === "(" && stream.eat(":")) { - pushStateStack(state, { type: "comment"}); - return chain(stream, state, tokenComment); - } - // quoted string - else if ( !isEQName && (ch === '"' || ch === "'")) - return chain(stream, state, tokenString(ch)); - // variable - else if(ch === "$") { - return chain(stream, state, tokenVariable); - } - // assignment - else if(ch ===":" && stream.eat("=")) { - return ret("operator", "keyword"); - } - // open paren - else if(ch === "(") { - pushStateStack(state, { type: "paren"}); - return ret("", null); - } - // close paren - else if(ch === ")") { - popStateStack(state); - return ret("", null); - } - // open paren - else if(ch === "[") { - pushStateStack(state, { type: "bracket"}); - return ret("", null); - } - // close paren - else if(ch === "]") { - popStateStack(state); - return ret("", null); - } - else { - var known = keywords.propertyIsEnumerable(ch) && keywords[ch]; - - // if there's a EQName ahead, consume the rest of the string portion, it's likely a function - if(isEQName && ch === '\"') while(stream.next() !== '"'){} - if(isEQName && ch === '\'') while(stream.next() !== '\''){} - - // gobble up a word if the character is not known - if(!known) stream.eatWhile(/[\w\$_-]/); - - // gobble a colon in the case that is a lib func type call fn:doc - var foundColon = stream.eat(":"); - - // if there's not a second colon, gobble another word. Otherwise, it's probably an axis specifier - // which should get matched as a keyword - if(!stream.eat(":") && foundColon) { - stream.eatWhile(/[\w\$_-]/); - } - // if the next non whitespace character is an open paren, this is probably a function (if not a keyword of other sort) - if(stream.match(/^[ \t]*\(/, false)) { - mightBeFunction = true; - } - // is the word a keyword? - var word = stream.current(); - known = keywords.propertyIsEnumerable(word) && keywords[word]; - - // if we think it's a function call but not yet known, - // set style to variable for now for lack of something better - if(mightBeFunction && !known) known = {type: "function_call", style: "variable def"}; - - // if the previous word was element, attribute, axis specifier, this word should be the name of that - if(isInXmlConstructor(state)) { - popStateStack(state); - return ret("word", "variable", word); - } - // as previously checked, if the word is element,attribute, axis specifier, call it an "xmlconstructor" and - // push the stack so we know to look for it on the next word - if(word == "element" || word == "attribute" || known.type == "axis_specifier") pushStateStack(state, {type: "xmlconstructor"}); - - // if the word is known, return the details of that else just call this a generic 'word' - return known ? ret(known.type, known.style, word) : - ret("word", "variable", word); - } - } - - // handle comments, including nested - function tokenComment(stream, state) { - var maybeEnd = false, maybeNested = false, nestedCount = 0, ch; - while (ch = stream.next()) { - if (ch == ")" && maybeEnd) { - if(nestedCount > 0) - nestedCount--; - else { - popStateStack(state); - break; - } - } - else if(ch == ":" && maybeNested) { - nestedCount++; - } - maybeEnd = (ch == ":"); - maybeNested = (ch == "("); - } - - return ret("comment", "comment"); - } - - // tokenizer for string literals - // optionally pass a tokenizer function to set state.tokenize back to when finished - function tokenString(quote, f) { - return function(stream, state) { - var ch; - - if(isInString(state) && stream.current() == quote) { - popStateStack(state); - if(f) state.tokenize = f; - return ret("string", "string"); - } - - pushStateStack(state, { type: "string", name: quote, tokenize: tokenString(quote, f) }); - - // if we're in a string and in an XML block, allow an embedded code block - if(stream.match("{", false) && isInXmlAttributeBlock(state)) { - state.tokenize = tokenBase; - return ret("string", "string"); - } - - - while (ch = stream.next()) { - if (ch == quote) { - popStateStack(state); - if(f) state.tokenize = f; - break; - } - else { - // if we're in a string and in an XML block, allow an embedded code block in an attribute - if(stream.match("{", false) && isInXmlAttributeBlock(state)) { - state.tokenize = tokenBase; - return ret("string", "string"); - } - - } - } - - return ret("string", "string"); - }; - } - - // tokenizer for variables - function tokenVariable(stream, state) { - var isVariableChar = /[\w\$_-]/; - - // a variable may start with a quoted EQName so if the next character is quote, consume to the next quote - if(stream.eat("\"")) { - while(stream.next() !== '\"'){}; - stream.eat(":"); - } else { - stream.eatWhile(isVariableChar); - if(!stream.match(":=", false)) stream.eat(":"); - } - stream.eatWhile(isVariableChar); - state.tokenize = tokenBase; - return ret("variable", "variable"); - } - - // tokenizer for XML tags - function tokenTag(name, isclose) { - return function(stream, state) { - stream.eatSpace(); - if(isclose && stream.eat(">")) { - popStateStack(state); - state.tokenize = tokenBase; - return ret("tag", "tag"); - } - // self closing tag without attributes? - if(!stream.eat("/")) - pushStateStack(state, { type: "tag", name: name, tokenize: tokenBase}); - if(!stream.eat(">")) { - state.tokenize = tokenAttribute; - return ret("tag", "tag"); - } - else { - state.tokenize = tokenBase; - } - return ret("tag", "tag"); - }; - } - - // tokenizer for XML attributes - function tokenAttribute(stream, state) { - var ch = stream.next(); - - if(ch == "/" && stream.eat(">")) { - if(isInXmlAttributeBlock(state)) popStateStack(state); - if(isInXmlBlock(state)) popStateStack(state); - return ret("tag", "tag"); - } - if(ch == ">") { - if(isInXmlAttributeBlock(state)) popStateStack(state); - return ret("tag", "tag"); - } - if(ch == "=") - return ret("", null); - // quoted string - if (ch == '"' || ch == "'") - return chain(stream, state, tokenString(ch, tokenAttribute)); - - if(!isInXmlAttributeBlock(state)) - pushStateStack(state, { type: "attribute", tokenize: tokenAttribute}); - - stream.eat(/[a-zA-Z_:]/); - stream.eatWhile(/[-a-zA-Z0-9_:.]/); - stream.eatSpace(); - - // the case where the attribute has not value and the tag was closed - if(stream.match(">", false) || stream.match("/", false)) { - popStateStack(state); - state.tokenize = tokenBase; - } - - return ret("attribute", "attribute"); - } - - // handle comments, including nested - function tokenXMLComment(stream, state) { - var ch; - while (ch = stream.next()) { - if (ch == "-" && stream.match("->", true)) { - state.tokenize = tokenBase; - return ret("comment", "comment"); - } - } - } - - - // handle CDATA - function tokenCDATA(stream, state) { - var ch; - while (ch = stream.next()) { - if (ch == "]" && stream.match("]", true)) { - state.tokenize = tokenBase; - return ret("comment", "comment"); - } - } - } - - // handle preprocessing instructions - function tokenPreProcessing(stream, state) { - var ch; - while (ch = stream.next()) { - if (ch == "?" && stream.match(">", true)) { - state.tokenize = tokenBase; - return ret("comment", "comment meta"); - } - } - } - - - // functions to test the current context of the state - function isInXmlBlock(state) { return isIn(state, "tag"); } - function isInXmlAttributeBlock(state) { return isIn(state, "attribute"); } - function isInXmlConstructor(state) { return isIn(state, "xmlconstructor"); } - function isInString(state) { return isIn(state, "string"); } - - function isEQNameAhead(stream) { - // assume we've already eaten a quote (") - if(stream.current() === '"') - return stream.match(/^[^\"]+\"\:/, false); - else if(stream.current() === '\'') - return stream.match(/^[^\"]+\'\:/, false); - else - return false; - } - - function isIn(state, type) { - return (state.stack.length && state.stack[state.stack.length - 1].type == type); - } - - function pushStateStack(state, newState) { - state.stack.push(newState); - } - - function popStateStack(state) { - state.stack.pop(); - var reinstateTokenize = state.stack.length && state.stack[state.stack.length-1].tokenize; - state.tokenize = reinstateTokenize || tokenBase; - } - - // the interface for the mode API - return { - startState: function() { - return { - tokenize: tokenBase, - cc: [], - stack: [] - }; - }, - - token: function(stream, state) { - if (stream.eatSpace()) return null; - var style = state.tokenize(stream, state); - return style; - }, - - blockCommentStart: "(:", - blockCommentEnd: ":)" - - }; - -}); - -CodeMirror.defineMIME("application/xquery", "xquery"); - -}); diff --git a/kallithea/public/codemirror/mode/yaml/yaml.js b/kallithea/public/codemirror/mode/yaml/yaml.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/yaml/yaml.js +++ /dev/null @@ -1,112 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode("yaml", function() { - - var cons = ['true', 'false', 'on', 'off', 'yes', 'no']; - var keywordRegex = new RegExp("\\b(("+cons.join(")|(")+"))$", 'i'); - - return { - token: function(stream, state) { - var ch = stream.peek(); - var esc = state.escaped; - state.escaped = false; - /* comments */ - if (ch == "#" && (stream.pos == 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) { - stream.skipToEnd(); return "comment"; - } - if (state.literal && stream.indentation() > state.keyCol) { - stream.skipToEnd(); return "string"; - } else if (state.literal) { state.literal = false; } - if (stream.sol()) { - state.keyCol = 0; - state.pair = false; - state.pairStart = false; - /* document start */ - if(stream.match(/---/)) { return "def"; } - /* document end */ - if (stream.match(/\.\.\./)) { return "def"; } - /* array list item */ - if (stream.match(/\s*-\s+/)) { return 'meta'; } - } - /* inline pairs/lists */ - if (stream.match(/^(\{|\}|\[|\])/)) { - if (ch == '{') - state.inlinePairs++; - else if (ch == '}') - state.inlinePairs--; - else if (ch == '[') - state.inlineList++; - else - state.inlineList--; - return 'meta'; - } - - /* list seperator */ - if (state.inlineList > 0 && !esc && ch == ',') { - stream.next(); - return 'meta'; - } - /* pairs seperator */ - if (state.inlinePairs > 0 && !esc && ch == ',') { - state.keyCol = 0; - state.pair = false; - state.pairStart = false; - stream.next(); - return 'meta'; - } - - /* start of value of a pair */ - if (state.pairStart) { - /* block literals */ - if (stream.match(/^\s*(\||\>)\s*/)) { state.literal = true; return 'meta'; }; - /* references */ - if (stream.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i)) { return 'variable-2'; } - /* numbers */ - if (state.inlinePairs == 0 && stream.match(/^\s*-?[0-9\.\,]+\s?$/)) { return 'number'; } - if (state.inlinePairs > 0 && stream.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/)) { return 'number'; } - /* keywords */ - if (stream.match(keywordRegex)) { return 'keyword'; } - } - - /* pairs (associative arrays) -> key */ - if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)) { - state.pair = true; - state.keyCol = stream.indentation(); - return "atom"; - } - if (state.pair && stream.match(/^:\s*/)) { state.pairStart = true; return 'meta'; } - - /* nothing found, continue */ - state.pairStart = false; - state.escaped = (ch == '\\'); - stream.next(); - return null; - }, - startState: function() { - return { - pair: false, - pairStart: false, - keyCol: 0, - inlinePairs: 0, - inlineList: 0, - literal: false, - escaped: false - }; - } - }; -}); - -CodeMirror.defineMIME("text/x-yaml", "yaml"); - -}); diff --git a/kallithea/public/codemirror/mode/z80/z80.js b/kallithea/public/codemirror/mode/z80/z80.js deleted file mode 100644 --- a/kallithea/public/codemirror/mode/z80/z80.js +++ /dev/null @@ -1,100 +0,0 @@ -// CodeMirror, copyright (c) by Marijn Haverbeke and others -// Distributed under an MIT license: http://codemirror.net/LICENSE - -(function(mod) { - if (typeof exports == "object" && typeof module == "object") // CommonJS - mod(require("../../lib/codemirror")); - else if (typeof define == "function" && define.amd) // AMD - define(["../../lib/codemirror"], mod); - else // Plain browser env - mod(CodeMirror); -})(function(CodeMirror) { -"use strict"; - -CodeMirror.defineMode('z80', function() { - var keywords1 = /^(exx?|(ld|cp|in)([di]r?)?|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|rst|[de]i|halt|im|ot[di]r|out[di]?)\b/i; - var keywords2 = /^(call|j[pr]|ret[in]?)\b/i; - var keywords3 = /^b_?(call|jump)\b/i; - var variables1 = /^(af?|bc?|c|de?|e|hl?|l|i[xy]?|r|sp)\b/i; - var variables2 = /^(n?[zc]|p[oe]?|m)\b/i; - var errors = /^([hl][xy]|i[xy][hl]|slia|sll)\b/i; - var numbers = /^([\da-f]+h|[0-7]+o|[01]+b|\d+)\b/i; - - return { - startState: function() { - return {context: 0}; - }, - token: function(stream, state) { - if (!stream.column()) - state.context = 0; - - if (stream.eatSpace()) - return null; - - var w; - - if (stream.eatWhile(/\w/)) { - w = stream.current(); - - if (stream.indentation()) { - if (state.context == 1 && variables1.test(w)) - return 'variable-2'; - - if (state.context == 2 && variables2.test(w)) - return 'variable-3'; - - if (keywords1.test(w)) { - state.context = 1; - return 'keyword'; - } else if (keywords2.test(w)) { - state.context = 2; - return 'keyword'; - } else if (keywords3.test(w)) { - state.context = 3; - return 'keyword'; - } - - if (errors.test(w)) - return 'error'; - } else if (numbers.test(w)) { - return 'number'; - } else { - return null; - } - } else if (stream.eat(';')) { - stream.skipToEnd(); - return 'comment'; - } else if (stream.eat('"')) { - while (w = stream.next()) { - if (w == '"') - break; - - if (w == '\\') - stream.next(); - } - return 'string'; - } else if (stream.eat('\'')) { - if (stream.match(/\\?.'/)) - return 'number'; - } else if (stream.eat('.') || stream.sol() && stream.eat('#')) { - state.context = 4; - - if (stream.eatWhile(/\w/)) - return 'def'; - } else if (stream.eat('$')) { - if (stream.eatWhile(/[\da-f]/i)) - return 'number'; - } else if (stream.eat('%')) { - if (stream.eatWhile(/[01]/)) - return 'number'; - } else { - stream.next(); - } - return null; - } - }; -}); - -CodeMirror.defineMIME("text/x-z80", "z80"); - -}); diff --git a/kallithea/public/css/bootstrap.css b/kallithea/public/css/bootstrap.css deleted file mode 100644 --- a/kallithea/public/css/bootstrap.css +++ /dev/null @@ -1,6805 +0,0 @@ -/*! - * Bootstrap v3.0.0 - * - * Copyright 2013 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world by @mdo and @fat. - */ - -/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -main, -nav, -section, -summary { - display: block; -} - -audio, -canvas, -video { - display: inline-block; -} - -audio:not([controls]) { - display: none; - height: 0; -} - -[hidden] { - display: none; -} - -html { - font-family: sans-serif; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} - -body { - margin: 0; -} - -a:focus { - outline: thin dotted; -} - -a:active, -a:hover { - outline: 0; -} - -h1 { - margin: 0.67em 0; - font-size: 2em; -} - -abbr[title] { - border-bottom: 1px dotted; -} - -b, -strong { - font-weight: bold; -} - -dfn { - font-style: italic; -} - -hr { - height: 0; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - -mark { - color: #000; - background: #ff0; -} - -code, -kbd, -pre, -samp { - font-family: monospace, serif; - font-size: 1em; -} - -pre { - white-space: pre-wrap; -} - -q { - quotes: "\201C" "\201D" "\2018" "\2019"; -} - -small { - font-size: 80%; -} - -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -img { - border: 0; -} - -svg:not(:root) { - overflow: hidden; -} - -figure { - margin: 0; -} - -fieldset { - padding: 0.35em 0.625em 0.75em; - margin: 0 2px; - border: 1px solid #c0c0c0; -} - -legend { - padding: 0; - border: 0; -} - -button, -input, -select, -textarea { - margin: 0; - font-family: inherit; - font-size: 100%; -} - -button, -input { - line-height: normal; -} - -button, -select { - text-transform: none; -} - -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} - -button[disabled], -html input[disabled] { - cursor: default; -} - -input[type="checkbox"], -input[type="radio"] { - padding: 0; - box-sizing: border-box; -} - -input[type="search"] { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - -webkit-appearance: textfield; -} - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} - -textarea { - overflow: auto; - vertical-align: top; -} - -table { - border-collapse: collapse; - border-spacing: 0; -} - -@media print { - * { - color: #000 !important; - text-shadow: none !important; - background: transparent !important; - box-shadow: none !important; - } - a, - a:visited { - text-decoration: underline; - } - a[href]:after { - content: " (" attr(href) ")"; - } - abbr[title]:after { - content: " (" attr(title) ")"; - } - .ir a:after, - a[href^="javascript:"]:after, - a[href^="#"]:after { - content: ""; - } - pre, - blockquote { - border: 1px solid #999; - page-break-inside: avoid; - } - thead { - display: table-header-group; - } - tr, - img { - page-break-inside: avoid; - } - img { - max-width: 100% !important; - } - @page { - margin: 2cm .5cm; - } - p, - h2, - h3 { - orphans: 3; - widows: 3; - } - h2, - h3 { - page-break-after: avoid; - } - .navbar { - display: none; - } - .table td, - .table th { - background-color: #fff !important; - } - .btn > .caret, - .dropup > .btn > .caret { - border-top-color: #000 !important; - } - .label { - border: 1px solid #000; - } - .table { - border-collapse: collapse !important; - } - .table-bordered th, - .table-bordered td { - border: 1px solid #ddd !important; - } -} - -*, -*:before, -*:after { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -html { - font-size: 62.5%; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -} - -body { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 1.428571429; - color: #333333; - background-color: #ffffff; -} - -input, -button, -select, -textarea { - font-family: inherit; - font-size: inherit; - line-height: inherit; -} - -button, -input, -select[multiple], -textarea { - background-image: none; -} - -a { - color: #428bca; - text-decoration: none; -} - -a:hover, -a:focus { - color: #2a6496; - text-decoration: underline; -} - -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -img { - vertical-align: middle; -} - -.img-responsive { - display: block; - height: auto; - max-width: 100%; -} - -.img-rounded { - border-radius: 6px; -} - -.img-thumbnail { - display: inline-block; - height: auto; - max-width: 100%; - padding: 4px; - line-height: 1.428571429; - background-color: #ffffff; - border: 1px solid #dddddd; - border-radius: 4px; - -webkit-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} - -.img-circle { - border-radius: 50%; -} - -hr { - margin-top: 20px; - margin-bottom: 20px; - border: 0; - border-top: 1px solid #eeeeee; -} - -.sr-only { - position: absolute; - width: 1px; - height: 1px; - padding: 0; - margin: -1px; - overflow: hidden; - clip: rect(0 0 0 0); - border: 0; -} - -p { - margin: 0 0 10px; -} - -.lead { - margin-bottom: 20px; - font-size: 16.099999999999998px; - font-weight: 200; - line-height: 1.4; -} - -@media (min-width: 768px) { - .lead { - font-size: 21px; - } -} - -small { - font-size: 85%; -} - -cite { - font-style: normal; -} - -.text-muted { - color: #999999; -} - -.text-primary { - color: #428bca; -} - -.text-warning { - color: #c09853; -} - -.text-danger { - color: #b94a48; -} - -.text-success { - color: #468847; -} - -.text-info { - color: #3a87ad; -} - -.text-left { - text-align: left; -} - -.text-right { - text-align: right; -} - -.text-center { - text-align: center; -} - -h1, -h2, -h3, -h4, -h5, -h6, -.h1, -.h2, -.h3, -.h4, -.h5, -.h6 { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-weight: 500; - line-height: 1.1; -} - -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small, -.h1 small, -.h2 small, -.h3 small, -.h4 small, -.h5 small, -.h6 small { - font-weight: normal; - line-height: 1; - color: #999999; -} - -h1, -h2, -h3 { - margin-top: 20px; - margin-bottom: 10px; -} - -h4, -h5, -h6 { - margin-top: 10px; - margin-bottom: 10px; -} - -h1, -.h1 { - font-size: 36px; -} - -h2, -.h2 { - font-size: 30px; -} - -h3, -.h3 { - font-size: 24px; -} - -h4, -.h4 { - font-size: 18px; -} - -h5, -.h5 { - font-size: 14px; -} - -h6, -.h6 { - font-size: 12px; -} - -h1 small, -.h1 small { - font-size: 24px; -} - -h2 small, -.h2 small { - font-size: 18px; -} - -h3 small, -.h3 small, -h4 small, -.h4 small { - font-size: 14px; -} - -.page-header { - padding-bottom: 9px; - margin: 40px 0 20px; - border-bottom: 1px solid #eeeeee; -} - -ul, -ol { - margin-top: 0; - margin-bottom: 10px; -} - -ul ul, -ol ul, -ul ol, -ol ol { - margin-bottom: 0; -} - -.list-unstyled { - padding-left: 0; - list-style: none; -} - -.list-inline { - padding-left: 0; - list-style: none; -} - -.list-inline > li { - display: inline-block; - padding-right: 5px; - padding-left: 5px; -} - -dl { - margin-bottom: 20px; -} - -dt, -dd { - line-height: 1.428571429; -} - -dt { - font-weight: bold; -} - -dd { - margin-left: 0; -} - -@media (min-width: 768px) { - .dl-horizontal dt { - float: left; - width: 160px; - overflow: hidden; - clear: left; - text-align: right; - text-overflow: ellipsis; - white-space: nowrap; - } - .dl-horizontal dd { - margin-left: 180px; - } - .dl-horizontal dd:before, - .dl-horizontal dd:after { - display: table; - content: " "; - } - .dl-horizontal dd:after { - clear: both; - } - .dl-horizontal dd:before, - .dl-horizontal dd:after { - display: table; - content: " "; - } - .dl-horizontal dd:after { - clear: both; - } -} - -abbr[title], -abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted #999999; -} - -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} - -blockquote { - padding: 10px 20px; - margin: 0 0 20px; - border-left: 5px solid #eeeeee; -} - -blockquote p { - font-size: 17.5px; - font-weight: 300; - line-height: 1.25; -} - -blockquote p:last-child { - margin-bottom: 0; -} - -blockquote small { - display: block; - line-height: 1.428571429; - color: #999999; -} - -blockquote small:before { - content: '\2014 \00A0'; -} - -blockquote.pull-right { - padding-right: 15px; - padding-left: 0; - border-right: 5px solid #eeeeee; - border-left: 0; -} - -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} - -blockquote.pull-right small:before { - content: ''; -} - -blockquote.pull-right small:after { - content: '\00A0 \2014'; -} - -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} - -address { - display: block; - margin-bottom: 20px; - font-style: normal; - line-height: 1.428571429; -} - -code, -pre { - font-family: Monaco, Menlo, Consolas, "Courier New", monospace; -} - -code { - padding: 2px 4px; - font-size: 90%; - color: #c7254e; - white-space: nowrap; - background-color: #f9f2f4; - border-radius: 4px; -} - -pre { - display: block; - padding: 9.5px; - margin: 0 0 10px; - font-size: 13px; - line-height: 1.428571429; - color: #333333; - word-break: break-all; - word-wrap: break-word; - background-color: #f5f5f5; - border: 1px solid #cccccc; - border-radius: 4px; -} - -pre.prettyprint { - margin-bottom: 20px; -} - -pre code { - padding: 0; - font-size: inherit; - color: inherit; - white-space: pre-wrap; - background-color: transparent; - border: 0; -} - -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} - -.container { - padding-right: 15px; - padding-left: 15px; - margin-right: auto; - margin-left: auto; -} - -.container:before, -.container:after { - display: table; - content: " "; -} - -.container:after { - clear: both; -} - -.container:before, -.container:after { - display: table; - content: " "; -} - -.container:after { - clear: both; -} - -.row { - margin-right: -15px; - margin-left: -15px; -} - -.row:before, -.row:after { - display: table; - content: " "; -} - -.row:after { - clear: both; -} - -.row:before, -.row:after { - display: table; - content: " "; -} - -.row:after { - clear: both; -} - -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11, -.col-xs-12, -.col-sm-1, -.col-sm-2, -.col-sm-3, -.col-sm-4, -.col-sm-5, -.col-sm-6, -.col-sm-7, -.col-sm-8, -.col-sm-9, -.col-sm-10, -.col-sm-11, -.col-sm-12, -.col-md-1, -.col-md-2, -.col-md-3, -.col-md-4, -.col-md-5, -.col-md-6, -.col-md-7, -.col-md-8, -.col-md-9, -.col-md-10, -.col-md-11, -.col-md-12, -.col-lg-1, -.col-lg-2, -.col-lg-3, -.col-lg-4, -.col-lg-5, -.col-lg-6, -.col-lg-7, -.col-lg-8, -.col-lg-9, -.col-lg-10, -.col-lg-11, -.col-lg-12 { - position: relative; - min-height: 1px; - padding-right: 15px; - padding-left: 15px; -} - -.col-xs-1, -.col-xs-2, -.col-xs-3, -.col-xs-4, -.col-xs-5, -.col-xs-6, -.col-xs-7, -.col-xs-8, -.col-xs-9, -.col-xs-10, -.col-xs-11 { - float: left; -} - -.col-xs-1 { - width: 8.333333333333332%; -} - -.col-xs-2 { - width: 16.666666666666664%; -} - -.col-xs-3 { - width: 25%; -} - -.col-xs-4 { - width: 33.33333333333333%; -} - -.col-xs-5 { - width: 41.66666666666667%; -} - -.col-xs-6 { - width: 50%; -} - -.col-xs-7 { - width: 58.333333333333336%; -} - -.col-xs-8 { - width: 66.66666666666666%; -} - -.col-xs-9 { - width: 75%; -} - -.col-xs-10 { - width: 83.33333333333334%; -} - -.col-xs-11 { - width: 91.66666666666666%; -} - -.col-xs-12 { - width: 100%; -} - -@media (min-width: 768px) { - .container { - max-width: 750px; - } - .col-sm-1, - .col-sm-2, - .col-sm-3, - .col-sm-4, - .col-sm-5, - .col-sm-6, - .col-sm-7, - .col-sm-8, - .col-sm-9, - .col-sm-10, - .col-sm-11 { - float: left; - } - .col-sm-1 { - width: 8.333333333333332%; - } - .col-sm-2 { - width: 16.666666666666664%; - } - .col-sm-3 { - width: 25%; - } - .col-sm-4 { - width: 33.33333333333333%; - } - .col-sm-5 { - width: 41.66666666666667%; - } - .col-sm-6 { - width: 50%; - } - .col-sm-7 { - width: 58.333333333333336%; - } - .col-sm-8 { - width: 66.66666666666666%; - } - .col-sm-9 { - width: 75%; - } - .col-sm-10 { - width: 83.33333333333334%; - } - .col-sm-11 { - width: 91.66666666666666%; - } - .col-sm-12 { - width: 100%; - } - .col-sm-push-1 { - left: 8.333333333333332%; - } - .col-sm-push-2 { - left: 16.666666666666664%; - } - .col-sm-push-3 { - left: 25%; - } - .col-sm-push-4 { - left: 33.33333333333333%; - } - .col-sm-push-5 { - left: 41.66666666666667%; - } - .col-sm-push-6 { - left: 50%; - } - .col-sm-push-7 { - left: 58.333333333333336%; - } - .col-sm-push-8 { - left: 66.66666666666666%; - } - .col-sm-push-9 { - left: 75%; - } - .col-sm-push-10 { - left: 83.33333333333334%; - } - .col-sm-push-11 { - left: 91.66666666666666%; - } - .col-sm-pull-1 { - right: 8.333333333333332%; - } - .col-sm-pull-2 { - right: 16.666666666666664%; - } - .col-sm-pull-3 { - right: 25%; - } - .col-sm-pull-4 { - right: 33.33333333333333%; - } - .col-sm-pull-5 { - right: 41.66666666666667%; - } - .col-sm-pull-6 { - right: 50%; - } - .col-sm-pull-7 { - right: 58.333333333333336%; - } - .col-sm-pull-8 { - right: 66.66666666666666%; - } - .col-sm-pull-9 { - right: 75%; - } - .col-sm-pull-10 { - right: 83.33333333333334%; - } - .col-sm-pull-11 { - right: 91.66666666666666%; - } - .col-sm-offset-1 { - margin-left: 8.333333333333332%; - } - .col-sm-offset-2 { - margin-left: 16.666666666666664%; - } - .col-sm-offset-3 { - margin-left: 25%; - } - .col-sm-offset-4 { - margin-left: 33.33333333333333%; - } - .col-sm-offset-5 { - margin-left: 41.66666666666667%; - } - .col-sm-offset-6 { - margin-left: 50%; - } - .col-sm-offset-7 { - margin-left: 58.333333333333336%; - } - .col-sm-offset-8 { - margin-left: 66.66666666666666%; - } - .col-sm-offset-9 { - margin-left: 75%; - } - .col-sm-offset-10 { - margin-left: 83.33333333333334%; - } - .col-sm-offset-11 { - margin-left: 91.66666666666666%; - } -} - -@media (min-width: 992px) { - .container { - max-width: 970px; - } - .col-md-1, - .col-md-2, - .col-md-3, - .col-md-4, - .col-md-5, - .col-md-6, - .col-md-7, - .col-md-8, - .col-md-9, - .col-md-10, - .col-md-11 { - float: left; - } - .col-md-1 { - width: 8.333333333333332%; - } - .col-md-2 { - width: 16.666666666666664%; - } - .col-md-3 { - width: 25%; - } - .col-md-4 { - width: 33.33333333333333%; - } - .col-md-5 { - width: 41.66666666666667%; - } - .col-md-6 { - width: 50%; - } - .col-md-7 { - width: 58.333333333333336%; - } - .col-md-8 { - width: 66.66666666666666%; - } - .col-md-9 { - width: 75%; - } - .col-md-10 { - width: 83.33333333333334%; - } - .col-md-11 { - width: 91.66666666666666%; - } - .col-md-12 { - width: 100%; - } - .col-md-push-0 { - left: auto; - } - .col-md-push-1 { - left: 8.333333333333332%; - } - .col-md-push-2 { - left: 16.666666666666664%; - } - .col-md-push-3 { - left: 25%; - } - .col-md-push-4 { - left: 33.33333333333333%; - } - .col-md-push-5 { - left: 41.66666666666667%; - } - .col-md-push-6 { - left: 50%; - } - .col-md-push-7 { - left: 58.333333333333336%; - } - .col-md-push-8 { - left: 66.66666666666666%; - } - .col-md-push-9 { - left: 75%; - } - .col-md-push-10 { - left: 83.33333333333334%; - } - .col-md-push-11 { - left: 91.66666666666666%; - } - .col-md-pull-0 { - right: auto; - } - .col-md-pull-1 { - right: 8.333333333333332%; - } - .col-md-pull-2 { - right: 16.666666666666664%; - } - .col-md-pull-3 { - right: 25%; - } - .col-md-pull-4 { - right: 33.33333333333333%; - } - .col-md-pull-5 { - right: 41.66666666666667%; - } - .col-md-pull-6 { - right: 50%; - } - .col-md-pull-7 { - right: 58.333333333333336%; - } - .col-md-pull-8 { - right: 66.66666666666666%; - } - .col-md-pull-9 { - right: 75%; - } - .col-md-pull-10 { - right: 83.33333333333334%; - } - .col-md-pull-11 { - right: 91.66666666666666%; - } - .col-md-offset-0 { - margin-left: 0; - } - .col-md-offset-1 { - margin-left: 8.333333333333332%; - } - .col-md-offset-2 { - margin-left: 16.666666666666664%; - } - .col-md-offset-3 { - margin-left: 25%; - } - .col-md-offset-4 { - margin-left: 33.33333333333333%; - } - .col-md-offset-5 { - margin-left: 41.66666666666667%; - } - .col-md-offset-6 { - margin-left: 50%; - } - .col-md-offset-7 { - margin-left: 58.333333333333336%; - } - .col-md-offset-8 { - margin-left: 66.66666666666666%; - } - .col-md-offset-9 { - margin-left: 75%; - } - .col-md-offset-10 { - margin-left: 83.33333333333334%; - } - .col-md-offset-11 { - margin-left: 91.66666666666666%; - } -} - -@media (min-width: 1200px) { - .container { - max-width: 1170px; - } - .col-lg-1, - .col-lg-2, - .col-lg-3, - .col-lg-4, - .col-lg-5, - .col-lg-6, - .col-lg-7, - .col-lg-8, - .col-lg-9, - .col-lg-10, - .col-lg-11 { - float: left; - } - .col-lg-1 { - width: 8.333333333333332%; - } - .col-lg-2 { - width: 16.666666666666664%; - } - .col-lg-3 { - width: 25%; - } - .col-lg-4 { - width: 33.33333333333333%; - } - .col-lg-5 { - width: 41.66666666666667%; - } - .col-lg-6 { - width: 50%; - } - .col-lg-7 { - width: 58.333333333333336%; - } - .col-lg-8 { - width: 66.66666666666666%; - } - .col-lg-9 { - width: 75%; - } - .col-lg-10 { - width: 83.33333333333334%; - } - .col-lg-11 { - width: 91.66666666666666%; - } - .col-lg-12 { - width: 100%; - } - .col-lg-push-0 { - left: auto; - } - .col-lg-push-1 { - left: 8.333333333333332%; - } - .col-lg-push-2 { - left: 16.666666666666664%; - } - .col-lg-push-3 { - left: 25%; - } - .col-lg-push-4 { - left: 33.33333333333333%; - } - .col-lg-push-5 { - left: 41.66666666666667%; - } - .col-lg-push-6 { - left: 50%; - } - .col-lg-push-7 { - left: 58.333333333333336%; - } - .col-lg-push-8 { - left: 66.66666666666666%; - } - .col-lg-push-9 { - left: 75%; - } - .col-lg-push-10 { - left: 83.33333333333334%; - } - .col-lg-push-11 { - left: 91.66666666666666%; - } - .col-lg-pull-0 { - right: auto; - } - .col-lg-pull-1 { - right: 8.333333333333332%; - } - .col-lg-pull-2 { - right: 16.666666666666664%; - } - .col-lg-pull-3 { - right: 25%; - } - .col-lg-pull-4 { - right: 33.33333333333333%; - } - .col-lg-pull-5 { - right: 41.66666666666667%; - } - .col-lg-pull-6 { - right: 50%; - } - .col-lg-pull-7 { - right: 58.333333333333336%; - } - .col-lg-pull-8 { - right: 66.66666666666666%; - } - .col-lg-pull-9 { - right: 75%; - } - .col-lg-pull-10 { - right: 83.33333333333334%; - } - .col-lg-pull-11 { - right: 91.66666666666666%; - } - .col-lg-offset-0 { - margin-left: 0; - } - .col-lg-offset-1 { - margin-left: 8.333333333333332%; - } - .col-lg-offset-2 { - margin-left: 16.666666666666664%; - } - .col-lg-offset-3 { - margin-left: 25%; - } - .col-lg-offset-4 { - margin-left: 33.33333333333333%; - } - .col-lg-offset-5 { - margin-left: 41.66666666666667%; - } - .col-lg-offset-6 { - margin-left: 50%; - } - .col-lg-offset-7 { - margin-left: 58.333333333333336%; - } - .col-lg-offset-8 { - margin-left: 66.66666666666666%; - } - .col-lg-offset-9 { - margin-left: 75%; - } - .col-lg-offset-10 { - margin-left: 83.33333333333334%; - } - .col-lg-offset-11 { - margin-left: 91.66666666666666%; - } -} - -table { - max-width: 100%; - background-color: transparent; -} - -th { - text-align: left; -} - -.table { - width: 100%; - margin-bottom: 20px; -} - -.table thead > tr > th, -.table tbody > tr > th, -.table tfoot > tr > th, -.table thead > tr > td, -.table tbody > tr > td, -.table tfoot > tr > td { - padding: 8px; - line-height: 1.428571429; - vertical-align: top; - border-top: 1px solid #dddddd; -} - -.table thead > tr > th { - vertical-align: bottom; - border-bottom: 2px solid #dddddd; -} - -.table caption + thead tr:first-child th, -.table colgroup + thead tr:first-child th, -.table thead:first-child tr:first-child th, -.table caption + thead tr:first-child td, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child td { - border-top: 0; -} - -.table tbody + tbody { - border-top: 2px solid #dddddd; -} - -.table .table { - background-color: #ffffff; -} - -.table-condensed thead > tr > th, -.table-condensed tbody > tr > th, -.table-condensed tfoot > tr > th, -.table-condensed thead > tr > td, -.table-condensed tbody > tr > td, -.table-condensed tfoot > tr > td { - padding: 5px; -} - -.table-bordered { - border: 1px solid #dddddd; -} - -.table-bordered > thead > tr > th, -.table-bordered > tbody > tr > th, -.table-bordered > tfoot > tr > th, -.table-bordered > thead > tr > td, -.table-bordered > tbody > tr > td, -.table-bordered > tfoot > tr > td { - border: 1px solid #dddddd; -} - -.table-bordered > thead > tr > th, -.table-bordered > thead > tr > td { - border-bottom-width: 2px; -} - -.table-striped > tbody > tr:nth-child(odd) > td, -.table-striped > tbody > tr:nth-child(odd) > th { - background-color: #f9f9f9; -} - -.table-hover > tbody > tr:hover > td, -.table-hover > tbody > tr:hover > th { - background-color: #f5f5f5; -} - -table col[class*="col-"] { - display: table-column; - float: none; -} - -table td[class*="col-"], -table th[class*="col-"] { - display: table-cell; - float: none; -} - -.table > thead > tr > td.active, -.table > tbody > tr > td.active, -.table > tfoot > tr > td.active, -.table > thead > tr > th.active, -.table > tbody > tr > th.active, -.table > tfoot > tr > th.active, -.table > thead > tr.active > td, -.table > tbody > tr.active > td, -.table > tfoot > tr.active > td, -.table > thead > tr.active > th, -.table > tbody > tr.active > th, -.table > tfoot > tr.active > th { - background-color: #f5f5f5; -} - -.table > thead > tr > td.success, -.table > tbody > tr > td.success, -.table > tfoot > tr > td.success, -.table > thead > tr > th.success, -.table > tbody > tr > th.success, -.table > tfoot > tr > th.success, -.table > thead > tr.success > td, -.table > tbody > tr.success > td, -.table > tfoot > tr.success > td, -.table > thead > tr.success > th, -.table > tbody > tr.success > th, -.table > tfoot > tr.success > th { - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.table-hover > tbody > tr > td.success:hover, -.table-hover > tbody > tr > th.success:hover, -.table-hover > tbody > tr.success:hover > td { - background-color: #d0e9c6; - border-color: #c9e2b3; -} - -.table > thead > tr > td.danger, -.table > tbody > tr > td.danger, -.table > tfoot > tr > td.danger, -.table > thead > tr > th.danger, -.table > tbody > tr > th.danger, -.table > tfoot > tr > th.danger, -.table > thead > tr.danger > td, -.table > tbody > tr.danger > td, -.table > tfoot > tr.danger > td, -.table > thead > tr.danger > th, -.table > tbody > tr.danger > th, -.table > tfoot > tr.danger > th { - background-color: #f2dede; - border-color: #eed3d7; -} - -.table-hover > tbody > tr > td.danger:hover, -.table-hover > tbody > tr > th.danger:hover, -.table-hover > tbody > tr.danger:hover > td { - background-color: #ebcccc; - border-color: #e6c1c7; -} - -.table > thead > tr > td.warning, -.table > tbody > tr > td.warning, -.table > tfoot > tr > td.warning, -.table > thead > tr > th.warning, -.table > tbody > tr > th.warning, -.table > tfoot > tr > th.warning, -.table > thead > tr.warning > td, -.table > tbody > tr.warning > td, -.table > tfoot > tr.warning > td, -.table > thead > tr.warning > th, -.table > tbody > tr.warning > th, -.table > tfoot > tr.warning > th { - background-color: #fcf8e3; - border-color: #fbeed5; -} - -.table-hover > tbody > tr > td.warning:hover, -.table-hover > tbody > tr > th.warning:hover, -.table-hover > tbody > tr.warning:hover > td { - background-color: #faf2cc; - border-color: #f8e5be; -} - -@media (max-width: 768px) { - .table-responsive { - width: 100%; - margin-bottom: 15px; - overflow-x: scroll; - overflow-y: hidden; - border: 1px solid #dddddd; - } - .table-responsive > .table { - margin-bottom: 0; - background-color: #fff; - } - .table-responsive > .table > thead > tr > th, - .table-responsive > .table > tbody > tr > th, - .table-responsive > .table > tfoot > tr > th, - .table-responsive > .table > thead > tr > td, - .table-responsive > .table > tbody > tr > td, - .table-responsive > .table > tfoot > tr > td { - white-space: nowrap; - } - .table-responsive > .table-bordered { - border: 0; - } - .table-responsive > .table-bordered > thead > tr > th:first-child, - .table-responsive > .table-bordered > tbody > tr > th:first-child, - .table-responsive > .table-bordered > tfoot > tr > th:first-child, - .table-responsive > .table-bordered > thead > tr > td:first-child, - .table-responsive > .table-bordered > tbody > tr > td:first-child, - .table-responsive > .table-bordered > tfoot > tr > td:first-child { - border-left: 0; - } - .table-responsive > .table-bordered > thead > tr > th:last-child, - .table-responsive > .table-bordered > tbody > tr > th:last-child, - .table-responsive > .table-bordered > tfoot > tr > th:last-child, - .table-responsive > .table-bordered > thead > tr > td:last-child, - .table-responsive > .table-bordered > tbody > tr > td:last-child, - .table-responsive > .table-bordered > tfoot > tr > td:last-child { - border-right: 0; - } - .table-responsive > .table-bordered > thead > tr:last-child > th, - .table-responsive > .table-bordered > tbody > tr:last-child > th, - .table-responsive > .table-bordered > tfoot > tr:last-child > th, - .table-responsive > .table-bordered > thead > tr:last-child > td, - .table-responsive > .table-bordered > tbody > tr:last-child > td, - .table-responsive > .table-bordered > tfoot > tr:last-child > td { - border-bottom: 0; - } -} - -fieldset { - padding: 0; - margin: 0; - border: 0; -} - -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 20px; - font-size: 21px; - line-height: inherit; - color: #333333; - border: 0; - border-bottom: 1px solid #e5e5e5; -} - -label { - display: inline-block; - margin-bottom: 5px; - font-weight: bold; -} - -input[type="search"] { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -input[type="radio"], -input[type="checkbox"] { - margin: 4px 0 0; - margin-top: 1px \9; - /* IE8-9 */ - - line-height: normal; -} - -input[type="file"] { - display: block; -} - -select[multiple], -select[size] { - height: auto; -} - -select optgroup { - font-family: inherit; - font-size: inherit; - font-style: inherit; -} - -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -input[type="number"]::-webkit-outer-spin-button, -input[type="number"]::-webkit-inner-spin-button { - height: auto; -} - -.form-control:-moz-placeholder { - color: #999999; -} - -.form-control::-moz-placeholder { - color: #999999; -} - -.form-control:-ms-input-placeholder { - color: #999999; -} - -.form-control::-webkit-input-placeholder { - color: #999999; -} - -.form-control { - display: block; - width: 100%; - height: 34px; - padding: 6px 12px; - font-size: 14px; - line-height: 1.428571429; - color: #555555; - vertical-align: middle; - background-color: #ffffff; - border: 1px solid #cccccc; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; - transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; -} - -.form-control:focus { - border-color: #66afe9; - outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); -} - -.form-control[disabled], -.form-control[readonly], -fieldset[disabled] .form-control { - cursor: not-allowed; - background-color: #eeeeee; -} - -textarea.form-control { - height: auto; -} - -.form-group { - margin-bottom: 15px; -} - -.radio, -.checkbox { - display: block; - min-height: 20px; - padding-left: 20px; - margin-top: 10px; - margin-bottom: 10px; - vertical-align: middle; -} - -.radio label, -.checkbox label { - display: inline; - margin-bottom: 0; - font-weight: normal; - cursor: pointer; -} - -.radio input[type="radio"], -.radio-inline input[type="radio"], -.checkbox input[type="checkbox"], -.checkbox-inline input[type="checkbox"] { - float: left; - margin-left: -20px; -} - -.radio + .radio, -.checkbox + .checkbox { - margin-top: -5px; -} - -.radio-inline, -.checkbox-inline { - display: inline-block; - padding-left: 20px; - margin-bottom: 0; - font-weight: normal; - vertical-align: middle; - cursor: pointer; -} - -.radio-inline + .radio-inline, -.checkbox-inline + .checkbox-inline { - margin-top: 0; - margin-left: 10px; -} - -input[type="radio"][disabled], -input[type="checkbox"][disabled], -.radio[disabled], -.radio-inline[disabled], -.checkbox[disabled], -.checkbox-inline[disabled], -fieldset[disabled] input[type="radio"], -fieldset[disabled] input[type="checkbox"], -fieldset[disabled] .radio, -fieldset[disabled] .radio-inline, -fieldset[disabled] .checkbox, -fieldset[disabled] .checkbox-inline { - cursor: not-allowed; -} - -.input-sm { - height: 30px; - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} - -select.input-sm { - height: 30px; - line-height: 30px; -} - -textarea.input-sm { - height: auto; -} - -.input-lg { - height: 45px; - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px; -} - -select.input-lg { - height: 45px; - line-height: 45px; -} - -textarea.input-lg { - height: auto; -} - -.has-warning .help-block, -.has-warning .control-label { - color: #c09853; -} - -.has-warning .form-control { - border-color: #c09853; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.has-warning .form-control:focus { - border-color: #a47e3c; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e; -} - -.has-warning .input-group-addon { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} - -.has-error .help-block, -.has-error .control-label { - color: #b94a48; -} - -.has-error .form-control { - border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.has-error .form-control:focus { - border-color: #953b39; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392; -} - -.has-error .input-group-addon { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} - -.has-success .help-block, -.has-success .control-label { - color: #468847; -} - -.has-success .form-control { - border-color: #468847; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -} - -.has-success .form-control:focus { - border-color: #356635; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b; -} - -.has-success .input-group-addon { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} - -.form-control-static { - padding-top: 7px; - margin-bottom: 0; -} - -.help-block { - display: block; - margin-top: 5px; - margin-bottom: 10px; - color: #737373; -} - -@media (min-width: 768px) { - .form-inline .form-group { - display: inline-block; - margin-bottom: 0; - vertical-align: middle; - } - .form-inline .form-control { - display: inline-block; - } - .form-inline .radio, - .form-inline .checkbox { - display: inline-block; - padding-left: 0; - margin-top: 0; - margin-bottom: 0; - } - .form-inline .radio input[type="radio"], - .form-inline .checkbox input[type="checkbox"] { - float: none; - margin-left: 0; - } -} - -.form-horizontal .control-label, -.form-horizontal .radio, -.form-horizontal .checkbox, -.form-horizontal .radio-inline, -.form-horizontal .checkbox-inline { - padding-top: 7px; - margin-top: 0; - margin-bottom: 0; -} - -.form-horizontal .form-group { - margin-right: -15px; - margin-left: -15px; -} - -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { - display: table; - content: " "; -} - -.form-horizontal .form-group:after { - clear: both; -} - -.form-horizontal .form-group:before, -.form-horizontal .form-group:after { - display: table; - content: " "; -} - -.form-horizontal .form-group:after { - clear: both; -} - -@media (min-width: 768px) { - .form-horizontal .control-label { - text-align: right; - } -} - -.btn { - display: inline-block; - padding: 6px 12px; - margin-bottom: 0; - font-size: 14px; - font-weight: normal; - line-height: 1.428571429; - text-align: center; - white-space: nowrap; - vertical-align: middle; - cursor: pointer; - border: 1px solid transparent; - border-radius: 4px; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - -o-user-select: none; - user-select: none; -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} - -.btn:hover, -.btn:focus { - color: #333333; - text-decoration: none; -} - -.btn:active, -.btn.active { - background-image: none; - outline: 0; - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); -} - -.btn.disabled, -.btn[disabled], -fieldset[disabled] .btn { - pointer-events: none; - cursor: not-allowed; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - box-shadow: none; -} - -.btn-default { - color: #333333; - background-color: #ffffff; - border-color: #cccccc; -} - -.btn-default:hover, -.btn-default:focus, -.btn-default:active, -.btn-default.active, -.open .dropdown-toggle.btn-default { - color: #333333; - background-color: #ebebeb; - border-color: #adadad; -} - -.btn-default:active, -.btn-default.active, -.open .dropdown-toggle.btn-default { - background-image: none; -} - -.btn-default.disabled, -.btn-default[disabled], -fieldset[disabled] .btn-default, -.btn-default.disabled:hover, -.btn-default[disabled]:hover, -fieldset[disabled] .btn-default:hover, -.btn-default.disabled:focus, -.btn-default[disabled]:focus, -fieldset[disabled] .btn-default:focus, -.btn-default.disabled:active, -.btn-default[disabled]:active, -fieldset[disabled] .btn-default:active, -.btn-default.disabled.active, -.btn-default[disabled].active, -fieldset[disabled] .btn-default.active { - background-color: #ffffff; - border-color: #cccccc; -} - -.btn-primary { - color: #ffffff; - background-color: #428bca; - border-color: #357ebd; -} - -.btn-primary:hover, -.btn-primary:focus, -.btn-primary:active, -.btn-primary.active, -.open .dropdown-toggle.btn-primary { - color: #ffffff; - background-color: #3276b1; - border-color: #285e8e; -} - -.btn-primary:active, -.btn-primary.active, -.open .dropdown-toggle.btn-primary { - background-image: none; -} - -.btn-primary.disabled, -.btn-primary[disabled], -fieldset[disabled] .btn-primary, -.btn-primary.disabled:hover, -.btn-primary[disabled]:hover, -fieldset[disabled] .btn-primary:hover, -.btn-primary.disabled:focus, -.btn-primary[disabled]:focus, -fieldset[disabled] .btn-primary:focus, -.btn-primary.disabled:active, -.btn-primary[disabled]:active, -fieldset[disabled] .btn-primary:active, -.btn-primary.disabled.active, -.btn-primary[disabled].active, -fieldset[disabled] .btn-primary.active { - background-color: #428bca; - border-color: #357ebd; -} - -.btn-warning { - color: #ffffff; - background-color: #f0ad4e; - border-color: #eea236; -} - -.btn-warning:hover, -.btn-warning:focus, -.btn-warning:active, -.btn-warning.active, -.open .dropdown-toggle.btn-warning { - color: #ffffff; - background-color: #ed9c28; - border-color: #d58512; -} - -.btn-warning:active, -.btn-warning.active, -.open .dropdown-toggle.btn-warning { - background-image: none; -} - -.btn-warning.disabled, -.btn-warning[disabled], -fieldset[disabled] .btn-warning, -.btn-warning.disabled:hover, -.btn-warning[disabled]:hover, -fieldset[disabled] .btn-warning:hover, -.btn-warning.disabled:focus, -.btn-warning[disabled]:focus, -fieldset[disabled] .btn-warning:focus, -.btn-warning.disabled:active, -.btn-warning[disabled]:active, -fieldset[disabled] .btn-warning:active, -.btn-warning.disabled.active, -.btn-warning[disabled].active, -fieldset[disabled] .btn-warning.active { - background-color: #f0ad4e; - border-color: #eea236; -} - -.btn-danger { - color: #ffffff; - background-color: #d9534f; - border-color: #d43f3a; -} - -.btn-danger:hover, -.btn-danger:focus, -.btn-danger:active, -.btn-danger.active, -.open .dropdown-toggle.btn-danger { - color: #ffffff; - background-color: #d2322d; - border-color: #ac2925; -} - -.btn-danger:active, -.btn-danger.active, -.open .dropdown-toggle.btn-danger { - background-image: none; -} - -.btn-danger.disabled, -.btn-danger[disabled], -fieldset[disabled] .btn-danger, -.btn-danger.disabled:hover, -.btn-danger[disabled]:hover, -fieldset[disabled] .btn-danger:hover, -.btn-danger.disabled:focus, -.btn-danger[disabled]:focus, -fieldset[disabled] .btn-danger:focus, -.btn-danger.disabled:active, -.btn-danger[disabled]:active, -fieldset[disabled] .btn-danger:active, -.btn-danger.disabled.active, -.btn-danger[disabled].active, -fieldset[disabled] .btn-danger.active { - background-color: #d9534f; - border-color: #d43f3a; -} - -.btn-success { - color: #ffffff; - background-color: #5cb85c; - border-color: #4cae4c; -} - -.btn-success:hover, -.btn-success:focus, -.btn-success:active, -.btn-success.active, -.open .dropdown-toggle.btn-success { - color: #ffffff; - background-color: #47a447; - border-color: #398439; -} - -.btn-success:active, -.btn-success.active, -.open .dropdown-toggle.btn-success { - background-image: none; -} - -.btn-success.disabled, -.btn-success[disabled], -fieldset[disabled] .btn-success, -.btn-success.disabled:hover, -.btn-success[disabled]:hover, -fieldset[disabled] .btn-success:hover, -.btn-success.disabled:focus, -.btn-success[disabled]:focus, -fieldset[disabled] .btn-success:focus, -.btn-success.disabled:active, -.btn-success[disabled]:active, -fieldset[disabled] .btn-success:active, -.btn-success.disabled.active, -.btn-success[disabled].active, -fieldset[disabled] .btn-success.active { - background-color: #5cb85c; - border-color: #4cae4c; -} - -.btn-info { - color: #ffffff; - background-color: #5bc0de; - border-color: #46b8da; -} - -.btn-info:hover, -.btn-info:focus, -.btn-info:active, -.btn-info.active, -.open .dropdown-toggle.btn-info { - color: #ffffff; - background-color: #39b3d7; - border-color: #269abc; -} - -.btn-info:active, -.btn-info.active, -.open .dropdown-toggle.btn-info { - background-image: none; -} - -.btn-info.disabled, -.btn-info[disabled], -fieldset[disabled] .btn-info, -.btn-info.disabled:hover, -.btn-info[disabled]:hover, -fieldset[disabled] .btn-info:hover, -.btn-info.disabled:focus, -.btn-info[disabled]:focus, -fieldset[disabled] .btn-info:focus, -.btn-info.disabled:active, -.btn-info[disabled]:active, -fieldset[disabled] .btn-info:active, -.btn-info.disabled.active, -.btn-info[disabled].active, -fieldset[disabled] .btn-info.active { - background-color: #5bc0de; - border-color: #46b8da; -} - -.btn-link { - font-weight: normal; - color: #428bca; - cursor: pointer; - border-radius: 0; -} - -.btn-link, -.btn-link:active, -.btn-link[disabled], -fieldset[disabled] .btn-link { - background-color: transparent; - -webkit-box-shadow: none; - box-shadow: none; -} - -.btn-link, -.btn-link:hover, -.btn-link:focus, -.btn-link:active { - border-color: transparent; -} - -.btn-link:hover, -.btn-link:focus { - color: #2a6496; - text-decoration: underline; - background-color: transparent; -} - -.btn-link[disabled]:hover, -fieldset[disabled] .btn-link:hover, -.btn-link[disabled]:focus, -fieldset[disabled] .btn-link:focus { - color: #999999; - text-decoration: none; -} - -.btn-lg { - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px; -} - -.btn-sm, -.btn-xs { - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} - -.btn-xs { - padding: 1px 5px; -} - -.btn-block { - display: block; - width: 100%; - padding-right: 0; - padding-left: 0; -} - -.btn-block + .btn-block { - margin-top: 5px; -} - -input[type="submit"].btn-block, -input[type="reset"].btn-block, -input[type="button"].btn-block { - width: 100%; -} - -.fade { - opacity: 0; - -webkit-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; -} - -.fade.in { - opacity: 1; -} - -.collapse { - display: none; -} - -.collapse.in { - display: block; -} - -.collapsing { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition: height 0.35s ease; - transition: height 0.35s ease; -} - -@font-face { - font-family: 'Glyphicons Halflings'; - src: url('../fonts/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); -} - -.glyphicon { - position: relative; - top: 1px; - display: inline-block; - font-family: 'Glyphicons Halflings'; - -webkit-font-smoothing: antialiased; - font-style: normal; - font-weight: normal; - line-height: 1; -} - -.glyphicon-asterisk:before { - content: "\2a"; -} - -.glyphicon-plus:before { - content: "\2b"; -} - -.glyphicon-euro:before { - content: "\20ac"; -} - -.glyphicon-minus:before { - content: "\2212"; -} - -.glyphicon-cloud:before { - content: "\2601"; -} - -.glyphicon-envelope:before { - content: "\2709"; -} - -.glyphicon-pencil:before { - content: "\270f"; -} - -.glyphicon-glass:before { - content: "\e001"; -} - -.glyphicon-music:before { - content: "\e002"; -} - -.glyphicon-search:before { - content: "\e003"; -} - -.glyphicon-heart:before { - content: "\e005"; -} - -.glyphicon-star:before { - content: "\e006"; -} - -.glyphicon-star-empty:before { - content: "\e007"; -} - -.glyphicon-user:before { - content: "\e008"; -} - -.glyphicon-film:before { - content: "\e009"; -} - -.glyphicon-th-large:before { - content: "\e010"; -} - -.glyphicon-th:before { - content: "\e011"; -} - -.glyphicon-th-list:before { - content: "\e012"; -} - -.glyphicon-ok:before { - content: "\e013"; -} - -.glyphicon-remove:before { - content: "\e014"; -} - -.glyphicon-zoom-in:before { - content: "\e015"; -} - -.glyphicon-zoom-out:before { - content: "\e016"; -} - -.glyphicon-off:before { - content: "\e017"; -} - -.glyphicon-signal:before { - content: "\e018"; -} - -.glyphicon-cog:before { - content: "\e019"; -} - -.glyphicon-trash:before { - content: "\e020"; -} - -.glyphicon-home:before { - content: "\e021"; -} - -.glyphicon-file:before { - content: "\e022"; -} - -.glyphicon-time:before { - content: "\e023"; -} - -.glyphicon-road:before { - content: "\e024"; -} - -.glyphicon-download-alt:before { - content: "\e025"; -} - -.glyphicon-download:before { - content: "\e026"; -} - -.glyphicon-upload:before { - content: "\e027"; -} - -.glyphicon-inbox:before { - content: "\e028"; -} - -.glyphicon-play-circle:before { - content: "\e029"; -} - -.glyphicon-repeat:before { - content: "\e030"; -} - -.glyphicon-arrows-cw:before { - content: "\e031"; -} - -.glyphicon-list-alt:before { - content: "\e032"; -} - -.glyphicon-flag:before { - content: "\e034"; -} - -.glyphicon-headphones:before { - content: "\e035"; -} - -.glyphicon-volume-off:before { - content: "\e036"; -} - -.glyphicon-volume-down:before { - content: "\e037"; -} - -.glyphicon-volume-up:before { - content: "\e038"; -} - -.glyphicon-qrcode:before { - content: "\e039"; -} - -.glyphicon-barcode:before { - content: "\e040"; -} - -.glyphicon-tag:before { - content: "\e041"; -} - -.glyphicon-tags:before { - content: "\e042"; -} - -.glyphicon-book:before { - content: "\e043"; -} - -.glyphicon-print:before { - content: "\e045"; -} - -.glyphicon-font:before { - content: "\e047"; -} - -.glyphicon-bold:before { - content: "\e048"; -} - -.glyphicon-italic:before { - content: "\e049"; -} - -.glyphicon-text-height:before { - content: "\e050"; -} - -.glyphicon-text-width:before { - content: "\e051"; -} - -.glyphicon-align-left:before { - content: "\e052"; -} - -.glyphicon-align-center:before { - content: "\e053"; -} - -.glyphicon-align-right:before { - content: "\e054"; -} - -.glyphicon-align-justify:before { - content: "\e055"; -} - -.glyphicon-list:before { - content: "\e056"; -} - -.glyphicon-indent-left:before { - content: "\e057"; -} - -.glyphicon-indent-right:before { - content: "\e058"; -} - -.glyphicon-facetime-video:before { - content: "\e059"; -} - -.glyphicon-picture:before { - content: "\e060"; -} - -.glyphicon-map-marker:before { - content: "\e062"; -} - -.glyphicon-adjust:before { - content: "\e063"; -} - -.glyphicon-tint:before { - content: "\e064"; -} - -.glyphicon-edit:before { - content: "\e065"; -} - -.glyphicon-share:before { - content: "\e066"; -} - -.glyphicon-check:before { - content: "\e067"; -} - -.glyphicon-move:before { - content: "\e068"; -} - -.glyphicon-step-backward:before { - content: "\e069"; -} - -.glyphicon-fast-backward:before { - content: "\e070"; -} - -.glyphicon-backward:before { - content: "\e071"; -} - -.glyphicon-play:before { - content: "\e072"; -} - -.glyphicon-pause:before { - content: "\e073"; -} - -.glyphicon-stop:before { - content: "\e074"; -} - -.glyphicon-forward:before { - content: "\e075"; -} - -.glyphicon-fast-forward:before { - content: "\e076"; -} - -.glyphicon-step-forward:before { - content: "\e077"; -} - -.glyphicon-eject:before { - content: "\e078"; -} - -.glyphicon-chevron-left:before { - content: "\e079"; -} - -.glyphicon-chevron-right:before { - content: "\e080"; -} - -.glyphicon-plus-sign:before { - content: "\e081"; -} - -.glyphicon-minus-sign:before { - content: "\e082"; -} - -.glyphicon-remove-sign:before { - content: "\e083"; -} - -.glyphicon-ok-sign:before { - content: "\e084"; -} - -.glyphicon-question-sign:before { - content: "\e085"; -} - -.glyphicon-info-sign:before { - content: "\e086"; -} - -.glyphicon-screenshot:before { - content: "\e087"; -} - -.glyphicon-remove-circle:before { - content: "\e088"; -} - -.glyphicon-ok-circle:before { - content: "\e089"; -} - -.glyphicon-ban-circle:before { - content: "\e090"; -} - -.glyphicon-arrow-left:before { - content: "\e091"; -} - -.glyphicon-arrow-right:before { - content: "\e092"; -} - -.glyphicon-arrow-up:before { - content: "\e093"; -} - -.glyphicon-arrow-down:before { - content: "\e094"; -} - -.glyphicon-share-alt:before { - content: "\e095"; -} - -.glyphicon-resize-full:before { - content: "\e096"; -} - -.glyphicon-resize-small:before { - content: "\e097"; -} - -.glyphicon-exclamation-sign:before { - content: "\e101"; -} - -.glyphicon-gift:before { - content: "\e102"; -} - -.glyphicon-leaf:before { - content: "\e103"; -} - -.glyphicon-eye-open:before { - content: "\e105"; -} - -.glyphicon-eye-close:before { - content: "\e106"; -} - -.glyphicon-warning-sign:before { - content: "\e107"; -} - -.glyphicon-plane:before { - content: "\e108"; -} - -.glyphicon-random:before { - content: "\e110"; -} - -.glyphicon-comment:before { - content: "\e111"; -} - -.glyphicon-magnet:before { - content: "\e112"; -} - -.glyphicon-chevron-up:before { - content: "\e113"; -} - -.glyphicon-chevron-down:before { - content: "\e114"; -} - -.glyphicon-retweet:before { - content: "\e115"; -} - -.glyphicon-shopping-cart:before { - content: "\e116"; -} - -.glyphicon-folder-close:before { - content: "\e117"; -} - -.glyphicon-folder-open:before { - content: "\e118"; -} - -.glyphicon-resize-vertical:before { - content: "\e119"; -} - -.glyphicon-resize-horizontal:before { - content: "\e120"; -} - -.glyphicon-hdd:before { - content: "\e121"; -} - -.glyphicon-bullhorn:before { - content: "\e122"; -} - -.glyphicon-certificate:before { - content: "\e124"; -} - -.glyphicon-thumbs-up:before { - content: "\e125"; -} - -.glyphicon-thumbs-down:before { - content: "\e126"; -} - -.glyphicon-hand-right:before { - content: "\e127"; -} - -.glyphicon-hand-left:before { - content: "\e128"; -} - -.glyphicon-hand-up:before { - content: "\e129"; -} - -.glyphicon-hand-down:before { - content: "\e130"; -} - -.glyphicon-circle-arrow-right:before { - content: "\e131"; -} - -.glyphicon-circle-arrow-left:before { - content: "\e132"; -} - -.glyphicon-circle-arrow-up:before { - content: "\e133"; -} - -.glyphicon-circle-arrow-down:before { - content: "\e134"; -} - -.glyphicon-globe:before { - content: "\e135"; -} - -.glyphicon-tasks:before { - content: "\e137"; -} - -.glyphicon-filter:before { - content: "\e138"; -} - -.glyphicon-fullscreen:before { - content: "\e140"; -} - -.glyphicon-dashboard:before { - content: "\e141"; -} - -.glyphicon-heart-empty:before { - content: "\e143"; -} - -.glyphicon-link:before { - content: "\e144"; -} - -.glyphicon-phone:before { - content: "\e145"; -} - -.glyphicon-usd:before { - content: "\e148"; -} - -.glyphicon-gbp:before { - content: "\e149"; -} - -.glyphicon-sort:before { - content: "\e150"; -} - -.glyphicon-sort-by-alphabet:before { - content: "\e151"; -} - -.glyphicon-sort-by-alphabet-alt:before { - content: "\e152"; -} - -.glyphicon-sort-by-order:before { - content: "\e153"; -} - -.glyphicon-sort-by-order-alt:before { - content: "\e154"; -} - -.glyphicon-sort-by-attributes:before { - content: "\e155"; -} - -.glyphicon-sort-by-attributes-alt:before { - content: "\e156"; -} - -.glyphicon-unchecked:before { - content: "\e157"; -} - -.glyphicon-expand:before { - content: "\e158"; -} - -.glyphicon-collapse-down:before { - content: "\e159"; -} - -.glyphicon-collapse-up:before { - content: "\e160"; -} - -.glyphicon-log-in:before { - content: "\e161"; -} - -.glyphicon-flash:before { - content: "\e162"; -} - -.glyphicon-log-out:before { - content: "\e163"; -} - -.glyphicon-new-window:before { - content: "\e164"; -} - -.glyphicon-record:before { - content: "\e165"; -} - -.glyphicon-save:before { - content: "\e166"; -} - -.glyphicon-open:before { - content: "\e167"; -} - -.glyphicon-saved:before { - content: "\e168"; -} - -.glyphicon-import:before { - content: "\e169"; -} - -.glyphicon-export:before { - content: "\e170"; -} - -.glyphicon-send:before { - content: "\e171"; -} - -.glyphicon-floppy-disk:before { - content: "\e172"; -} - -.glyphicon-floppy-saved:before { - content: "\e173"; -} - -.glyphicon-floppy-remove:before { - content: "\e174"; -} - -.glyphicon-floppy-save:before { - content: "\e175"; -} - -.glyphicon-floppy-open:before { - content: "\e176"; -} - -.glyphicon-credit-card:before { - content: "\e177"; -} - -.glyphicon-transfer:before { - content: "\e178"; -} - -.glyphicon-cutlery:before { - content: "\e179"; -} - -.glyphicon-header:before { - content: "\e180"; -} - -.glyphicon-compressed:before { - content: "\e181"; -} - -.glyphicon-earphone:before { - content: "\e182"; -} - -.glyphicon-phone-alt:before { - content: "\e183"; -} - -.glyphicon-tower:before { - content: "\e184"; -} - -.glyphicon-stats:before { - content: "\e185"; -} - -.glyphicon-sd-video:before { - content: "\e186"; -} - -.glyphicon-hd-video:before { - content: "\e187"; -} - -.glyphicon-subtitles:before { - content: "\e188"; -} - -.glyphicon-sound-stereo:before { - content: "\e189"; -} - -.glyphicon-sound-dolby:before { - content: "\e190"; -} - -.glyphicon-sound-5-1:before { - content: "\e191"; -} - -.glyphicon-sound-6-1:before { - content: "\e192"; -} - -.glyphicon-sound-7-1:before { - content: "\e193"; -} - -.glyphicon-copyright-mark:before { - content: "\e194"; -} - -.glyphicon-registration-mark:before { - content: "\e195"; -} - -.glyphicon-cloud-download:before { - content: "\e197"; -} - -.glyphicon-cloud-upload:before { - content: "\e198"; -} - -.glyphicon-tree-conifer:before { - content: "\e199"; -} - -.glyphicon-tree-deciduous:before { - content: "\e200"; -} - -.glyphicon-briefcase:before { - content: "\1f4bc"; -} - -.glyphicon-calendar:before { - content: "\1f4c5"; -} - -.glyphicon-pushpin:before { - content: "\1f4cc"; -} - -.glyphicon-paperclip:before { - content: "\1f4ce"; -} - -.glyphicon-camera:before { - content: "\1f4f7"; -} - -.glyphicon-lock:before { - content: "\1f512"; -} - -.glyphicon-bell:before { - content: "\1f514"; -} - -.glyphicon-bookmark:before { - content: "\1f516"; -} - -.glyphicon-fire:before { - content: "\1f525"; -} - -.glyphicon-wrench:before { - content: "\1f527"; -} - -.caret { - display: inline-block; - width: 0; - height: 0; - margin-left: 2px; - vertical-align: middle; - border-top: 4px solid #000000; - border-right: 4px solid transparent; - border-bottom: 0 dotted; - border-left: 4px solid transparent; - content: ""; -} - -.dropdown { - position: relative; -} - -.dropdown-toggle:focus { - outline: 0; -} - -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; - font-size: 14px; - list-style: none; - background-color: #ffffff; - border: 1px solid #cccccc; - border: 1px solid rgba(0, 0, 0, 0.15); - border-radius: 4px; - -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); - box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); - background-clip: padding-box; -} - -.dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.dropdown-menu .divider { - height: 1px; - margin: 9px 0; - overflow: hidden; - background-color: #e5e5e5; -} - -.dropdown-menu > li > a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: normal; - line-height: 1.428571429; - color: #333333; - white-space: nowrap; -} - -.dropdown-menu > li > a:hover, -.dropdown-menu > li > a:focus { - color: #ffffff; - text-decoration: none; - background-color: #428bca; -} - -.dropdown-menu > .active > a, -.dropdown-menu > .active > a:hover, -.dropdown-menu > .active > a:focus { - color: #ffffff; - text-decoration: none; - background-color: #428bca; - outline: 0; -} - -.dropdown-menu > .disabled > a, -.dropdown-menu > .disabled > a:hover, -.dropdown-menu > .disabled > a:focus { - color: #999999; -} - -.dropdown-menu > .disabled > a:hover, -.dropdown-menu > .disabled > a:focus { - text-decoration: none; - cursor: not-allowed; - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); -} - -.open > .dropdown-menu { - display: block; -} - -.open > a { - outline: 0; -} - -.dropdown-header { - display: block; - padding: 3px 20px; - font-size: 12px; - line-height: 1.428571429; - color: #999999; -} - -.dropdown-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 990; -} - -.pull-right > .dropdown-menu { - right: 0; - left: auto; -} - -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { - border-top: 0 dotted; - border-bottom: 4px solid #000000; - content: ""; -} - -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; -} - -@media (min-width: 768px) { - .navbar-right .dropdown-menu { - right: 0; - left: auto; - } -} - -.btn-default .caret { - border-top-color: #333333; -} - -.btn-primary .caret, -.btn-success .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret { - border-top-color: #fff; -} - -.dropup .btn-default .caret { - border-bottom-color: #333333; -} - -.dropup .btn-primary .caret, -.dropup .btn-success .caret, -.dropup .btn-warning .caret, -.dropup .btn-danger .caret, -.dropup .btn-info .caret { - border-bottom-color: #fff; -} - -.btn-group, -.btn-group-vertical { - position: relative; - display: inline-block; - vertical-align: middle; -} - -.btn-group > .btn, -.btn-group-vertical > .btn { - position: relative; - float: left; -} - -.btn-group > .btn:hover, -.btn-group-vertical > .btn:hover, -.btn-group > .btn:focus, -.btn-group-vertical > .btn:focus, -.btn-group > .btn:active, -.btn-group-vertical > .btn:active, -.btn-group > .btn.active, -.btn-group-vertical > .btn.active { - z-index: 2; -} - -.btn-group > .btn:focus, -.btn-group-vertical > .btn:focus { - outline: none; -} - -.btn-group .btn + .btn, -.btn-group .btn + .btn-group, -.btn-group .btn-group + .btn, -.btn-group .btn-group + .btn-group { - margin-left: -1px; -} - -.btn-toolbar:before, -.btn-toolbar:after { - display: table; - content: " "; -} - -.btn-toolbar:after { - clear: both; -} - -.btn-toolbar:before, -.btn-toolbar:after { - display: table; - content: " "; -} - -.btn-toolbar:after { - clear: both; -} - -.btn-toolbar .btn-group { - float: left; -} - -.btn-toolbar > .btn + .btn, -.btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group, -.btn-toolbar > .btn-group + .btn-group { - margin-left: 5px; -} - -.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { - border-radius: 0; -} - -.btn-group > .btn:first-child { - margin-left: 0; -} - -.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.btn-group > .btn:last-child:not(:first-child), -.btn-group > .dropdown-toggle:not(:first-child) { - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -.btn-group > .btn-group { - float: left; -} - -.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0; -} - -.btn-group > .btn-group:first-child > .btn:last-child, -.btn-group > .btn-group:first-child > .dropdown-toggle { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.btn-group > .btn-group:last-child > .btn:first-child { - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} - -.btn-group-xs > .btn { - padding: 5px 10px; - padding: 1px 5px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} - -.btn-group-sm > .btn { - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} - -.btn-group-lg > .btn { - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px; -} - -.btn-group > .btn + .dropdown-toggle { - padding-right: 8px; - padding-left: 8px; -} - -.btn-group > .btn-lg + .dropdown-toggle { - padding-right: 12px; - padding-left: 12px; -} - -.btn-group.open .dropdown-toggle { - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); -} - -.btn .caret { - margin-left: 0; -} - -.btn-lg .caret { - border-width: 5px 5px 0; - border-bottom-width: 0; -} - -.dropup .btn-lg .caret { - border-width: 0 5px 5px; -} - -.btn-group-vertical > .btn, -.btn-group-vertical > .btn-group { - display: block; - float: none; - width: 100%; - max-width: 100%; -} - -.btn-group-vertical > .btn-group:before, -.btn-group-vertical > .btn-group:after { - display: table; - content: " "; -} - -.btn-group-vertical > .btn-group:after { - clear: both; -} - -.btn-group-vertical > .btn-group:before, -.btn-group-vertical > .btn-group:after { - display: table; - content: " "; -} - -.btn-group-vertical > .btn-group:after { - clear: both; -} - -.btn-group-vertical > .btn-group > .btn { - float: none; -} - -.btn-group-vertical > .btn + .btn, -.btn-group-vertical > .btn + .btn-group, -.btn-group-vertical > .btn-group + .btn, -.btn-group-vertical > .btn-group + .btn-group { - margin-top: -1px; - margin-left: 0; -} - -.btn-group-vertical > .btn:not(:first-child):not(:last-child) { - border-radius: 0; -} - -.btn-group-vertical > .btn:first-child:not(:last-child) { - border-top-right-radius: 4px; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -.btn-group-vertical > .btn:last-child:not(:first-child) { - border-top-right-radius: 0; - border-bottom-left-radius: 4px; - border-top-left-radius: 0; -} - -.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0; -} - -.btn-group-vertical > .btn-group:first-child > .btn:last-child, -.btn-group-vertical > .btn-group:first-child > .dropdown-toggle { - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -.btn-group-vertical > .btn-group:last-child > .btn:first-child { - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.btn-group-justified { - display: table; - width: 100%; - border-collapse: separate; - table-layout: fixed; -} - -.btn-group-justified .btn { - display: table-cell; - float: none; - width: 1%; -} - -[data-toggle="buttons"] > .btn > input[type="radio"], -[data-toggle="buttons"] > .btn > input[type="checkbox"] { - display: none; -} - -.input-group { - position: relative; - display: table; - border-collapse: separate; -} - -.input-group.col { - float: none; - padding-right: 0; - padding-left: 0; -} - -.input-group .form-control { - width: 100%; - margin-bottom: 0; -} - -.input-group-lg > .form-control, -.input-group-lg > .input-group-addon, -.input-group-lg > .input-group-btn > .btn { - height: 45px; - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px; -} - -select.input-group-lg > .form-control, -select.input-group-lg > .input-group-addon, -select.input-group-lg > .input-group-btn > .btn { - height: 45px; - line-height: 45px; -} - -textarea.input-group-lg > .form-control, -textarea.input-group-lg > .input-group-addon, -textarea.input-group-lg > .input-group-btn > .btn { - height: auto; -} - -.input-group-sm > .form-control, -.input-group-sm > .input-group-addon, -.input-group-sm > .input-group-btn > .btn { - height: 30px; - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; -} - -select.input-group-sm > .form-control, -select.input-group-sm > .input-group-addon, -select.input-group-sm > .input-group-btn > .btn { - height: 30px; - line-height: 30px; -} - -textarea.input-group-sm > .form-control, -textarea.input-group-sm > .input-group-addon, -textarea.input-group-sm > .input-group-btn > .btn { - height: auto; -} - -.input-group-addon, -.input-group-btn, -.input-group .form-control { - display: table-cell; -} - -.input-group-addon:not(:first-child):not(:last-child), -.input-group-btn:not(:first-child):not(:last-child), -.input-group .form-control:not(:first-child):not(:last-child) { - border-radius: 0; -} - -.input-group-addon, -.input-group-btn { - width: 1%; - white-space: nowrap; - vertical-align: middle; -} - -.input-group-addon { - padding: 6px 12px; - font-size: 14px; - font-weight: normal; - line-height: 1; - text-align: center; - background-color: #eeeeee; - border: 1px solid #cccccc; - border-radius: 4px; -} - -.input-group-addon.input-sm { - padding: 5px 10px; - font-size: 12px; - border-radius: 3px; -} - -.input-group-addon.input-lg { - padding: 10px 16px; - font-size: 18px; - border-radius: 6px; -} - -.input-group-addon input[type="radio"], -.input-group-addon input[type="checkbox"] { - margin-top: 0; -} - -.input-group .form-control:first-child, -.input-group-addon:first-child, -.input-group-btn:first-child > .btn, -.input-group-btn:first-child > .dropdown-toggle, -.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.input-group-addon:first-child { - border-right: 0; -} - -.input-group .form-control:last-child, -.input-group-addon:last-child, -.input-group-btn:last-child > .btn, -.input-group-btn:last-child > .dropdown-toggle, -.input-group-btn:first-child > .btn:not(:first-child) { - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} - -.input-group-addon:last-child { - border-left: 0; -} - -.input-group-btn { - position: relative; - white-space: nowrap; -} - -.input-group-btn > .btn { - position: relative; -} - -.input-group-btn > .btn + .btn { - margin-left: -4px; -} - -.input-group-btn > .btn:hover, -.input-group-btn > .btn:active { - z-index: 2; -} - -.nav { - padding-left: 0; - margin-bottom: 0; - list-style: none; -} - -.nav:before, -.nav:after { - display: table; - content: " "; -} - -.nav:after { - clear: both; -} - -.nav:before, -.nav:after { - display: table; - content: " "; -} - -.nav:after { - clear: both; -} - -.nav > li { - position: relative; - display: block; -} - -.nav > li > a { - position: relative; - display: block; - padding: 10px 15px; -} - -.nav > li > a:hover, -.nav > li > a:focus { - text-decoration: none; - background-color: #eeeeee; -} - -.nav > li.disabled > a { - color: #999999; -} - -.nav > li.disabled > a:hover, -.nav > li.disabled > a:focus { - color: #999999; - text-decoration: none; - cursor: not-allowed; - background-color: transparent; -} - -.nav .open > a, -.nav .open > a:hover, -.nav .open > a:focus { - background-color: #eeeeee; - border-color: #428bca; -} - -.nav .nav-divider { - height: 1px; - margin: 9px 0; - overflow: hidden; - background-color: #e5e5e5; -} - -.nav > li > a > img { - max-width: none; -} - -.nav-tabs { - border-bottom: 1px solid #dddddd; -} - -.nav-tabs > li { - float: left; - margin-bottom: -1px; -} - -.nav-tabs > li > a { - margin-right: 2px; - line-height: 1.428571429; - border: 1px solid transparent; - border-radius: 4px 4px 0 0; -} - -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} - -.nav-tabs > li.active > a, -.nav-tabs > li.active > a:hover, -.nav-tabs > li.active > a:focus { - color: #555555; - cursor: default; - background-color: #ffffff; - border: 1px solid #dddddd; - border-bottom-color: transparent; -} - -.nav-tabs.nav-justified { - width: 100%; - border-bottom: 0; -} - -.nav-tabs.nav-justified > li { - float: none; -} - -.nav-tabs.nav-justified > li > a { - text-align: center; -} - -@media (min-width: 768px) { - .nav-tabs.nav-justified > li { - display: table-cell; - width: 1%; - } -} - -.nav-tabs.nav-justified > li > a { - margin-right: 0; - border-bottom: 1px solid #dddddd; -} - -.nav-tabs.nav-justified > .active > a { - border-bottom-color: #ffffff; -} - -.nav-pills > li { - float: left; -} - -.nav-pills > li > a { - border-radius: 5px; -} - -.nav-pills > li + li { - margin-left: 2px; -} - -.nav-pills > li.active > a, -.nav-pills > li.active > a:hover, -.nav-pills > li.active > a:focus { - color: #ffffff; - background-color: #428bca; -} - -.nav-stacked > li { - float: none; -} - -.nav-stacked > li + li { - margin-top: 2px; - margin-left: 0; -} - -.nav-justified { - width: 100%; -} - -.nav-justified > li { - float: none; -} - -.nav-justified > li > a { - text-align: center; -} - -@media (min-width: 768px) { - .nav-justified > li { - display: table-cell; - width: 1%; - } -} - -.nav-tabs-justified { - border-bottom: 0; -} - -.nav-tabs-justified > li > a { - margin-right: 0; - border-bottom: 1px solid #dddddd; -} - -.nav-tabs-justified > .active > a { - border-bottom-color: #ffffff; -} - -.tabbable:before, -.tabbable:after { - display: table; - content: " "; -} - -.tabbable:after { - clear: both; -} - -.tabbable:before, -.tabbable:after { - display: table; - content: " "; -} - -.tabbable:after { - clear: both; -} - -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} - -.tab-content > .active, -.pill-content > .active { - display: block; -} - -.nav .caret { - border-top-color: #428bca; - border-bottom-color: #428bca; -} - -.nav a:hover .caret { - border-top-color: #2a6496; - border-bottom-color: #2a6496; -} - -.nav-tabs .dropdown-menu { - margin-top: -1px; - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.navbar { - position: relative; - z-index: 1000; - min-height: 50px; - margin-bottom: 20px; - border: 1px solid transparent; -} - -.navbar:before, -.navbar:after { - display: table; - content: " "; -} - -.navbar:after { - clear: both; -} - -.navbar:before, -.navbar:after { - display: table; - content: " "; -} - -.navbar:after { - clear: both; -} - -@media (min-width: 768px) { - .navbar { - border-radius: 4px; - } -} - -.navbar-header:before, -.navbar-header:after { - display: table; - content: " "; -} - -.navbar-header:after { - clear: both; -} - -.navbar-header:before, -.navbar-header:after { - display: table; - content: " "; -} - -.navbar-header:after { - clear: both; -} - -@media (min-width: 768px) { - .navbar-header { - float: left; - } -} - -.navbar-collapse { - max-height: 340px; - padding-right: 15px; - padding-left: 15px; - overflow-x: visible; - border-top: 1px solid transparent; - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); - -webkit-overflow-scrolling: touch; -} - -.navbar-collapse:before, -.navbar-collapse:after { - display: table; - content: " "; -} - -.navbar-collapse:after { - clear: both; -} - -.navbar-collapse:before, -.navbar-collapse:after { - display: table; - content: " "; -} - -.navbar-collapse:after { - clear: both; -} - -.navbar-collapse.in { - overflow-y: auto; -} - -@media (min-width: 768px) { - .navbar-collapse { - width: auto; - border-top: 0; - box-shadow: none; - } - .navbar-collapse.collapse { - display: block !important; - height: auto !important; - padding-bottom: 0; - overflow: visible !important; - } - .navbar-collapse.in { - overflow-y: visible; - } - .navbar-collapse .navbar-nav.navbar-left:first-child { - margin-left: -15px; - } - .navbar-collapse .navbar-nav.navbar-right:last-child { - margin-right: -15px; - } - .navbar-collapse .navbar-text:last-child { - margin-right: 0; - } -} - -.container > .navbar-header, -.container > .navbar-collapse { - margin-right: -15px; - margin-left: -15px; -} - -@media (min-width: 768px) { - .container > .navbar-header, - .container > .navbar-collapse { - margin-right: 0; - margin-left: 0; - } -} - -.navbar-static-top { - border-width: 0 0 1px; -} - -@media (min-width: 768px) { - .navbar-static-top { - border-radius: 0; - } -} - -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - border-width: 0 0 1px; -} - -@media (min-width: 768px) { - .navbar-fixed-top, - .navbar-fixed-bottom { - border-radius: 0; - } -} - -.navbar-fixed-top { - top: 0; - z-index: 1030; -} - -.navbar-fixed-bottom { - bottom: 0; - margin-bottom: 0; -} - -.navbar-brand { - float: left; - padding: 15px 15px; - font-size: 18px; - line-height: 20px; -} - -.navbar-brand:hover, -.navbar-brand:focus { - text-decoration: none; -} - -@media (min-width: 768px) { - .navbar > .container .navbar-brand { - margin-left: -15px; - } -} - -.navbar-toggle { - position: relative; - float: right; - padding: 9px 10px; - margin-top: 8px; - margin-right: 15px; - margin-bottom: 8px; - background-color: transparent; - border: 1px solid transparent; - border-radius: 4px; -} - -.navbar-toggle .icon-bar { - display: block; - width: 22px; - height: 2px; - border-radius: 1px; -} - -.navbar-toggle .icon-bar + .icon-bar { - margin-top: 4px; -} - -@media (min-width: 768px) { - .navbar-toggle { - display: none; - } -} - -.navbar-nav { - margin: 7.5px -15px; -} - -.navbar-nav > li > a { - padding-top: 10px; - padding-bottom: 10px; - line-height: 20px; -} - -@media (max-width: 767px) { - .navbar-nav .open .dropdown-menu { - position: static; - float: none; - width: auto; - margin-top: 0; - background-color: transparent; - border: 0; - box-shadow: none; - } - .navbar-nav .open .dropdown-menu > li > a, - .navbar-nav .open .dropdown-menu .dropdown-header { - padding: 5px 15px 5px 25px; - } - .navbar-nav .open .dropdown-menu > li > a { - line-height: 20px; - } - .navbar-nav .open .dropdown-menu > li > a:hover, - .navbar-nav .open .dropdown-menu > li > a:focus { - background-image: none; - } -} - -@media (min-width: 768px) { - .navbar-nav { - float: left; - margin: 0; - } - .navbar-nav > li { - float: left; - } - .navbar-nav > li > a { - padding-top: 15px; - padding-bottom: 15px; - } -} - -@media (min-width: 768px) { - .navbar-left { - float: left !important; - } - .navbar-right { - float: right !important; - } -} - -.navbar-form { - padding: 10px 15px; - margin-top: 8px; - margin-right: -15px; - margin-bottom: 8px; - margin-left: -15px; - border-top: 1px solid transparent; - border-bottom: 1px solid transparent; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); -} - -@media (min-width: 768px) { - .navbar-form .form-group { - display: inline-block; - margin-bottom: 0; - vertical-align: middle; - } - .navbar-form .form-control { - display: inline-block; - } - .navbar-form .radio, - .navbar-form .checkbox { - display: inline-block; - padding-left: 0; - margin-top: 0; - margin-bottom: 0; - } - .navbar-form .radio input[type="radio"], - .navbar-form .checkbox input[type="checkbox"] { - float: none; - margin-left: 0; - } -} - -@media (max-width: 767px) { - .navbar-form .form-group { - margin-bottom: 5px; - } -} - -@media (min-width: 768px) { - .navbar-form { - width: auto; - padding-top: 0; - padding-bottom: 0; - margin-right: 0; - margin-left: 0; - border: 0; - -webkit-box-shadow: none; - box-shadow: none; - } -} - -.navbar-nav > li > .dropdown-menu { - margin-top: 0; - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { - border-bottom-right-radius: 0; - border-bottom-left-radius: 0; -} - -.navbar-nav.pull-right > li > .dropdown-menu, -.navbar-nav > li > .dropdown-menu.pull-right { - right: 0; - left: auto; -} - -.navbar-btn { - margin-top: 8px; - margin-bottom: 8px; -} - -.navbar-text { - float: left; - margin-top: 15px; - margin-bottom: 15px; -} - -@media (min-width: 768px) { - .navbar-text { - margin-right: 15px; - margin-left: 15px; - } -} - -.navbar-default { - background-color: #f8f8f8; - border-color: #e7e7e7; -} - -.navbar-default .navbar-brand { - color: #777777; -} - -.navbar-default .navbar-brand:hover, -.navbar-default .navbar-brand:focus { - color: #5e5e5e; - background-color: transparent; -} - -.navbar-default .navbar-text { - color: #777777; -} - -.navbar-default .navbar-nav > li > a { - color: #777777; -} - -.navbar-default .navbar-nav > li > a:hover, -.navbar-default .navbar-nav > li > a:focus { - color: #333333; - background-color: transparent; -} - -.navbar-default .navbar-nav > .active > a, -.navbar-default .navbar-nav > .active > a:hover, -.navbar-default .navbar-nav > .active > a:focus { - color: #555555; - background-color: #e7e7e7; -} - -.navbar-default .navbar-nav > .disabled > a, -.navbar-default .navbar-nav > .disabled > a:hover, -.navbar-default .navbar-nav > .disabled > a:focus { - color: #cccccc; - background-color: transparent; -} - -.navbar-default .navbar-toggle { - border-color: #dddddd; -} - -.navbar-default .navbar-toggle:hover, -.navbar-default .navbar-toggle:focus { - background-color: #dddddd; -} - -.navbar-default .navbar-toggle .icon-bar { - background-color: #cccccc; -} - -.navbar-default .navbar-collapse, -.navbar-default .navbar-form { - border-color: #e6e6e6; -} - -.navbar-default .navbar-nav > .dropdown > a:hover .caret, -.navbar-default .navbar-nav > .dropdown > a:focus .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} - -.navbar-default .navbar-nav > .open > a, -.navbar-default .navbar-nav > .open > a:hover, -.navbar-default .navbar-nav > .open > a:focus { - color: #555555; - background-color: #e7e7e7; -} - -.navbar-default .navbar-nav > .open > a .caret, -.navbar-default .navbar-nav > .open > a:hover .caret, -.navbar-default .navbar-nav > .open > a:focus .caret { - border-top-color: #555555; - border-bottom-color: #555555; -} - -.navbar-default .navbar-nav > .dropdown > a .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - -@media (max-width: 767px) { - .navbar-default .navbar-nav .open .dropdown-menu > li > a { - color: #777777; - } - .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus { - color: #333333; - background-color: transparent; - } - .navbar-default .navbar-nav .open .dropdown-menu > .active > a, - .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #555555; - background-color: #e7e7e7; - } - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, - .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #cccccc; - background-color: transparent; - } -} - -.navbar-default .navbar-link { - color: #777777; -} - -.navbar-default .navbar-link:hover { - color: #333333; -} - -.navbar-inverse { - background-color: #222222; - border-color: #080808; -} - -.navbar-inverse .navbar-brand { - color: #999999; -} - -.navbar-inverse .navbar-brand:hover, -.navbar-inverse .navbar-brand:focus { - color: #ffffff; - background-color: transparent; -} - -.navbar-inverse .navbar-text { - color: #999999; -} - -.navbar-inverse .navbar-nav > li > a { - color: #999999; -} - -.navbar-inverse .navbar-nav > li > a:hover, -.navbar-inverse .navbar-nav > li > a:focus { - color: #ffffff; - background-color: transparent; -} - -.navbar-inverse .navbar-nav > .active > a, -.navbar-inverse .navbar-nav > .active > a:hover, -.navbar-inverse .navbar-nav > .active > a:focus { - color: #ffffff; - background-color: #080808; -} - -.navbar-inverse .navbar-nav > .disabled > a, -.navbar-inverse .navbar-nav > .disabled > a:hover, -.navbar-inverse .navbar-nav > .disabled > a:focus { - color: #444444; - background-color: transparent; -} - -.navbar-inverse .navbar-toggle { - border-color: #333333; -} - -.navbar-inverse .navbar-toggle:hover, -.navbar-inverse .navbar-toggle:focus { - background-color: #333333; -} - -.navbar-inverse .navbar-toggle .icon-bar { - background-color: #ffffff; -} - -.navbar-inverse .navbar-collapse, -.navbar-inverse .navbar-form { - border-color: #101010; -} - -.navbar-inverse .navbar-nav > .open > a, -.navbar-inverse .navbar-nav > .open > a:hover, -.navbar-inverse .navbar-nav > .open > a:focus { - color: #ffffff; - background-color: #080808; -} - -.navbar-inverse .navbar-nav > .dropdown > a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -.navbar-inverse .navbar-nav > .dropdown > a .caret { - border-top-color: #999999; - border-bottom-color: #999999; -} - -.navbar-inverse .navbar-nav > .open > a .caret, -.navbar-inverse .navbar-nav > .open > a:hover .caret, -.navbar-inverse .navbar-nav > .open > a:focus .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} - -@media (max-width: 767px) { - .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { - border-color: #080808; - } - .navbar-inverse .navbar-nav .open .dropdown-menu > li > a { - color: #999999; - } - .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, - .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { - color: #ffffff; - background-color: transparent; - } - .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a, - .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover, - .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus { - color: #ffffff; - background-color: #080808; - } - .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a, - .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover, - .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus { - color: #444444; - background-color: transparent; - } -} - -.navbar-inverse .navbar-link { - color: #999999; -} - -.navbar-inverse .navbar-link:hover { - color: #ffffff; -} - -.breadcrumb { - padding: 8px 15px; - margin-bottom: 20px; - list-style: none; - background-color: #f5f5f5; - border-radius: 4px; -} - -.breadcrumb > li { - display: inline-block; -} - -.breadcrumb > li + li:before { - padding: 0 5px; - color: #cccccc; - content: "/\00a0"; -} - -.breadcrumb > .active { - color: #999999; -} - -.pagination { - display: inline-block; - padding-left: 0; - margin: 20px 0; - border-radius: 4px; -} - -.pagination > li { - display: inline; -} - -.pagination > li > a, -.pagination > li > span { - position: relative; - float: left; - padding: 6px 12px; - margin-left: -1px; - line-height: 1.428571429; - text-decoration: none; - background-color: #ffffff; - border: 1px solid #dddddd; -} - -.pagination > li:first-child > a, -.pagination > li:first-child > span { - margin-left: 0; - border-bottom-left-radius: 4px; - border-top-left-radius: 4px; -} - -.pagination > li:last-child > a, -.pagination > li:last-child > span { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} - -.pagination > li > a:hover, -.pagination > li > span:hover, -.pagination > li > a:focus, -.pagination > li > span:focus { - background-color: #eeeeee; -} - -.pagination > .active > a, -.pagination > .active > span, -.pagination > .active > a:hover, -.pagination > .active > span:hover, -.pagination > .active > a:focus, -.pagination > .active > span:focus { - z-index: 2; - color: #ffffff; - cursor: default; - background-color: #428bca; - border-color: #428bca; -} - -.pagination > .disabled > span, -.pagination > .disabled > a, -.pagination > .disabled > a:hover, -.pagination > .disabled > a:focus { - color: #999999; - cursor: not-allowed; - background-color: #ffffff; - border-color: #dddddd; -} - -.pagination-lg > li > a, -.pagination-lg > li > span { - padding: 10px 16px; - font-size: 18px; -} - -.pagination-lg > li:first-child > a, -.pagination-lg > li:first-child > span { - border-bottom-left-radius: 6px; - border-top-left-radius: 6px; -} - -.pagination-lg > li:last-child > a, -.pagination-lg > li:last-child > span { - border-top-right-radius: 6px; - border-bottom-right-radius: 6px; -} - -.pagination-sm > li > a, -.pagination-sm > li > span { - padding: 5px 10px; - font-size: 12px; -} - -.pagination-sm > li:first-child > a, -.pagination-sm > li:first-child > span { - border-bottom-left-radius: 3px; - border-top-left-radius: 3px; -} - -.pagination-sm > li:last-child > a, -.pagination-sm > li:last-child > span { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; -} - -.pager { - padding-left: 0; - margin: 20px 0; - text-align: center; - list-style: none; -} - -.pager:before, -.pager:after { - display: table; - content: " "; -} - -.pager:after { - clear: both; -} - -.pager:before, -.pager:after { - display: table; - content: " "; -} - -.pager:after { - clear: both; -} - -.pager li { - display: inline; -} - -.pager li > a, -.pager li > span { - display: inline-block; - padding: 5px 14px; - background-color: #ffffff; - border: 1px solid #dddddd; - border-radius: 15px; -} - -.pager li > a:hover, -.pager li > a:focus { - text-decoration: none; - background-color: #eeeeee; -} - -.pager .next > a, -.pager .next > span { - float: right; -} - -.pager .previous > a, -.pager .previous > span { - float: left; -} - -.pager .disabled > a, -.pager .disabled > a:hover, -.pager .disabled > a:focus, -.pager .disabled > span { - color: #999999; - cursor: not-allowed; - background-color: #ffffff; -} - -.label { - display: inline; - padding: .2em .6em .3em; - font-size: 75%; - font-weight: bold; - line-height: 1; - color: #ffffff; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - border-radius: .25em; -} - -.label[href]:hover, -.label[href]:focus { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} - -.label:empty { - display: none; -} - -.label-default { - background-color: #999999; -} - -.label-default[href]:hover, -.label-default[href]:focus { - background-color: #808080; -} - -.label-primary { - background-color: #428bca; -} - -.label-primary[href]:hover, -.label-primary[href]:focus { - background-color: #3071a9; -} - -.label-success { - background-color: #5cb85c; -} - -.label-success[href]:hover, -.label-success[href]:focus { - background-color: #449d44; -} - -.label-info { - background-color: #5bc0de; -} - -.label-info[href]:hover, -.label-info[href]:focus { - background-color: #31b0d5; -} - -.label-warning { - background-color: #f0ad4e; -} - -.label-warning[href]:hover, -.label-warning[href]:focus { - background-color: #ec971f; -} - -.label-danger { - background-color: #d9534f; -} - -.label-danger[href]:hover, -.label-danger[href]:focus { - background-color: #c9302c; -} - -.badge { - display: inline-block; - min-width: 10px; - padding: 3px 7px; - font-size: 12px; - font-weight: bold; - line-height: 1; - color: #ffffff; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - background-color: #999999; - border-radius: 10px; -} - -.badge:empty { - display: none; -} - -a.badge:hover, -a.badge:focus { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} - -.btn .badge { - position: relative; - top: -1px; -} - -a.list-group-item.active > .badge, -.nav-pills > .active > a > .badge { - color: #428bca; - background-color: #ffffff; -} - -.nav-pills > li > a > .badge { - margin-left: 3px; -} - -.jumbotron { - padding: 30px; - margin-bottom: 30px; - font-size: 21px; - font-weight: 200; - line-height: 2.1428571435; - color: inherit; - background-color: #eeeeee; -} - -.jumbotron h1 { - line-height: 1; - color: inherit; -} - -.jumbotron p { - line-height: 1.4; -} - -.container .jumbotron { - border-radius: 6px; -} - -@media screen and (min-width: 768px) { - .jumbotron { - padding-top: 48px; - padding-bottom: 48px; - } - .container .jumbotron { - padding-right: 60px; - padding-left: 60px; - } - .jumbotron h1 { - font-size: 63px; - } -} - -.thumbnail { - display: inline-block; - display: block; - height: auto; - max-width: 100%; - padding: 4px; - line-height: 1.428571429; - background-color: #ffffff; - border: 1px solid #dddddd; - border-radius: 4px; - -webkit-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; -} - -.thumbnail > img { - display: block; - height: auto; - max-width: 100%; -} - -a.thumbnail:hover, -a.thumbnail:focus { - border-color: #428bca; -} - -.thumbnail > img { - margin-right: auto; - margin-left: auto; -} - -.thumbnail .caption { - padding: 9px; - color: #333333; -} - -.alert { - padding: 15px; - margin-bottom: 20px; - border: 1px solid transparent; - border-radius: 4px; -} - -.alert h4 { - margin-top: 0; - color: inherit; -} - -.alert .alert-link { - font-weight: bold; -} - -.alert > p, -.alert > ul { - margin-bottom: 0; -} - -.alert > p + p { - margin-top: 5px; -} - -.alert-dismissable { - padding-right: 35px; -} - -.alert-dismissable .close { - position: relative; - top: -2px; - right: -21px; - color: inherit; -} - -.alert-success { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.alert-success hr { - border-top-color: #c9e2b3; -} - -.alert-success .alert-link { - color: #356635; -} - -.alert-info { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.alert-info hr { - border-top-color: #a6e1ec; -} - -.alert-info .alert-link { - color: #2d6987; -} - -.alert-warning { - color: #c09853; - background-color: #fcf8e3; - border-color: #fbeed5; -} - -.alert-warning hr { - border-top-color: #f8e5be; -} - -.alert-warning .alert-link { - color: #a47e3c; -} - -.alert-danger { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; -} - -.alert-danger hr { - border-top-color: #e6c1c7; -} - -.alert-danger .alert-link { - color: #953b39; -} - -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-moz-keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -@-o-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} - -@keyframes progress-bar-stripes { - from { - background-position: 40px 0; - } - to { - background-position: 0 0; - } -} - -.progress { - height: 20px; - margin-bottom: 20px; - overflow: hidden; - background-color: #f5f5f5; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); -} - -.progress-bar { - float: left; - width: 0; - height: 100%; - font-size: 12px; - color: #ffffff; - text-align: center; - background-color: #428bca; - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-transition: width 0.6s ease; - transition: width 0.6s ease; -} - -.progress-striped .progress-bar { - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-size: 40px 40px; -} - -.progress.active .progress-bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - -ms-animation: progress-bar-stripes 2s linear infinite; - -o-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} - -.progress-bar-success { - background-color: #5cb85c; -} - -.progress-striped .progress-bar-success { - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-bar-info { - background-color: #5bc0de; -} - -.progress-striped .progress-bar-info { - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-bar-warning { - background-color: #f0ad4e; -} - -.progress-striped .progress-bar-warning { - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.progress-bar-danger { - background-color: #d9534f; -} - -.progress-striped .progress-bar-danger { - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} - -.media, -.media-body { - overflow: hidden; - zoom: 1; -} - -.media, -.media .media { - margin-top: 15px; -} - -.media:first-child { - margin-top: 0; -} - -.media-object { - display: block; -} - -.media-heading { - margin: 0 0 5px; -} - -.media > .pull-left { - margin-right: 10px; -} - -.media > .pull-right { - margin-left: 10px; -} - -.media-list { - padding-left: 0; - list-style: none; -} - -.list-group { - padding-left: 0; - margin-bottom: 20px; -} - -.list-group-item { - position: relative; - display: block; - padding: 10px 15px; - margin-bottom: -1px; - background-color: #ffffff; - border: 1px solid #dddddd; -} - -.list-group-item:first-child { - border-top-right-radius: 4px; - border-top-left-radius: 4px; -} - -.list-group-item:last-child { - margin-bottom: 0; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 4px; -} - -.list-group-item > .badge { - float: right; -} - -.list-group-item > .badge + .badge { - margin-right: 5px; -} - -a.list-group-item { - color: #555555; -} - -a.list-group-item .list-group-item-heading { - color: #333333; -} - -a.list-group-item:hover, -a.list-group-item:focus { - text-decoration: none; - background-color: #f5f5f5; -} - -.list-group-item.active, -.list-group-item.active:hover, -.list-group-item.active:focus { - z-index: 2; - color: #ffffff; - background-color: #428bca; - border-color: #428bca; -} - -.list-group-item.active .list-group-item-heading, -.list-group-item.active:hover .list-group-item-heading, -.list-group-item.active:focus .list-group-item-heading { - color: inherit; -} - -.list-group-item.active .list-group-item-text, -.list-group-item.active:hover .list-group-item-text, -.list-group-item.active:focus .list-group-item-text { - color: #e1edf7; -} - -.list-group-item-heading { - margin-top: 0; - margin-bottom: 5px; -} - -.list-group-item-text { - margin-bottom: 0; - line-height: 1.3; -} - -.panel { - margin-bottom: 20px; - background-color: #ffffff; - border: 1px solid transparent; - border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); -} - -.panel-body { - padding: 15px; -} - -.panel-body:before, -.panel-body:after { - display: table; - content: " "; -} - -.panel-body:after { - clear: both; -} - -.panel-body:before, -.panel-body:after { - display: table; - content: " "; -} - -.panel-body:after { - clear: both; -} - -.panel > .list-group { - margin-bottom: 0; -} - -.panel > .list-group .list-group-item { - border-width: 1px 0; -} - -.panel > .list-group .list-group-item:first-child { - border-top-right-radius: 0; - border-top-left-radius: 0; -} - -.panel > .list-group .list-group-item:last-child { - border-bottom: 0; -} - -.panel-heading + .list-group .list-group-item:first-child { - border-top-width: 0; -} - -.panel > .table { - margin-bottom: 0; -} - -.panel > .panel-body + .table { - border-top: 1px solid #dddddd; -} - -.panel-heading { - padding: 10px 15px; - border-bottom: 1px solid transparent; - border-top-right-radius: 3px; - border-top-left-radius: 3px; -} - -.panel-title { - margin-top: 0; - margin-bottom: 0; - font-size: 16px; -} - -.panel-title > a { - color: inherit; -} - -.panel-footer { - padding: 10px 15px; - background-color: #f5f5f5; - border-top: 1px solid #dddddd; - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; -} - -.panel-group .panel { - margin-bottom: 0; - overflow: hidden; - border-radius: 4px; -} - -.panel-group .panel + .panel { - margin-top: 5px; -} - -.panel-group .panel-heading { - border-bottom: 0; -} - -.panel-group .panel-heading + .panel-collapse .panel-body { - border-top: 1px solid #dddddd; -} - -.panel-group .panel-footer { - border-top: 0; -} - -.panel-group .panel-footer + .panel-collapse .panel-body { - border-bottom: 1px solid #dddddd; -} - -.panel-default { - border-color: #dddddd; -} - -.panel-default > .panel-heading { - color: #333333; - background-color: #f5f5f5; - border-color: #dddddd; -} - -.panel-default > .panel-heading + .panel-collapse .panel-body { - border-top-color: #dddddd; -} - -.panel-default > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #dddddd; -} - -.panel-primary { - border-color: #428bca; -} - -.panel-primary > .panel-heading { - color: #ffffff; - background-color: #428bca; - border-color: #428bca; -} - -.panel-primary > .panel-heading + .panel-collapse .panel-body { - border-top-color: #428bca; -} - -.panel-primary > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #428bca; -} - -.panel-success { - border-color: #d6e9c6; -} - -.panel-success > .panel-heading { - color: #468847; - background-color: #dff0d8; - border-color: #d6e9c6; -} - -.panel-success > .panel-heading + .panel-collapse .panel-body { - border-top-color: #d6e9c6; -} - -.panel-success > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #d6e9c6; -} - -.panel-warning { - border-color: #fbeed5; -} - -.panel-warning > .panel-heading { - color: #c09853; - background-color: #fcf8e3; - border-color: #fbeed5; -} - -.panel-warning > .panel-heading + .panel-collapse .panel-body { - border-top-color: #fbeed5; -} - -.panel-warning > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #fbeed5; -} - -.panel-danger { - border-color: #eed3d7; -} - -.panel-danger > .panel-heading { - color: #b94a48; - background-color: #f2dede; - border-color: #eed3d7; -} - -.panel-danger > .panel-heading + .panel-collapse .panel-body { - border-top-color: #eed3d7; -} - -.panel-danger > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #eed3d7; -} - -.panel-info { - border-color: #bce8f1; -} - -.panel-info > .panel-heading { - color: #3a87ad; - background-color: #d9edf7; - border-color: #bce8f1; -} - -.panel-info > .panel-heading + .panel-collapse .panel-body { - border-top-color: #bce8f1; -} - -.panel-info > .panel-footer + .panel-collapse .panel-body { - border-bottom-color: #bce8f1; -} - -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} - -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} - -.well-lg { - padding: 24px; - border-radius: 6px; -} - -.well-sm { - padding: 9px; - border-radius: 3px; -} - -.close { - float: right; - font-size: 21px; - font-weight: bold; - line-height: 1; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} - -.close:hover, -.close:focus { - color: #000000; - text-decoration: none; - cursor: pointer; - opacity: 0.5; - filter: alpha(opacity=50); -} - -button.close { - padding: 0; - cursor: pointer; - background: transparent; - border: 0; - -webkit-appearance: none; -} - -.modal-open { - overflow: hidden; -} - -body.modal-open, -.modal-open .navbar-fixed-top, -.modal-open .navbar-fixed-bottom { - margin-right: 15px; -} - -.modal { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - display: none; - overflow: auto; - overflow-y: scroll; -} - -.modal.fade .modal-dialog { - -webkit-transform: translate(0, -25%); - -ms-transform: translate(0, -25%); - transform: translate(0, -25%); - -webkit-transition: -webkit-transform 0.3s ease-out; - -moz-transition: -moz-transform 0.3s ease-out; - -o-transition: -o-transform 0.3s ease-out; - transition: transform 0.3s ease-out; -} - -.modal.in .modal-dialog { - -webkit-transform: translate(0, 0); - -ms-transform: translate(0, 0); - transform: translate(0, 0); -} - -.modal-dialog { - z-index: 1050; - width: auto; - padding: 10px; - margin-right: auto; - margin-left: auto; -} - -.modal-content { - position: relative; - background-color: #ffffff; - border: 1px solid #999999; - border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 6px; - outline: none; - -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); - box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); - background-clip: padding-box; -} - -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1030; - background-color: #000000; -} - -.modal-backdrop.fade { - opacity: 0; - filter: alpha(opacity=0); -} - -.modal-backdrop.in { - opacity: 0.5; - filter: alpha(opacity=50); -} - -.modal-header { - min-height: 16.428571429px; - padding: 15px; - border-bottom: 1px solid #e5e5e5; -} - -.modal-header .close { - margin-top: -2px; -} - -.modal-title { - margin: 0; - line-height: 1.428571429; -} - -.modal-body { - position: relative; - padding: 20px; -} - -.modal-footer { - padding: 19px 20px 20px; - margin-top: 15px; - text-align: right; - border-top: 1px solid #e5e5e5; -} - -.modal-footer:before, -.modal-footer:after { - display: table; - content: " "; -} - -.modal-footer:after { - clear: both; -} - -.modal-footer:before, -.modal-footer:after { - display: table; - content: " "; -} - -.modal-footer:after { - clear: both; -} - -.modal-footer .btn + .btn { - margin-bottom: 0; - margin-left: 5px; -} - -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} - -.modal-footer .btn-block + .btn-block { - margin-left: 0; -} - -@media screen and (min-width: 768px) { - .modal-dialog { - right: auto; - left: 50%; - width: 600px; - padding-top: 30px; - padding-bottom: 30px; - } - .modal-content { - -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); - box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); - } -} - -.tooltip { - position: absolute; - z-index: 1030; - display: block; - font-size: 12px; - line-height: 1.4; - opacity: 0; - filter: alpha(opacity=0); - visibility: visible; -} - -.tooltip.in { - opacity: 0.9; - filter: alpha(opacity=90); -} - -.tooltip.top { - padding: 5px 0; - margin-top: -3px; -} - -.tooltip.right { - padding: 0 5px; - margin-left: 3px; -} - -.tooltip.bottom { - padding: 5px 0; - margin-top: 3px; -} - -.tooltip.left { - padding: 0 5px; - margin-left: -3px; -} - -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - border-radius: 4px; -} - -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-top-color: #000000; - border-width: 5px 5px 0; -} - -.tooltip.top-left .tooltip-arrow { - bottom: 0; - left: 5px; - border-top-color: #000000; - border-width: 5px 5px 0; -} - -.tooltip.top-right .tooltip-arrow { - right: 5px; - bottom: 0; - border-top-color: #000000; - border-width: 5px 5px 0; -} - -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-right-color: #000000; - border-width: 5px 5px 5px 0; -} - -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-left-color: #000000; - border-width: 5px 0 5px 5px; -} - -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-bottom-color: #000000; - border-width: 0 5px 5px; -} - -.tooltip.bottom-left .tooltip-arrow { - top: 0; - left: 5px; - border-bottom-color: #000000; - border-width: 0 5px 5px; -} - -.tooltip.bottom-right .tooltip-arrow { - top: 0; - right: 5px; - border-bottom-color: #000000; - border-width: 0 5px 5px; -} - -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - max-width: 276px; - padding: 1px; - text-align: left; - white-space: normal; - background-color: #ffffff; - border: 1px solid #cccccc; - border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 6px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - background-clip: padding-box; -} - -.popover.top { - margin-top: -10px; -} - -.popover.right { - margin-left: 10px; -} - -.popover.bottom { - margin-top: 10px; -} - -.popover.left { - margin-left: -10px; -} - -.popover-title { - padding: 8px 14px; - margin: 0; - font-size: 14px; - font-weight: normal; - line-height: 18px; - background-color: #f7f7f7; - border-bottom: 1px solid #ebebeb; - border-radius: 5px 5px 0 0; -} - -.popover-content { - padding: 9px 14px; -} - -.popover .arrow, -.popover .arrow:after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; -} - -.popover .arrow { - border-width: 11px; -} - -.popover .arrow:after { - border-width: 10px; - content: ""; -} - -.popover.top .arrow { - bottom: -11px; - left: 50%; - margin-left: -11px; - border-top-color: #999999; - border-top-color: rgba(0, 0, 0, 0.25); - border-bottom-width: 0; -} - -.popover.top .arrow:after { - bottom: 1px; - margin-left: -10px; - border-top-color: #ffffff; - border-bottom-width: 0; - content: " "; -} - -.popover.right .arrow { - top: 50%; - left: -11px; - margin-top: -11px; - border-right-color: #999999; - border-right-color: rgba(0, 0, 0, 0.25); - border-left-width: 0; -} - -.popover.right .arrow:after { - bottom: -10px; - left: 1px; - border-right-color: #ffffff; - border-left-width: 0; - content: " "; -} - -.popover.bottom .arrow { - top: -11px; - left: 50%; - margin-left: -11px; - border-bottom-color: #999999; - border-bottom-color: rgba(0, 0, 0, 0.25); - border-top-width: 0; -} - -.popover.bottom .arrow:after { - top: 1px; - margin-left: -10px; - border-bottom-color: #ffffff; - border-top-width: 0; - content: " "; -} - -.popover.left .arrow { - top: 50%; - right: -11px; - margin-top: -11px; - border-left-color: #999999; - border-left-color: rgba(0, 0, 0, 0.25); - border-right-width: 0; -} - -.popover.left .arrow:after { - right: 1px; - bottom: -10px; - border-left-color: #ffffff; - border-right-width: 0; - content: " "; -} - -.carousel { - position: relative; -} - -.carousel-inner { - position: relative; - width: 100%; - overflow: hidden; -} - -.carousel-inner > .item { - position: relative; - display: none; - -webkit-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} - -.carousel-inner > .item > img, -.carousel-inner > .item > a > img { - display: block; - height: auto; - max-width: 100%; - line-height: 1; -} - -.carousel-inner > .active, -.carousel-inner > .next, -.carousel-inner > .prev { - display: block; -} - -.carousel-inner > .active { - left: 0; -} - -.carousel-inner > .next, -.carousel-inner > .prev { - position: absolute; - top: 0; - width: 100%; -} - -.carousel-inner > .next { - left: 100%; -} - -.carousel-inner > .prev { - left: -100%; -} - -.carousel-inner > .next.left, -.carousel-inner > .prev.right { - left: 0; -} - -.carousel-inner > .active.left { - left: -100%; -} - -.carousel-inner > .active.right { - left: 100%; -} - -.carousel-control { - position: absolute; - top: 0; - bottom: 0; - left: 0; - width: 15%; - font-size: 20px; - color: #ffffff; - text-align: center; - text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); - opacity: 0.5; - filter: alpha(opacity=50); -} - -.carousel-control.left { - background-image: -webkit-gradient(linear, 0 top, 100% top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001))); - background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0), color-stop(rgba(0, 0, 0, 0.0001) 100%)); - background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); -} - -.carousel-control.right { - right: 0; - left: auto; - background-image: -webkit-gradient(linear, 0 top, 100% top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5))); - background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0), color-stop(rgba(0, 0, 0, 0.5) 100%)); - background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); -} - -.carousel-control:hover, -.carousel-control:focus { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} - -.carousel-control .icon-prev, -.carousel-control .icon-next, -.carousel-control .glyphicon-chevron-left, -.carousel-control .glyphicon-chevron-right { - position: absolute; - top: 50%; - left: 50%; - z-index: 5; - display: inline-block; -} - -.carousel-control .icon-prev, -.carousel-control .icon-next { - width: 20px; - height: 20px; - margin-top: -10px; - margin-left: -10px; - font-family: serif; -} - -.carousel-control .icon-prev:before { - content: '\2039'; -} - -.carousel-control .icon-next:before { - content: '\203a'; -} - -.carousel-indicators { - position: absolute; - bottom: 10px; - left: 50%; - z-index: 15; - width: 60%; - padding-left: 0; - margin-left: -30%; - text-align: center; - list-style: none; -} - -.carousel-indicators li { - display: inline-block; - width: 10px; - height: 10px; - margin: 1px; - text-indent: -999px; - cursor: pointer; - border: 1px solid #ffffff; - border-radius: 10px; -} - -.carousel-indicators .active { - width: 12px; - height: 12px; - margin: 0; - background-color: #ffffff; -} - -.carousel-caption { - position: absolute; - right: 15%; - bottom: 20px; - left: 15%; - z-index: 10; - padding-top: 20px; - padding-bottom: 20px; - color: #ffffff; - text-align: center; - text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); -} - -.carousel-caption .btn { - text-shadow: none; -} - -@media screen and (min-width: 768px) { - .carousel-control .icon-prev, - .carousel-control .icon-next { - width: 30px; - height: 30px; - margin-top: -15px; - margin-left: -15px; - font-size: 30px; - } - .carousel-caption { - right: 20%; - left: 20%; - padding-bottom: 30px; - } - .carousel-indicators { - bottom: 20px; - } -} - -.clearfix:before, -.clearfix:after { - display: table; - content: " "; -} - -.clearfix:after { - clear: both; -} - -.pull-right { - float: right !important; -} - -.pull-left { - float: left !important; -} - -.hide { - display: none !important; -} - -.show { - display: block !important; -} - -.invisible { - visibility: hidden; -} - -.text-hide { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.affix { - position: fixed; -} - -@-ms-viewport { - width: device-width; -} - -@media screen and (max-width: 400px) { - @-ms-viewport { - width: 320px; - } -} - -.hidden { - display: none !important; - visibility: hidden !important; -} - -.visible-xs { - display: none !important; -} - -tr.visible-xs { - display: none !important; -} - -th.visible-xs, -td.visible-xs { - display: none !important; -} - -@media (max-width: 767px) { - .visible-xs { - display: block !important; - } - tr.visible-xs { - display: table-row !important; - } - th.visible-xs, - td.visible-xs { - display: table-cell !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .visible-xs.visible-sm { - display: block !important; - } - tr.visible-xs.visible-sm { - display: table-row !important; - } - th.visible-xs.visible-sm, - td.visible-xs.visible-sm { - display: table-cell !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .visible-xs.visible-md { - display: block !important; - } - tr.visible-xs.visible-md { - display: table-row !important; - } - th.visible-xs.visible-md, - td.visible-xs.visible-md { - display: table-cell !important; - } -} - -@media (min-width: 1200px) { - .visible-xs.visible-lg { - display: block !important; - } - tr.visible-xs.visible-lg { - display: table-row !important; - } - th.visible-xs.visible-lg, - td.visible-xs.visible-lg { - display: table-cell !important; - } -} - -.visible-sm { - display: none !important; -} - -tr.visible-sm { - display: none !important; -} - -th.visible-sm, -td.visible-sm { - display: none !important; -} - -@media (max-width: 767px) { - .visible-sm.visible-xs { - display: block !important; - } - tr.visible-sm.visible-xs { - display: table-row !important; - } - th.visible-sm.visible-xs, - td.visible-sm.visible-xs { - display: table-cell !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .visible-sm { - display: block !important; - } - tr.visible-sm { - display: table-row !important; - } - th.visible-sm, - td.visible-sm { - display: table-cell !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .visible-sm.visible-md { - display: block !important; - } - tr.visible-sm.visible-md { - display: table-row !important; - } - th.visible-sm.visible-md, - td.visible-sm.visible-md { - display: table-cell !important; - } -} - -@media (min-width: 1200px) { - .visible-sm.visible-lg { - display: block !important; - } - tr.visible-sm.visible-lg { - display: table-row !important; - } - th.visible-sm.visible-lg, - td.visible-sm.visible-lg { - display: table-cell !important; - } -} - -.visible-md { - display: none !important; -} - -tr.visible-md { - display: none !important; -} - -th.visible-md, -td.visible-md { - display: none !important; -} - -@media (max-width: 767px) { - .visible-md.visible-xs { - display: block !important; - } - tr.visible-md.visible-xs { - display: table-row !important; - } - th.visible-md.visible-xs, - td.visible-md.visible-xs { - display: table-cell !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .visible-md.visible-sm { - display: block !important; - } - tr.visible-md.visible-sm { - display: table-row !important; - } - th.visible-md.visible-sm, - td.visible-md.visible-sm { - display: table-cell !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .visible-md { - display: block !important; - } - tr.visible-md { - display: table-row !important; - } - th.visible-md, - td.visible-md { - display: table-cell !important; - } -} - -@media (min-width: 1200px) { - .visible-md.visible-lg { - display: block !important; - } - tr.visible-md.visible-lg { - display: table-row !important; - } - th.visible-md.visible-lg, - td.visible-md.visible-lg { - display: table-cell !important; - } -} - -.visible-lg { - display: none !important; -} - -tr.visible-lg { - display: none !important; -} - -th.visible-lg, -td.visible-lg { - display: none !important; -} - -@media (max-width: 767px) { - .visible-lg.visible-xs { - display: block !important; - } - tr.visible-lg.visible-xs { - display: table-row !important; - } - th.visible-lg.visible-xs, - td.visible-lg.visible-xs { - display: table-cell !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .visible-lg.visible-sm { - display: block !important; - } - tr.visible-lg.visible-sm { - display: table-row !important; - } - th.visible-lg.visible-sm, - td.visible-lg.visible-sm { - display: table-cell !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .visible-lg.visible-md { - display: block !important; - } - tr.visible-lg.visible-md { - display: table-row !important; - } - th.visible-lg.visible-md, - td.visible-lg.visible-md { - display: table-cell !important; - } -} - -@media (min-width: 1200px) { - .visible-lg { - display: block !important; - } - tr.visible-lg { - display: table-row !important; - } - th.visible-lg, - td.visible-lg { - display: table-cell !important; - } -} - -.hidden-xs { - display: block !important; -} - -tr.hidden-xs { - display: table-row !important; -} - -th.hidden-xs, -td.hidden-xs { - display: table-cell !important; -} - -@media (max-width: 767px) { - .hidden-xs { - display: none !important; - } - tr.hidden-xs { - display: none !important; - } - th.hidden-xs, - td.hidden-xs { - display: none !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .hidden-xs.hidden-sm { - display: none !important; - } - tr.hidden-xs.hidden-sm { - display: none !important; - } - th.hidden-xs.hidden-sm, - td.hidden-xs.hidden-sm { - display: none !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-xs.hidden-md { - display: none !important; - } - tr.hidden-xs.hidden-md { - display: none !important; - } - th.hidden-xs.hidden-md, - td.hidden-xs.hidden-md { - display: none !important; - } -} - -@media (min-width: 1200px) { - .hidden-xs.hidden-lg { - display: none !important; - } - tr.hidden-xs.hidden-lg { - display: none !important; - } - th.hidden-xs.hidden-lg, - td.hidden-xs.hidden-lg { - display: none !important; - } -} - -.hidden-sm { - display: block !important; -} - -tr.hidden-sm { - display: table-row !important; -} - -th.hidden-sm, -td.hidden-sm { - display: table-cell !important; -} - -@media (max-width: 767px) { - .hidden-sm.hidden-xs { - display: none !important; - } - tr.hidden-sm.hidden-xs { - display: none !important; - } - th.hidden-sm.hidden-xs, - td.hidden-sm.hidden-xs { - display: none !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .hidden-sm { - display: none !important; - } - tr.hidden-sm { - display: none !important; - } - th.hidden-sm, - td.hidden-sm { - display: none !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-sm.hidden-md { - display: none !important; - } - tr.hidden-sm.hidden-md { - display: none !important; - } - th.hidden-sm.hidden-md, - td.hidden-sm.hidden-md { - display: none !important; - } -} - -@media (min-width: 1200px) { - .hidden-sm.hidden-lg { - display: none !important; - } - tr.hidden-sm.hidden-lg { - display: none !important; - } - th.hidden-sm.hidden-lg, - td.hidden-sm.hidden-lg { - display: none !important; - } -} - -.hidden-md { - display: block !important; -} - -tr.hidden-md { - display: table-row !important; -} - -th.hidden-md, -td.hidden-md { - display: table-cell !important; -} - -@media (max-width: 767px) { - .hidden-md.hidden-xs { - display: none !important; - } - tr.hidden-md.hidden-xs { - display: none !important; - } - th.hidden-md.hidden-xs, - td.hidden-md.hidden-xs { - display: none !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .hidden-md.hidden-sm { - display: none !important; - } - tr.hidden-md.hidden-sm { - display: none !important; - } - th.hidden-md.hidden-sm, - td.hidden-md.hidden-sm { - display: none !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-md { - display: none !important; - } - tr.hidden-md { - display: none !important; - } - th.hidden-md, - td.hidden-md { - display: none !important; - } -} - -@media (min-width: 1200px) { - .hidden-md.hidden-lg { - display: none !important; - } - tr.hidden-md.hidden-lg { - display: none !important; - } - th.hidden-md.hidden-lg, - td.hidden-md.hidden-lg { - display: none !important; - } -} - -.hidden-lg { - display: block !important; -} - -tr.hidden-lg { - display: table-row !important; -} - -th.hidden-lg, -td.hidden-lg { - display: table-cell !important; -} - -@media (max-width: 767px) { - .hidden-lg.hidden-xs { - display: none !important; - } - tr.hidden-lg.hidden-xs { - display: none !important; - } - th.hidden-lg.hidden-xs, - td.hidden-lg.hidden-xs { - display: none !important; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .hidden-lg.hidden-sm { - display: none !important; - } - tr.hidden-lg.hidden-sm { - display: none !important; - } - th.hidden-lg.hidden-sm, - td.hidden-lg.hidden-sm { - display: none !important; - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-lg.hidden-md { - display: none !important; - } - tr.hidden-lg.hidden-md { - display: none !important; - } - th.hidden-lg.hidden-md, - td.hidden-lg.hidden-md { - display: none !important; - } -} - -@media (min-width: 1200px) { - .hidden-lg { - display: none !important; - } - tr.hidden-lg { - display: none !important; - } - th.hidden-lg, - td.hidden-lg { - display: none !important; - } -} - -.visible-print { - display: none !important; -} - -tr.visible-print { - display: none !important; -} - -th.visible-print, -td.visible-print { - display: none !important; -} - -@media print { - .visible-print { - display: block !important; - } - tr.visible-print { - display: table-row !important; - } - th.visible-print, - td.visible-print { - display: table-cell !important; - } - .hidden-print { - display: none !important; - } - tr.hidden-print { - display: none !important; - } - th.hidden-print, - td.hidden-print { - display: none !important; - } -} diff --git a/kallithea/public/css/contextbar.css b/kallithea/public/css/contextbar.css deleted file mode 100644 --- a/kallithea/public/css/contextbar.css +++ /dev/null @@ -1,325 +0,0 @@ -/** - * Stylesheets for the context bar - */ - -i[class^='icon-'] { - background-repeat: no-repeat; - background-position: center; - display: inline-block; - min-width: 16px; - min-height: 16px; - margin: -2px 0 -4px 0; - /* background-color: red; /* for debugging */ -} - -/* css classes for diff file status ... it'd be nice if css had a way to - inherit from another class but alas, we must make sure this content is the - same from the icon font file */ - -.icon-diff-M:before { - font-family: 'kallithea'; - content: '\22a1'; - color: #d0b44c; -} - -.icon-diff-D:before { - font-family: 'kallithea'; - content: '\229f'; - color: #bd2c00; -} - -.icon-diff-A:before { - font-family: 'kallithea'; - content: '\229e'; - color: #6cc644; -} - -.icon-diff-R:before { - font-family: 'kallithea'; - content: '\e81f'; - color: #677a85; -} - -#content #context-bar { - position: relative; - overflow: visible; - background-color: #577632; - padding: 0 5px; - min-height: 36px; -} - -#content #context-bar h2 { - display: inline-block; - color: #FFF; -} - -#header #header-inner #quick a, -#content #context-bar, -#content #context-bar a { - color: #FFFFFF; -} - -#header #header-inner #quick a:hover, -#content #context-bar a:hover { - text-decoration: none; -} - -#content #context-bar .icon { - display: inline-block; - width: 16px; - height: 16px; - vertical-align: text-bottom; -} - -ul.horizontal-list { - display: block; -} - -ul.horizontal-list > li { - float: left; - position: relative; -} - -#header #header-inner #quick ul, -ul.horizontal-list > li ul { - position: absolute; - display: none; - right: 0; - z-index: 999; -} - -#header #header-inner #quick li:hover > ul, -ul.horizontal-list li:hover > ul { - display: block; -} - -#header #header-inner #quick li ul li, -ul.horizontal-list ul li { - position: relative; - border-bottom: 1px solid rgba(0,0,0,0.1); - border-top: 1px solid rgba(255,255,255,0.1); -} - -ul.horizontal-list > li ul ul { - position: absolute; - right: 100%; - top: -1px; - min-width: 200px; - max-height: 400px; - overflow-x: hidden; - overflow-y: auto; -} - -#header #header-inner #quick ul a, -ul.horizontal-list li a { - white-space: nowrap; -} - -#breadcrumbs { - float: left; - padding: 6px 0 5px 0; - padding-left: 5px; - font-weight: bold; - font-size: 14px; -} - -#breadcrumbs span { - font-weight: bold; - font-size: 1.4em; -} - -#header #header-inner #quick ul, -#revision-changer, -#context-pages, -#context-pages ul { - background: #3b6998; /* Old browsers */ - background: linear-gradient(to bottom, #577632 0%, #577632 100%); /* W3C */ -} - -#header #header-inner #quick a, -#context-actions a, -#context-pages a { - background-repeat: no-repeat; - background-position: 10px 50%; - padding-left: 30px; -} - -#quick a, -#context-pages ul ul a { - padding-left: 10px; -} - -ul#context-actions { - display: inline-block; - float: right; - border-radius: 4px; - background-image: linear-gradient(to bottom, #577632 0%, #577632 100%); -} - -#content ul#context-actions li { - padding: 0px; - border-right: 1px solid rgba(0,0,0,0.1); - border-left: 1px solid rgba(255,255,255,0.1); -} - -#context-actions a { - display: block; - cursor: pointer; - background: none; - border: none; - margin: 0px; - height: auto; - padding: 10px 10px 10px 30px; - background-repeat: no-repeat; - background-position: 10px 50%; - font-size: 1em; -} - -#context-actions a { - padding: 11px 10px 12px 30px; -} - -#header #header-inner #quick li:hover, -#revision-changer:hover, -#context-pages li:hover, -#context-actions li:hover, -#content #context-actions li:hover, -#header #header-inner #quick li.current, -#context-pages li.current { - background: #6388ad; /* Old browsers */ - background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */ -} - - -#content #context-actions li:first-child { - border-left: none; - border-radius: 4px 0 0px 4px; -} - -#content #context-actions li:last-child { - border-right: none; - border-radius: 0 4px 4px 0; -} - -#content #context-actions .icon { - margin: auto; - margin-bottom: 5px; - display: block; - clear: both; - float: none; -} - -#content #context-pages .follow .show-following, -#content #context-pages .following .show-follow { - display: none; -} - -#context-pages { - float: right; - border-left: 1px solid rgba(0,0,0,0.1); -} - -#content #context-pages .icon { - margin-right: 5px; -} - -#header #header-inner #quick li, -#content #context-pages li { - border-right: 1px solid rgba(0,0,0,0.1); - border-left: 1px solid rgba(255,255,255,0.1); - padding: 0; -} - -#header #header-inner #quick li:last-child, -#content #context-pages li:last-child { - border-right: none; -} - -#header #header-inner #quick > li:first-child { - border-left: none; -} - -#header #header-inner #quick > li:first-child > a { - border-radius: 4px 0 0 4px; -} - -#header #header-inner #quick a, -#context-pages a, -#context-pages .admin_menu a { - display: block; - padding: 0px 10px 1px 10px; - line-height: 35px; -} - -#header #header-inner #quick a.thin, -#context-pages a.thin, -#context-pages .admin_menu a.thin { - line-height: 28px !important; -} - -#header #header-inner #quick a#quick_login_link { - padding-left: 0px; -} - -#header #header-inner #quick a { - overflow: hidden; -} -#quick a.childs:after, -#revision-changer:before, -#context-pages a.childs:after, -#context-pages a.dropdown:after { - font-family: 'kallithea'; - content: ' \23f7'; -} -#context-pages a.childs { - padding-right: 30px; -} -#context-pages a.childs:after { - position: absolute; - float: right; - padding-left: 5px; - padding-right: 5px; -} - -#revision-changer:before { - position: absolute; - top: 0px; - right: 0px; - border-right: 1px solid rgba(0,0,0,0.1); - height: 25px; - padding-top: 10px; - padding-right: 10px; -} - -#context-pages li:last-child a { - padding-right: 10px; -} - -#context-bar #revision-changer { - position: relative; - cursor: pointer; - border: none; - padding: 0; - margin: 0; - color: #FFFFFF; - font-size: 0.85em; - padding: 2px 15px; - padding-bottom: 3px; - padding-right: 30px; - border-right: 1px solid rgba(255,255,255,0.1); -} - -#revision-changer .branch-name, -#revision-changer .revision { - display: block; - text-align: center; - line-height: 1.5em; -} - -#revision-changer .branch-name { - font-weight: bold; -} - -#revision-changer .revision { - text-transform: uppercase; -} diff --git a/kallithea/public/css/pygments.css b/kallithea/public/css/pygments.css deleted file mode 100644 --- a/kallithea/public/css/pygments.css +++ /dev/null @@ -1,177 +0,0 @@ -div.codeblock { - overflow: auto; - padding: 0px; - border: 1px solid #ccc; - background: #f8f8f8; - font-size: 100%; - line-height: 100%; - /* new */ - line-height: 125%; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -div.codeblock .code-header { - border-bottom: 1px solid #CCCCCC; - background: #EEEEEE; - padding: 10px 0 5px 0; -} - -div.codeblock .code-header .stats { - clear: both; - padding: 2px 8px 2px 14px; - border-bottom: 1px solid rgb(204, 204, 204); - height: 23px; - margin-bottom: 6px; -} - -div.codeblock .code-header .stats .left { - float: left; -} -div.codeblock .code-header .stats .left.img { - margin-top: -2px; -} -div.codeblock .code-header .stats .left.item { - float: left; - padding: 0 9px 0 9px; - border-right: 1px solid #ccc; -} -div.codeblock .code-header .stats .left.item pre { -} -div.codeblock .code-header .stats .left.item.last { - border-right: none; -} -div.codeblock .code-header .stats .buttons { - float: right; - padding-right: 4px; -} - -div.codeblock .code-header .author { - margin-left: 15px; - font-weight: bold; - height: 25px; -} -div.codeblock .code-header .author .user { - padding-top: 3px; -} -div.codeblock .code-header .commit { - margin-left: 15px; - font-weight: normal; - white-space: pre; -} - -.code-highlighttable, -div.codeblock .code-body table { - width: 0 !important; - border: 0px !important; -} - -.code-highlighttable, -div.codeblock .code-body table td { - border: 0px !important; -} - -div.code-body { - background-color: #FFFFFF; -} - -div.codeblock .code-header .search-path { - padding: 0px 0px 0px 10px; -} - -div.search-code-body { - background-color: #FFFFFF; - padding: 5px 0px 5px 10px; -} - -div.search-code-body pre .match { - background-color: #FAFFA6; -} -div.search-code-body pre .break { - background-color: #DDE7EF; - width: 100%; - color: #747474; - display: block; -} -div.annotatediv { - margin-left: 2px; - margin-right: 4px; -} -.code-highlight { - padding: 0px; - margin-top: 5px; - margin-bottom: 5px; - border-left: 1px solid #ccc; -} -.code-highlight pre, .linenodiv pre { - padding: 5px 2px 0px 5px; - margin: 0; -} -.code-highlight pre div:target { - background-color: #FFFFBE !important; -} -.linenos { padding: 0px !important; border:0px !important;} -.linenos a { text-decoration: none; } - -.code { display: block; border:0px !important; } -.code-highlight .hll, .codehilite .hll { background-color: #ffffcc } -.code-highlight .c, .codehilite .c { color: #408080; font-style: italic } /* Comment */ -.code-highlight .err, .codehilite .err { border: 1px solid #FF0000 } /* Error */ -.code-highlight .k, .codehilite .k { color: #008000; font-weight: bold } /* Keyword */ -.code-highlight .o, .codehilite .o { color: #666666 } /* Operator */ -.code-highlight .cm, .codehilite .cm { color: #408080; font-style: italic } /* Comment.Multiline */ -.code-highlight .cp, .codehilite .cp { color: #BC7A00 } /* Comment.Preproc */ -.code-highlight .c1, .codehilite .c1 { color: #408080; font-style: italic } /* Comment.Single */ -.code-highlight .cs, .codehilite .cs { color: #408080; font-style: italic } /* Comment.Special */ -.code-highlight .gd, .codehilite .gd { color: #A00000 } /* Generic.Deleted */ -.code-highlight .ge, .codehilite .ge { font-style: italic } /* Generic.Emph */ -.code-highlight .gr, .codehilite .gr { color: #FF0000 } /* Generic.Error */ -.code-highlight .gh, .codehilite .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.code-highlight .gi, .codehilite .gi { color: #00A000 } /* Generic.Inserted */ -.code-highlight .go, .codehilite .go { color: #808080 } /* Generic.Output */ -.code-highlight .gp, .codehilite .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ -.code-highlight .gs, .codehilite .gs { font-weight: bold } /* Generic.Strong */ -.code-highlight .gu, .codehilite .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ -.code-highlight .gt, .codehilite .gt { color: #0040D0 } /* Generic.Traceback */ -.code-highlight .kc, .codehilite .kc { color: #008000; font-weight: bold } /* Keyword.Constant */ -.code-highlight .kd, .codehilite .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ -.code-highlight .kn, .codehilite .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ -.code-highlight .kp, .codehilite .kp { color: #008000 } /* Keyword.Pseudo */ -.code-highlight .kr, .codehilite .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ -.code-highlight .kt, .codehilite .kt { color: #B00040 } /* Keyword.Type */ -.code-highlight .m, .codehilite .m { color: #666666 } /* Literal.Number */ -.code-highlight .s, .codehilite .s { color: #BA2121 } /* Literal.String */ -.code-highlight .na, .codehilite .na { color: #7D9029 } /* Name.Attribute */ -.code-highlight .nb, .codehilite .nb { color: #008000 } /* Name.Builtin */ -.code-highlight .nc, .codehilite .nc { color: #0000FF; font-weight: bold } /* Name.Class */ -.code-highlight .no, .codehilite .no { color: #880000 } /* Name.Constant */ -.code-highlight .nd, .codehilite .nd { color: #AA22FF } /* Name.Decorator */ -.code-highlight .ni, .codehilite .ni { color: #999999; font-weight: bold } /* Name.Entity */ -.code-highlight .ne, .codehilite .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ -.code-highlight .nf, .codehilite .nf { color: #0000FF } /* Name.Function */ -.code-highlight .nl, .codehilite .nl { color: #A0A000 } /* Name.Label */ -.code-highlight .nn, .codehilite .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ -.code-highlight .nt, .codehilite .nt { color: #008000; font-weight: bold } /* Name.Tag */ -.code-highlight .nv, .codehilite .nv { color: #19177C } /* Name.Variable */ -.code-highlight .ow, .codehilite .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ -.code-highlight .w, .codehilite .w { color: #bbbbbb } /* Text.Whitespace */ -.code-highlight .mf, .codehilite .mf { color: #666666 } /* Literal.Number.Float */ -.code-highlight .mh, .codehilite .mh { color: #666666 } /* Literal.Number.Hex */ -.code-highlight .mi, .codehilite .mi { color: #666666 } /* Literal.Number.Integer */ -.code-highlight .mo, .codehilite .mo { color: #666666 } /* Literal.Number.Oct */ -.code-highlight .sb, .codehilite .sb { color: #BA2121 } /* Literal.String.Backtick */ -.code-highlight .sc, .codehilite .sc { color: #BA2121 } /* Literal.String.Char */ -.code-highlight .sd, .codehilite .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ -.code-highlight .s2, .codehilite .s2 { color: #BA2121 } /* Literal.String.Double */ -.code-highlight .se, .codehilite .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ -.code-highlight .sh, .codehilite .sh { color: #BA2121 } /* Literal.String.Heredoc */ -.code-highlight .si, .codehilite .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ -.code-highlight .sx, .codehilite .sx { color: #008000 } /* Literal.String.Other */ -.code-highlight .sr, .codehilite .sr { color: #BB6688 } /* Literal.String.Regex */ -.code-highlight .s1, .codehilite .s1 { color: #BA2121 } /* Literal.String.Single */ -.code-highlight .ss, .codehilite .ss { color: #19177C } /* Literal.String.Symbol */ -.code-highlight .bp, .codehilite .bp { color: #008000 } /* Name.Builtin.Pseudo */ -.code-highlight .vc, .codehilite .vc { color: #19177C } /* Name.Variable.Class */ -.code-highlight .vg, .codehilite .vg { color: #19177C } /* Name.Variable.Global */ -.code-highlight .vi, .codehilite .vi { color: #19177C } /* Name.Variable.Instance */ -.code-highlight .il, .codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */ diff --git a/kallithea/public/fontello/LICENSE.txt b/kallithea/public/fontello/LICENSE.txt new file mode 100644 --- /dev/null +++ b/kallithea/public/fontello/LICENSE.txt @@ -0,0 +1,12 @@ +Font license info + + +## Font Awesome + + Copyright (C) 2016 by Dave Gandy + + Author: Dave Gandy + License: SIL () + Homepage: http://fortawesome.github.com/Font-Awesome/ + + diff --git a/kallithea/public/fontello/README.txt b/kallithea/public/fontello/README.txt --- a/kallithea/public/fontello/README.txt +++ b/kallithea/public/fontello/README.txt @@ -2,16 +2,16 @@ This webfont is generated by http://font ================================================================================ -Please, note, that you should obey original font licences, used to make this +Please, note, that you should obey original font licenses, used to make this webfont pack. Details available in LICENSE.txt file. - Usually, it's enough to publish content of LICENSE.txt file somewhere on your site in "About" section. - If your project is open-source, usually, it will be ok to make LICENSE.txt - file publically available in your repository. + file publicly available in your repository. -- Fonts, used in Fontello, don't require to make clickable links on your site. +- Fonts, used in Fontello, don't require a clickable link on your site. But any kind of additional authors crediting is welcome. ================================================================================ @@ -29,8 +29,8 @@ Comments on archive content - LICENSE.txt - license info about source fonts, used to build your one. -- config.json - keeps your settings. You can import it back to fontello anytime, - to continue your work +- config.json - keeps your settings. You can import it back into fontello + anytime, to continue your work Why so many CSS files ? @@ -38,17 +38,17 @@ Why so many CSS files ? Because we like to fit all your needs :) -- basic file, .css - is usually enougth, in contains @font-face - and character codes definition +- basic file, .css - is usually enough, it contains @font-face + and character code definitions - *-ie7.css - if you need IE7 support, but still don't wish to put char codes directly into html - *-codes.css and *-ie7-codes.css - if you like to use your own @font-face - rules, but still wish to benefit of css generation. That can be very - convenient for automated assets build systems. When you need to update font - - no needs to manually edit files, just override old version with archive - content. See fontello source codes for example. + rules, but still wish to benefit from css generation. That can be very + convenient for automated asset build systems. When you need to update font - + no need to manually edit files, just override old version with archive + content. See fontello source code for examples. - *-embedded.css - basic css file, but with embedded WOFF font, to avoid CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain. @@ -63,11 +63,11 @@ Because we like to fit all your needs :) Attention for server setup -------------------------- -You MUST setup server to reply with proper `mime-types` for font files. In other -case, some browsers will fail to show fonts. +You MUST setup server to reply with proper `mime-types` for font files - +otherwise some browsers will fail to show fonts. Usually, `apache` already has necessary settings, but `nginx` and other -webservers should be tuned. Here is list of mime types for our file extentions: +webservers should be tuned. Here is list of mime types for our file extensions: - `application/vnd.ms-fontobject` - eot - `application/x-font-woff` - woff diff --git a/kallithea/public/fontello/css/kallithea.css b/kallithea/public/fontello/css/kallithea.css --- a/kallithea/public/fontello/css/kallithea.css +++ b/kallithea/public/fontello/css/kallithea.css @@ -2,11 +2,14 @@ @font-face { font-family: 'kallithea'; - src: url('../font/kallithea.eot?23730278'); - src: url('../font/kallithea.eot?23730278#iefix') format('embedded-opentype'), - url('../font/kallithea.woff?23730278') format('woff'), - url('../font/kallithea.ttf?23730278') format('truetype'), - url('../font/kallithea.svg?23730278#kallithea') format('svg'); + /* NOTE: relative font paths have been adjusted to compensate for where the */ + /* content of this CSS file ends up being used */ + src: url('../fontello/font/kallithea.eot?96450582'); + src: url('../fontello/font/kallithea.eot?96450582#iefix') format('embedded-opentype'), + url('../fontello/font/kallithea.woff2?96450582') format('woff2'), + url('../fontello/font/kallithea.woff?96450582') format('woff'), + url('../fontello/font/kallithea.ttf?96450582') format('truetype'), + url('../fontello/font/kallithea.svg?96450582#kallithea') format('svg'); font-weight: normal; font-style: normal; } @@ -16,7 +19,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'kallithea'; - src: url('../font/kallithea.svg?23730278#kallithea') format('svg'); + src: url('../fontello/font/kallithea.svg?96450582#kallithea') format('svg'); } } */ diff --git a/kallithea/public/fontello/demo.html b/kallithea/public/fontello/demo.html new file mode 100644 --- /dev/null +++ b/kallithea/public/fontello/demo.html @@ -0,0 +1,459 @@ + + + + + + + + +
    +

    + kallithea + font demo +

    + +
    +
    +
    +
    • icon-circle0x2022
    +
    ← icon-right-open0x2190
    +
    ↑ icon-up-open0x2191
    +
    → icon-left-open0x2192
    +
    +
    +
    ↓ icon-down-open0x2193
    +
    ↔ icon-code0x2194
    +
    ↕ icon-sort0x2195
    +
    ⇄ icon-exchange0x21c4
    +
    +
    +
    ⊕ icon-plus-circled0x2295
    +
    ⊖ icon-minus-circled0x2296
    +
    ⊞ icon-diff-added0x229e
    +
    ⊟ icon-diff-removed0x229f
    +
    +
    +
    ⊡ icon-diff-modified0x22a1
    +
    ⌚ icon-clock0x231a
    +
    ⏴ icon-triangle-left0x23f4
    +
    ⏵ icon-triangle-right0x23f5
    +
    +
    +
    ⏶ icon-triangle-up0x23f6
    +
    ⏷ icon-triangle-down0x23f7
    +
    ◦ icon-circle-empty0x25e6
    +
    ♡ icon-heart-empty0x2661
    +
    +
    +
    ♥ icon-heart0x2665
    +
    ⚙ icon-cog-alt0x2699
    +
    ⛃ icon-database0x26c3
    +
    ⛭ icon-gear0x26ed
    +
    +
    +
    ➕ icon-plus0x2795
    +
    ➖ icon-minus0x2796
    +
    ⭥ icon-resize-vertical0x2b65
    +
    ⭱ icon-move-up0x2b71
    +
    +
    +
    ⭳ icon-move-down0x2b73
    +
    icon-file-submodule0xe801
    +
    icon-git-merge0xe802
    +
    icon-ruler0xe811
    +
    +
    +
    icon-download-cloud0xe813
    +
    icon-upload-cloud0xe814
    +
    icon-graph0xe815
    +
    icon-file-zip0xe816
    +
    +
    +
    icon-file-code0xe81a
    +
    icon-doc-text-inv0xe81c
    +
    icon-diff0xe81d
    +
    icon-diff-ignored0xe81e
    +
    +
    +
    icon-diff-renamed0xe81f
    +
    icon-paste0xe820
    +
    icon-file-directory0xe823
    +
    icon-git-compare0xe824
    +
    +
    +
    icon-git-pull-request0xe825
    +
    icon-repo-forked0xe827
    +
    icon-fork0xe828
    +
    icon-docs0xe834
    +
    +
    +
    icon-doc-inv0xe836
    +
    icon-file-powerpoint0xe837
    +
    icon-tags0xe83d
    +
    icon-bookmark-empty0xe83f
    +
    +
    +
    icon-bookmark0xe840
    +
    icon-align-left0xe841
    +
    icon-sliders0xe843
    +
    icon-eye-off0xe851
    +
    +
    +
    icon-rss0xe855
    +
    icon-rss-squared0xe856
    +
    icon-strike0xe859
    +
    icon-box0xe85e
    +
    +
    +
    icon-right0xe85f
    +
    icon-left0xe860
    +
    icon-left-circled0xe861
    +
    icon-right-circled0xe862
    +
    +
    +
    icon-up-circled0xe863
    +
    icon-up0xe864
    +
    icon-down0xe865
    +
    icon-down-circled0xe866
    +
    +
    +
    🌎 icon-globe0x1f30e
    +
    👁 icon-eye0x1f441
    +
    👤 icon-user0x1f464
    +
    👥 icon-users0x1f465
    +
    +
    +
    💾 icon-floppy0x1f4be
    +
    📁 icon-folder-empty0x1f4c1
    +
    📂 icon-folder-open-empty0x1f4c2
    +
    📋 icon-clippy0x1f4cb
    +
    +
    +
    📒 icon-book0x1f4d2
    +
    🔍 icon-search0x1f50d
    +
    🔐 icon-keyhole-circled0x1f510
    +
    🔑 icon-key0x1f511
    +
    +
    +
    🔒 icon-lock0x1f512
    +
    🔓 icon-lock-open-alt0x1f513
    +
    🔖 icon-tag0x1f516
    +
    🔧 icon-wrench0x1f527
    +
    +
    +
    🖉 icon-pencil0x1f589
    +
    🖊 icon-pencil-squared0x1f58a
    +
    🖋 icon-edit0x1f58b
    +
    🗀 icon-folder0x1f5c0
    +
    +
    +
    🗁 icon-folder-open0x1f5c1
    +
    🗅 icon-doc0x1f5c5
    +
    🗈 icon-doc-text0x1f5c8
    +
    🗑 icon-trashcan0x1f5d1
    +
    +
    +
    🗘 icon-arrows-cw0x1f5d8
    +
    🗩 icon-comment0x1f5e9
    +
    🗪 icon-comment-discussion0x1f5ea
    +
    🗴 icon-cancel0x1f5f4
    +
    +
    +
    🗵 icon-cancel-circled0x1f5f5
    +
    🗸 icon-ok0x1f5f8
    +
    🗹 icon-ok-circled0x1f5f9
    +
    🚫 icon-block0x1f6ab
    +
    +
    +
    🛠 icon-tools0x1f6e0
    +
    +
    +
    Generated by fontello.com
    + + \ No newline at end of file diff --git a/kallithea/public/fontello/font/kallithea.eot b/kallithea/public/fontello/font/kallithea.eot index 4c3e1f714d17c70beb06c887963e77f033fa7204..1cc44ec70f8300b9f174dbe93631cf510b900ab6 GIT binary patch literal 31388 zc%0R}3w&Hhc{n;V=ecL!yJsJIt@gcoKXzAIy)3QuwyhXHWLt6)MY1K?iX=;s6+20z z{L_TXFLC+Dfs#OIfVfQvrO>XE61c?WPa!~VfHt&EpbhP>Ewoj*CGBku1>b0Wzi-a2 zEWd#E*L#1zD{0QmnKNhRn{U4P9y8w@J$)Y`|9USWlrVxnj7S1cK+fY7h&njcz- zKl`t>&tChC5Eq#zQ)B^t=g2BKPG;ba5F6PCsbl1B$e$uBkmDr>A!mi0gmO#d1PPL6 z(mJ9&@@WO-=+f!^S6!~lBoE`-td>~Bn->YMx_6he3p9$lPT{;l)rufzSP z2vL6j=&9A9{N2mY$;I!%^Wg0AvBfhVczhi0e@2LT`PkISWyp8H{p%2`#}@9Loqh6r zln~PxA%|VZXQrkd+duG4LXIxL^VZ{#p{xo20r!Z5=<&tXd-h+x{0iK^3T=L5Vd?19 zj>c3CAv2Tk{7)9A?pbCgtBsIZ>|*f5)Z)y^>gL~udw`ey|FFIG0wMPvhw|^^eb)dz-GucIj*Jr9!qn;sQcA=vgR(VE7v_#l5w&;+&qN-p z5aeR6aDYBeBxwIW1}%~I8!`P`(oES_TDbOS&+Nc7$p*uhFAMuF-$@P&`^ks55C*|I z3BFrrK*j#vct*buxs>M%&>PGbX%6lONfzFbgW=EIdt z4)r_{{y4Aa;#KuLQK*MPJ#MI{d_A(BfO=Y?o*rJ$0jOsJ>-lf^q0qNMvIlZ$b4$?`w$Tpz39vGeNq?h!OegH)NZ^6s|zke)v5x-Tqn?Z^*0#bMAaU&p0 z4Sm1}I2%GAGy=|u&~F+6XG-WpM!1<|QX{~8 zAnWBufSEzoD~tehgscaQ0JDXxR~iB44OtHw0cH?cj~D^w5?PNL0lD6K%m^^Q$a=yE zFw@9-l@Vahk@d6@Q0T3<8Uf}ZS$pn0JE8_A20&UYqEaO2r$FR`nVBbu9Ni%BfzXD>vtG|VEdCs08T*Gr;I=lmLo!Zm9I;3D+jZ9EV%KjK;xjye)&cQv@Ic5Rh`-DOA!88#F%N`{L;N)! zK&^oIRUQbr72@ykKtLMMpL~x8LT-onZ5{|n2>O#B@j%EO5MShhkV%Mt!UF+SiT>ng zJP>jO;-B*XY6+n~{XHHCNE!OmzvY4REuK^@M!ig^OQ&fKJ@~%IfMXKf(+0y~|%_t3p3;hx*T%pb9#)D;L@` zmNg?&T!woK-BFe`ZPq^ihvhD;-$dnbBaNpsCb;y_)})Vmb#`a|h`HQ+yV*>u^4~L? zZ`T4E{kTTw@>802J3OJ)w8|)e1q-@|@Ddw@_Dix}3FIXm0uIcUC_I|==`KO?)y5P# zoY-uz(3bFfx0wT4{(I1l(c;Ik{*RmIZ__kdo&T<;;d5wRGny*&^&^G8(qE~sJ|FKZ z^XhhJK2d1C61)0X{=2l==oK^oEkj>#*Vv~4qVMvgMnA#3&(Tn5|DT|*)ka^f8~{d( zjp;t#S5u)Kj#5*hG2!>}N1!fjhoiI#v1qx?OwZ{*_WaIbq|3ph5%{~m5+i4qZ&wnHT>g{j6 zMcC!bm)~Gr?4LjaRgg$FNI1kqV8Rj%6I;4Map|}&O8(jy#}W=wYbKQRCUiLx3OCRm zqZh1Gy9CI(WcJ$VMVpuE_PoWeGs`9D(IxHQ?eNqLX`OmswRyc*5N=T(0~}u!-e%`P zA~lm+vO8<3B*&?U#6p-bWRe;1CRvgJAW;yhum~WE0-J}vi&PRP5F2bCVGO1^q<6aG zZlAkcSERDqm`9hD5MDUg2&uP%0_+0sN_-m)h2xo)bZaUE7wm0qaO6Up$>Huw@5@AuI*fDV)6bwofI!Q!X7DtIF%40+p-McTsVy9ZZ0V03HQ8(_Xi-2h05}W~1Bzj6*5hf3BE@i6Lj?#!*Ta?H&mp3py%8)1 z5LdMh`r74B3G;#uR9_AfeOGoElrIWX8i_(>g1QI;0_vD-nv^INDHAB0AgZFMqeNAe zF`}r-h}}|?2v_=aOS!$=i9ZgrR9Z_To`@&qNwuU}A~XmipFr6OFKkBPW_}M%Dc;cXL-uSl7she5Ktg}+1$muHIhRZ18tJ-L`xE*$u zG<$Rl+0q|7=uQ!m$);uCBZ5SPNhEK^$(vF(3RtCMh~E)LBH>W5qSWKk6k=y~Mbc~O zF9SE!5)$e+T>b=yB4Ge(bs2!>E%bE$Q9(E0tnwA%blO(=A z2(T&?Y#=5|lh*cktJ?&_4@bQZ!!T6)60z{bxqmp2vRsF(`Rv|5bC5%N%-|y#ahrei3kA zU+bh!dYVq;A7$@c_nhE!6UEVHZy@0kQjpQ?9X1AKw9g~IcT&j%f-1zz!Go*HQIH(O zlXZb$>*qoob78#;L4Jpd5zq&yYZTk0Y=jb@*XdAX zVxblZi6d-deC!+8RyBuyc7G9B;_k=jty>ZH*uM8a`~H3Wl7Iaw6rpqgIMxLVaEx}+ zl1(N7>{8&nFxV7VK2V?tCnO+YB91~Nk}-x$Gb2?sl^%~rM&6Ka5NrafDG-Z_j*>g0 zD_oXC7L0i&8DPF{!3Uz{oIl>0?8nkRkiiEwI*wHHb?tu|J=}n`R7p7KWo=& z!ljR`g@?Nv+0 zA#e!ydv4tLPY^D&lP|A`jlvGFj9p+k-bY>{{}*{W`_wys$wb?ow=+q7{lc<9q%VEu znY;Im3`8nGAARxTS(t4d^-N|@Jjl#~GW1VxG26gH)ZDL8)g+lz38o@bn5-;W8JOSkM%qAe@`HMji6`QinF3v+H3PrM3qY;#WkB8YdURf6B?V&k=un*(uMw;} zoUl>Fs1mAx+TdllfhtqLOfo*GoL7MGIJdqVPw;nt#aHRY(Nm-FM?YKFR!3_(>S!VU zo+=)aE$&KDwDdcqtj8-WqV>3}S>3)~(JJo|rKoCE4oIph9aPLlIZc+cZojMuSdc== z?UGg6EBc+PRX!lgbaub2m9u`}CKYCjS*a6fzfhqm`}Zqag^+eou|{<|%Y7p2W925u zE|jiOd1>(%7N!%O*pJa4RMfGm%8HsAHV&80nwoDP16XWsUs+7Hh|XRyX_mXntSSIx zNs8hwyCkV~7C)%xs&ZV~EGaplq^5S2@{;CeEGfzXkG0HgVQT(QcbinZt;fb#RauNu zbDCB$2KRQ=wA*BISn)}~lm;TK^3eo7vN}vG1<#DP68OlHP8ctl;3akQB{QXo&6iZZ z4t4oc>>ZG^I%x#WcP}}Ty(30N#i}v}N@E$QHG@Pl10_lFBmoUn6cm^h0!T0rU0h;u z?n=f~m?30jaG<#fQ~)xvYhdr--p-Du{^tHj*wg53G;2hsy2W4zoQ5+28f?vgjtnZZ zoG4~Cw-)k!&DT6?MY;}9BU9KawCU;DLkDK8!B?sHYS21!;Lt4I%c5Z92%=ofgZNuU zG~0i&ukYj|co}m#JHl&rM|Dd}wZpy^?r=K)Z>O_8yrx)G5i>>Aq^*V9oz6=<8&jJJ z+U6_|S2&#&;R*-m|AyXT0sVU*+gn##Q-vy&N`$7yKm`b;(h@%iAiGTk1P*a^7A4gd zeU_4VOm|-;p|12)0;?-wr;$c#r-@7>Yw3Z=*F#g4U>f<9O6H-Ts~xVb9X`0Dre+6q zS9A=m_E#OP9hkNbWy+r~t`0=R>DsF@!qU-# zY`*++!NqNi>TH~Voy5(zWiTv2;{mBA2wbWOWF(S`MN$zi)quq%B4`~&&NgIK&^_q*tiL09x=JzGc; zVI65n@g)pwK2&HlWHhyLm^Z>cS*+fuH(2Q7o%D>bj|53oHU=Xk0sE(m0_YJEMRQQH z48veq*$z)A<_WoZ7qN%V6lf2drfVm4LQh)@Rx5oJtf3*aQ_q4}KC6Mz0agbyodr|& zteJfRERc;?ba-MmLjj$2=>hX&X87ZDbtk(E;E{0;C|eKOuz(U5t^zkm1o0rM695&Z zR=Pt`6iw0GU~b4@8nvXH@N1%;P|Jl&FXvy)e}moiJNa+Wc2J<&UVfQeQ-4i1A%lj( z>jwrv#6?`s7zTw@I0!9Sg&j^8)GSFQV8}S(*MvGhyX)mk7trKqcWsQmGYR{cA_+q_KoROOiv*asq{xdf z+$NQoCIM^2Oo^G}2w3~1ooYlbsckVduI<1?(QiVDNR3YYin*?-V1I}Mv_<42{@SSl7PEsaLg zu^9a;Ia`{f-38Wzcwk2^BA84LvNhe4xNY50>kWLtbA+n2nDf@CcWo1+_F=3*Vno6i@ zHmMVSYW7i$nzacpC}k7`BAJL$Jxbj!-8~VZt}u0qF6RWWqJZ^aD9)@_%W!1{v)ecC z95yD3@<9uXjCEL{k|ZDEX?cg=zia1?;i18S{=VMr*`DrgU7a26ZJE}VbSl~0)YwoD zvZ%T$5syVtAXNq`%Kc^jveFV%*W4~=;m47XDr()SmWVszNjdp4MN340fUz5>TmTm5 zj^M(@jYF)ktl=)?tkv+J{jcxm@g)}c&ZSFh`>*A83P!uq@OLhrj@8m->?TU}lA?*D?A6xQ{AE;fNo^20dvW_xNVm761yz|CwKn72$9 zH&?(2uySDNz!HF?q53Y4A^RAKRJD5bNSNE%IOki8iC;k@pt%G8P68j7aFGur7>JQX znk&6{0fjd}*=yX^UQo0(Rg+$k91!Tt{f9Ts9s3a7-Ag}p>d@n%s+P`C-|z$-G3;&i z6%C6?ugIsy@24L;K74<`f9g|5_C!WIYs1b{*Y^!{iW*9wZ_pbnozbXesT8-ecIB?n|5zmHF{+) z_VTG4c2DGUYP~S0a4wz7o+LywX~YCx;*EIPqz6YV0kFA_8Ed218IM1X&(6Ar2n z2b*ZhBAt8#sR2CXdEG z;!37YDoBXLNCQdI&t&a7wN+3hPTe&L<`oBb<#Z5?^TcAdn=LcIBiwF%hNxC*wy5R_ zc-CZJBRSpfyiPX#Bi8(>rp;&e<9;-ge2bb`1`DTpiY9mGRin#VN( z_%&(!h^Cni5|d`yS!T%Mg)L1|-M#q#ZkyRfqd6GW|1a7bAJ1kR8&y>Vl50#h0!KuK zSY1`*hDEvnP6*1m6~IuCQ6A0~{gZ$rOSDgb@oNLku}N%k#yMRFG3D zaGQvABS1)4jGvgFs6BucznIyB}gX z(4XGv?tZzuC;yF}3s9iDXRW7)TqW;uFUA3#O=X)r4uDiuBoXF`g@Ia#x)vjXv6_pU z74#rl7dwI6%lS&V;>#p5DIZ4eLKi|lTJrSMJrfh%6B9j8KRr=^m45C5ee3C`ArqcF z{WNVag7-3V8JN4{Txax?D$+)V$~_QW8<(7Nr0RrX=Ai9ctC8GT7hU)tYXoi$??H9=FY`_*K8ljDz6yg`8d=z-;iU zgcDVIr|xyP7`hl3hL1H#r&7cgRg!h;G z%S%f*Q5VI#gEPA;yAJ|r?lj~H`M^Sm0V!~T@X?oyEr(0EEK5I^x6n7<>VEeL81^-w ziNE+58{?1jmNlS~w>EyC-L(c!b1%R9=j>lTcHR1Y45d~i$V3TfQxZf$0*gXqg2?8t z>_A+%^AL-ML;uO02TuxS=r7uPn54eRU$FP^8+X8Savl6}gg;J2AqFxg3KpO+w7DBW zjLnGumYov`MVQG6%=f#=`JKgx@Z2R(oSOnqKae`s$l?p4FMxnN!;vyFnpQ1>CA z6)|=K>_CyP4WLFu#Swv&`gFJ5W>$$yaLIG_qJHHylmIb!QDf)h3W7j~eaGj0IayP^1#=nKHGIJ5PVdGKhuYy*g-azNE%?D2U z6i4&Be{PiE1};Z1(&-%FcRyIMX|jzBlH0R~(NIK<$Z7%I!YYe&2vI5vqPz$iw;)UN zX2m4nLLctSS%x)wMRxaex3<*R_4RfS_6&Bkw`^xhYjZikUCd$c6v*wu%bS#UX%k_W%EKFHOQO+aBtqRKkw`Kc{X659 zy}{Q2`a2xQ|MX9fJK6^dcTeSiJb&eGp1PlMv`$Y2&ESqvfVH{-ReZllDsCKQbiPrf*k}dtS4FqcI4*EH z8)zck4GJ+lcD81^C0vR@{GAKd1zCAhIV;5USRs)qFQIGkUBeCj0PQ~99q^ZwV_aSm zXbZ%vN?kT)WK?*0aWTrC^aWVBCKyb5gHT7%TamOqGvx7m!wI`BSzh1GdTT41?DVxQ zH~Ih5=G1JuKU@>AB`fN?y9>Gy%Be~c20bAK^LrsX7Xb^m0_JNX$QQ71oysH;6N)G> z2NV>#nkvGqRtYn!Y?2tuRG>nF1z|=BjBB9jG$rY-bXRA4YfDpOLmevn;ZUj1W--YG zWuKkY^U%7mpxYmm)8M8$cxL> z@zBuo&*y*Z`R5mNZw7pC(}0)7zYBtl-M_i+{0wNDr@gIq5ON^De5aqMYtMfr_cjX1 z{BNE0w&r)Uhu1+2=093kpWW28LFcD@{a4&v|K&R2yrD(&Nl1v_>$I6cg1~&mjyn0) zproVryj5{#omTY+pvayFaJK5fERFi@4;8Bm0NSeL5<<4<{%+2dGo+VJe@+M80{!4L zFeZnHNzeq7wn#LqpjknhDUu}5pbxu=f!btsfPA-FUUykH!-}+DsUp{ZCtTU#8`K2G;^Ke0s&TMQ+J#RxoY@;Ou^iYH`2J^N;rg=?4f7%?|LAwLN9et z+2esH!xd}%frpI+YFIoQm7DT^8Gu3_%p9&*uc)B`ELg!a9Zq~b5LT4#)IV>6}r)45%j=u<;GdF=l zFyFj=k?$R@bAP@{(g<4d&g@VVm6a;cc>NAg%v4;%1es|p>~Y65Fc-lnA=hp=8@qcg z@s@Zz9z|zG!vXWk9$(^``;5o1xA5LqcwXESMEgrv_uAf_D~`Lv$s_GaQ%C3*!vE z42$~+hz;C5_(b;UT56U%sTCB7Qm02yfKJU|==-Qf%ofc&Sz^}($wo!1Bu@CLg;<%z zI_c&+@}pjpO8`RxS^w&jt3h%pBxH?DR;ETFw- z?DKL=(`)V}DCdT9ue?GZMf{w_%X&VrwkC|{XV&b1C&yzPi3QhQ!!?v{Ut7xuvO`0| zg;y~9&7mP07#`kuWoU>!Tzu^@s3QOO#rMz;b;u}Y$gQsm>+C#?Kq=`a{p1iilpRf% zft9#l2Hvx;k5RU#w>kk~{WcDUTzkh%A=~oA~-yUf>5;V`fCvxYuzK-qheViUMJLvR) z+2JrZ^*ins>0JKsT+)<~HKitc&n?ax*TWytT1~PHCXSTf*!^G`^_NVz-O>8VJ9ldD zotw_~M31z(4SxS~!Oi)7khGK5Y^ut{40msdN&@$HL=$4`WEL6Xc%;?aR-SgdaEl^i zsQF2+*eiDCA}ugo1NOC-sV6*PEcD!XJo9-MP!AQ_D*a+FTZsT^RrE z|1m;i)Z^F#^q@?C{I5>gbdR0>Ce^-k&vZS$)4gK%xoi)nkvSc^}I`ruF0cN`gwF0|=#|!i(EXLj)ZTQ8`n=qE|)a zWsFE{QWh9h6grAAMK@upjI^}I;{H0_?ZWky7^wF)>g}dJqzt~gf{ZwTT4`&hL4-V9 z!vqD~XKdZL3o1cNK_#GpnyxBV*VgbA^`(bY3)Pf^_sMV_RxED_ZPO1ub5JpB%F0(x z37R^jSe}{a+jzTgVxo`v`X(N!sNu5H`_LC;YEg!8neqMuie^y`KJ(C#4o1x?=83Cc zSy44JtK3-couHH3nIEI#+S&O6k8dWo;hJz5Y)6a8eO}Rn2p!OImr5a$vPcva{^n6@ z5pBI187cK!=5k3ofo|59qknxMs&2VQ+v}9T`9N8?D#LeqOTzC^#ao_FYSBJIi zi4TD6`B_5IoU-9c5NwB2cvMZLMdDtaJQ z@1_%)T3iT@x=S+2nX_g^_tf`?H9M2`SEjZ%SMQ8iN*va+-iq$_$})FpnP##2R8TC{ zuClmZLaRKw6s+=B^v4^k97SAzjr+Z#k9udeEmpxq3Fj1dIW;x}ap~)dASHay6FHWE z0<@(inl$`Q)jC(iMu?X|S^`FlcIe+oo&MT~qcu62zW-(5NY_bMJU5fjRgGj(Mje`_? zn9&-;a}=*g-&MUE!#G0h3tsiR5}j1#uc;wVlZg>wk4R)Pz`nWH_ zRXzE(wxI(rmlh7oA?tU%r$6 zfzSZ+3Uqyu>-yZ`kQE#bagjuiMnZf~5Xj1DXml-TNEThzeor#5Y3jTRB(5r71rqFXd_3avtHx-!{t@)2_V{2IybFxrH%pd#ardU%uq7u!T!Y*SQf%&}`| zuf*TjP+e6S@JB&y1K>=E3jGRjg{A)ritdRwJ}SWOl3$Q5%8M}d=Q+&q_sUIA56}@s zhUxf%$y;!YpdB|kP9X6!e&{pz&oGZ%G(xw*poURi=|01KigSQWD~dMbHlS(mayAG8%C30=kQ*TcH+s1~+jA>Ti7VS&9ow3 za5D#MvnG+fLm$XJXO8&itQmNn{Kr)p|9yl~x6;>6&A*#Af5hYpGfLuh6K*1DON+dy2O;W#8mh1{H+*(Chl$gT| zW|b;S3^X~glx3^QYNi&|quVU1U6t&TX0d>(3{^4^vrq--2bxWD0au{ZguOFKs_q6G zPGpj17J&j8tB|Q*1dUjh%_f)MX|`Kbt7@|fiUN$LjInwq`!vdYm7Y>)jS8y6ZL*tf z=9t@NRYMVzB3gv~?~5g{Pd3UF#cXqVB}iy?)n=ANz^t@}^8wzqn?<`LYw`%1NwS+v zmU2P$P}VQ$4h<^P6lStZX2oWatX>7Q@i(x}Zy~}IvDzkAx+=|}hNu?RtRTepN>Q*e zvuu+jRRvfTO);yWyqZ;^nrVt6+5#T8#pQ4?nW+{@ldT?25ENO~WSbRqA}S&xs46pP zOOPZ%5MdxBRk2zWT|fs-5x2P<4l6XrC>~Lip_mkBqDONoifk4E9E%gz3^WrHfZdi= zI2EcnEwZRs6lj5o&We&&i`$`;>yk;<1=pP;yT>>U4Iic~+L7oM zf1N2Qff6eQqi8_3)=|;t70w-aF#N&SKL`fmuD_+?-{(KS#Ym)oY2KaxS^lr`Kih3K z@1`n^Q+2nQcD#3cN8hmzvB&4o6kK`a5xQfmG59UF``17E(O-AR^#?!7KK_7SIOoJ( z6D+7lkytj2kmFLGNSFAk9zS=D=eyiKr_;yv%UD69Om_=7lam1fMh%!$E4r2qHs_)Kae@}o33k{)atB$;F1*JEC>jt z`)FTx!>;zj^+GHb>aP+9h6>Log#Nm^uX#(U)#KQmzqNPw?%qIKZ(BO<^_Q12ucK6B z-gvsLx160dPQK*-W&8nl-%Iz%@BQ=I2HG!d-|g^N{eD__yu}_CNC@Qd0NI<}U0V|g zi@+_1tT2CJ00xPsP*K%H+_w>cKThKQ7m?|N1lGUFMD}5fpIb5!(@1t(TZ=EAa=JVD znc0e3U#KM{rJQMg1WMUl%R`qd!zNLLg2Se9Mj7Tt!H7u|j2IMKZ_>}^_tT5R7U^SB zxf<~0zvK-7T?IY#JKi9D69hQ-OTg>&<|;Xpe69AU9bVFLzY zQ}j{jY0w+xCmuEse)@_0X)M9~cy;YG_?cJ@@H$BXMssI&C~D}BG7*8{px>6j6k$>| z;gA78yN->yUA@_Dooy{m^`StC*OhQ5TAMYrtJ3IN0UDM^$8NyHh=p3N?IH+w3A8X9 zy{?Cbwc{23KCp4lo3=h{4zN3XN&B4cpL2v$l6+3^nWDomM$#edFv5j-Z-Z!R) z>3kqz)Z8wOcLreZ*>`7La`tPO1{@s~vnQdL2=-%Db zSYMNf2a}Pc8~wInzWBkEl0wdq2j@$1$KA7qdceS6x@_X`Nn%VTDq|ZYgl6`^v;KuOUfg8OLx!Og_qaXE_Kt>-96o0 z$NxF-l-~s!+)Jj&U1T)7w+$3wV1E+e3=d2LH7cMw;sS>NVtO7~x=5u7m|Q@k%5`fU zCl+R>CvHD@VAt?K@3xK>l{*tE0%)B`e5g2Q((x9){|hQ{G0qr?bR4)i=j7cCcZNB` z;je;{izv;wTN7Rh)MSIIxnmTN`Q|;ARD|F3T0W{}V;dW_d+au}mq8VBS^W~&kcwvU z3ZQ~8&8n4x4Xw(cs)1@K>AJ(C(BG|Yus)?%rSoNWi)8C#f+HY3FH+CO7n!Wm{i+QN zEZLO*EGT^)f~wH{icJ90Q!odVkjm=35^bVgb+NGBsz^3asY*Rv9@%R)S@mvR@aYv7Yna1Uh&IP3w-XkgwKOKE+^F_ zooxn1N%X)4S3M}>N5pWeda|%&PAuY%Kt(iCQ5~q(t9>&1*d$uH`oGoCY0Vf0b2@rE;}CeYEzXHEQj#ZhZO5>Av{C-}>!h30}0K?4lLQ#9l2FfJ>1_ z|BbN9{s!h|6!-9=KE{kqcJ59)dBvU9aPgxgP~r6$=NgTJdYd38xqXG*aEIKezHyjw z7ld9se)v!-olYG({CY7_mcP_qS{d0kxGhpy%Kql6XFRcSAFXh=g(BM`@E2-xbN>8K z!lIy)QqaE=~~e~f3#ffK~=P>rDXo$RkD%RkiJ(*vajWIhu4o%vV0 zY5N-bIHh8nvXeawd;m`f)MOLT6~uqhrw^2Iz6FD$BGQqFJJ#xU@O@*HD`1XFTQeJ0q6$3AR88DKlGv5g@AGX z5#ZTRBDl8!IL0-GMKE-5HON3O0gHw^q)0m`309W*b+^N2l1YR{lxw_Bia??Jj#`N5UxyXFP^=#=mbhesz3WIXFYf7+^q3k)NKO&Hphi|-l3 z54?!NRVKvdN>y3bf0Ku^g}K&jaL#8ZIA@KAjMX)}Ym11J_AA3u}n zeNzwU%wOuKv-yWT9o|j={eJH#eac$)(0h)5@Po&LgC!=@?<}yIT_L+xVe>Lq&?T1s zH2<)!Z__)y^#07~UwdP_Cg=xWf1K$K*`-XZb+M9qT`TSp-NG(|AlFF=@RavuVJw+c z;k7AXZkB+aM+Ec;5Qhxklmw9&?lub0wZeC9C^;%q^jh5q5fu-i+v={eZ2bC?Wa;{X z<5?FWp`hRAu$xrWCv*j5o-dOC`uBh$7FM_#mdw!BgpWpAaOEqJ;R}D?Og@|%rgvB* zG5;OhXr_%qU_IZoF5IHuzJ5FO{b5~6J)G(qVzNcd|CtC^Fq!XK&o{nJKU(3r{q5U4 zo`=0fUm?Rbkonn{0F3{x>~O&Ca>^hNkT7wp0&#&$g@6?Pxg~*0!lX=bZ56t-xwz_Z z)Yrtq=T-DH?5Sx>gR(}A0QL`?G?fbDp!-td!ZBDlz;h>Q5?7fNRMCq4ynQiU5pk9-G= zG~+9l=w2zYk%B{1b)mdMe}xx(|D}eq&0Aj)`Ei6_@(#K(!Jzl|ZR=`osE!B9ylzf* zCLp_5f$ZX_6u~&TJy#4E7#JTvHl5&(*9y8H8z(k!=SASOsT3$vr~jHgkZqwJlj#+c z3qo|FFW-bCMqiHvOoCFTYF10WDVC-Dy++!)O!Ta=9uB=~$tTK?Q11>Dg!Uk3K^i(&y54`vFH?;T-%q{%s#$Rxh02 zFD!dRT2jbV=?#svbJtj8^zt?4SK-WG3DoTZJqqnb&iS^kr-Poz#U5f_WFwJ|NNWo} zkzKT#@MCG+G{qfVP!(l~cxEdYVu|Zz|H1giId?gAUhp4`u{+#>FXx+DRw5U0#qf&B z)Z^6uy1dF3=GQ+soUZS|ZNJ2O?U%c$@o&d$g*8R`$bPbtT|$WKqF_*D+n8$FGt4xz$U7i2zEq)@WM$Gy zO$5*KPTHuMXp&jm(lyJLuJ!k)(`9A-`}_Be>`eEid%HTC8mi)(-L?OU-E|u)7sbu( z7U`Oe?rZOV33|?MJ;_9W>&EAsemM^54~oZ`)N$j06JE|LTQRXWDs3*8tuk8LQxe@pQCv>{?rWz{4vDv--$i7nzGGnt#z1-T6BgQUun zc(c`{9vq0rVy&@wiyqZ*B~!O>VC~_CRVFoG~dSn#8bd+g9 z4=DciBCoJ3`opL8exz&ITn76+wOfFN(o2`(9ToI+pd&_#-;RN{y`%;`Il>l3`|)dcpzeZZ0s0+S zb4#c)@)4k8xPd`ON`0|NsM1$cS`!J!!m8v4RlcRL)PpB@Qhc>1j2~Ip%*Ep?{0Q2m zm+@nP-Cugyo48Qf5oM{j-tr|9zAye!k3XKE6B850X{QSppis1vK9TU{zu`;3t&g_* z;~ZcA!v2E24`?fpEen@86p^rk*Q@c}RlQul>Vuw2(RCqV_%Bq_f>^gxpO^iGeFOyb zv(Lf>R6U3tSMKfhXP>n%dol6cbN1^C+8eOImc4u28E(qf2Rs&m`{EJ_wJ(WG3S6xm z73h{ddw{cqueXBUxT!oQio5qpaSQ(jJNLh?&CD3v_A@i)fR;3yAvPzq0K|L)|9e~Z zfB)8oPbH-SAhr>Vv7ePv@FO!E7rc)!4olo^#}b zfTH}53izTYIKr6M3lHpeVC@`#&(S4B;1=9@NEmUafL4Q!+MEWje5L5>#cGewr|Vqz zxE5_*G%b8ryE&xH<>ntg0GE`ey#`34jaPd(e8GVz{J{f=!b&KiL4jRczsm`_Q4Zv{ zgP1@&ir|WX8BHnfV2EGYLq!~{+fiIQzz+?w5noB%_(W(rL2UHy3O=~G!cd3b03wq$b8 z${c+zx#zKcx86GT%nCd{_4FTp^qy{c=fWoq|Ae0v&b4?*kkp|CURN89gndqj&8p%_ zZ95sLqWCp^t_PJ+WGG%dmYsS| z9;~ph-4|MGJ9(&l_VJ%rI_!aimF&YG&o{K^-wr+IJDjDyc2fMW5#-t0fBozo_O720 zv#^d`dvh(}DaO#tIk8FDPw)%%#=j5Y@9_T#LBvLQ{vTq~mj4Q2{LEra!uaJ4_8NL) z!7vqKkT-;NUcM}>LxATz%p3VUz&$+$O+a8jHUclRZoDrx;#VUJWt~Q#pMku)jKJ%E zr&#v#WemLicMAFATiTkx0#orl9y$y8<3`|ZzP6eM=A>RWd zqKU53AF>g4hW(o`EPO_EiD5A<4vUlGvyxvLliyXIRlVwj`iT0viI|#9-`759o;3f7 zrOWdB*1xco+Fr6(*&ng5JEk3f=DjsvsV%Rat^HP=Sa-1QQ}w0-4bReU!Z&Y#LU)r1g8x(C zb@Ot87G30THtDma=phJK6Wr0lTMF3mMp}UUfkIk@^zK3$zs7K=kj7)XM+#|;)ROr^ z+6?x_lgOb&gzQf8yM;6*F6u6%8L`n=AuT|Ds*n~TJy1wX#7hqq(lX>P7Sb9yNdHG6 zZ6deBz zQp3@u#rdg)g}K$^GgJF!j@`X5wX%7?nK(GJa&m6zM6kJ`X)|wV=ETg()auMMws7*) zvE=INY;bmEX)!ohs5`j4vUKOn(bb0ItEIjqwLP?|49N574KZ1gAy_^4+pe6plgn}dsVV3_#p;a=&|BKKPX&^`8 zx_E>CD|GdLCA$9k^*J~GuSM6F8-nWzUUrH@GQHV{ljIb%ndJZCWtKy`!l4V2!E4|S z@_z=i1mrRUJy?a7j`O#cNe5|!-<$Q5kWGH9ksJTa;(-w=Qi;k`p(-`um#L_QT4Cnf zse?MH3%|=kJ=BW=hnCP%T1LzHNz+Oiq#+un5gMg28m9?bMXPBIt)+Feo;J`%;2q60 zNmDdUTWBlI;IcpMpq;dfZlkz~mZjTiFYTlKbbt=hAv#QV(4BM_9ig|--Sj0x>+y^Y>ZC+Hn?l1|Yh^eCOCGjx_7Bl6L?m7@zY8YlSrrRA9u z%H7L6HZ9D|8abxvrPC*PN<6wWJtLl6T3Jcp`b%kskAC+m$`rmc%}C$8LS z({r=4^;6T+Gt(BHT$x#1It8Wp&EgV7b2HP@(S@a>^VZdsIjC-7rXHKMZQgOX%$v7& zFJCE$P+5$o>Sq?0SMN2$j9OVW(h^TAN0*M(Pc5vf(^IQcN2X5Bh{qsXM35y8s(oeV zev|{2hwqTo`gZfY2eFWgWdtt_OY;LuFac1S%jI;u`D>f{% zurxJY58b$X+H&{ul^f~U%GC04l~-`z+_H%$5QCQKrK9z$Gxx04&z(3WA~p>C%pE(i zv~mSm_^+;}rRAxUt1|`^({n4p3YJ#xH6s+j0hXs$W*nGazI$N--ni@TnUkyLm6_$G z`q`zG`I%`EBN3WAsbHJXoSoOSymWeIWqE1t#HzSDb?l_=$kNjMB5*AOd1~=in_2*v z_>d?k7v`pcg()-l&eSi>&I&6hPnsdrpSEdVeEw9di} z5~z_QA6=M(QX+OkJ_#d!^tgR~=HBB=h<~GY0q#Xkcz7}11ws)38}eyD{n6txWF4Jb zuo+RYo8rv$+^TG}Xx`GW0O(bV!>X>XOr1P_bn1j@YGq~VG)#!oK#7ZsGbdJEg&4;2 z3OU0PZ=$>l7)d>Q`}(KSDQ<5$>!c@9I4 z)CF_oz}UceFu3ar#I|==PTqfbESE0JRgF*12G1NA%dyzh|E_`>dh}@INLeV9BjY*J z7wLZi+UT3?tKF8{U)4|-A_vFO*;TNi?);Dl;VBf7{p-8Cg%vdnDXU|wD zmmMz)=GrjTHa;FaZxouE&Q(EH;VzhK!sks`^2>Y1f&j#ssUR-tPeM)*pJ|wC#Z>EL z+2r{6cv+6tj*mxjWY5^l_;`Izs0%_pVr&WklKS?H<)lb&PLA{f_~SV`S)UW@A^=x# z`n+_cH;7M+#_fbL60Yc17{*rI1n6Dqzti{3zh+p zMJRJZEHc$^G-1BU>$xbrMar&pZR<;xI^Lld%$hJT7AlK`#%n_LIcwc{#s+fJQ~mWh zTOAYx1=G^E6JLi!q<1`L#k+lQXN9}^oE@rhaFhfA14p6VoULy%cxEz~vjNiTbB?-Q zqhsgA>HhI(&N>shr#|Pb+qHLW*M1|jECl&(p6{wVPwagM#?IUAFn&|LIeRSuu@1EXU(d!#owkTU~OYS8dxZ*UTt|D3}?iH-F3o|!!F zl52A-wPj&IlMa1z*VgAeb>}I@UcfWPzPj@Q#{RnVBE}_k=Ov6w>(0v5B6j3WRD#!&zS;}`&faU1}_I01lQ zTm^t&TwNFJ;`CHg2hBPrgMA1>AICY&k!mEW+PYj#ZLS8UOC3<^Q1B+`j!d;hkXQY} z5bjdj5m4rddTp##@f4%6p`jbc9W{vqeP{oRqa z^NrL4J!yu11E4pC6R38otv;8mYw&f|=Tg6{C{Wl@D4vF)Al_K8AvlCH6HvJ0%$cFc z5KQGU;Mu_QV7jL8bM?@E3$PF`P(S?fA~{oE?aY~mNHExS2I^|P@;KOF)R7aRPAC=3 zP2yzE?j3uP1%+VQi!3gbj`t#iQ-M`RcOs&3a=gA~88H1CvzRBrGPUxGOhR3XL zstnST$Y8F0X9_?9t{WMIv5Prf4H}6UtW1R23%HknkfiHsg&MI(F%AS= z_ZTefN?S1G8N>lv$Wpw3gGd*krj2LkRG2iu;9z738^h6R=P1Jt6fjCg#~OlNAovjC zLS_(QDWY7C!QGCnqSY9v8&PgyWFknu9R&#bibFGrviI697KgI4E)r}&tPKL!?HX@5 zUrTkEcwL*>d$wk8ySnrZ%XHV}T54}tX-{3Qwe}1&jKl)aUS9@=r6E@fMYEd}R>Uq6 zR|H7C0Vau2-F9FWz@YyNq&W27MSTc9@|CU#u#PR`9U3pd*o(+0_P-DNABq$ZQ0T{I zm;0g19%FKX=!SXdZpbymTpYMb{vhyLs=ISZNDtNJ(hvBt!9kEyMLg}OLvqXw zLvm-`3xsTk#4bosOpMgMKzYtBkl;DHu}m){-h*W@u?NdwVlS4##6B$34T=3&1{0%L z1``Lc3?>d@nJgp@VHr$}VHr$}V;M{w#xi}7xE0G_;x;UUiQBOZCMK{<4;-~-WbC{!-G4rgcVAQ=Bvi~kauif2C<4my_=^@sEj3@Dm;bk%_&?9%|6wEl E5A403h5!Hn diff --git a/kallithea/public/fontello/font/kallithea.svg b/kallithea/public/fontello/font/kallithea.svg --- a/kallithea/public/fontello/font/kallithea.svg +++ b/kallithea/public/fontello/font/kallithea.svg @@ -1,112 +1,212 @@ -Copyright (C) 2015 by original authors @ fontello.com +Copyright (C) 2018 by original authors @ fontello.com - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/kallithea/public/fontello/font/kallithea.ttf b/kallithea/public/fontello/font/kallithea.ttf index 94128480fbe952e5acdf0d4a4fb6261198db8bb4..d1da92ac2acfeb22f747e8a3236e01e8f20c5fcf GIT binary patch literal 31216 zc%0R}3w&Hhc{n;V=ecL!yJsJIt@gcoOWs}W>SbxIw{6AvA={FZD3UG7RwP-9tk_8! z<)0>8eu>LJ4wM8!1H^4YD1~;Nl)xn}e+mI|1GJ%S0&Qr2ZK18gEopCSDELO}`+akE zW!Z6n_SbuVzbk3Z%$YN1=9_Q6`5rUh91%(gv6K6WK$eFN9PADLM(iHQc^ks$dk!=w zPxnp!kPx~T?hhSXoLc^^3+b=J{ig^~e*f6%)u8;{D~yoE@4@rn?DFx&vmbbL9PWQc zhA!lw`3ayOfez} zM%&>PGbX&&we zNeIdt3iUh|{y4Aa(lzxwR;-6YJ#MI{ay_!1 zfO;}ePYAk;H~_53&dQ0Utr*$cn>$teFla?S58#or0|ord29vP@RscNKo`;=lKh zdw4wza3&&_hytT%0{oeYg;fC8;6-QcZ#+M8YIO zq9jJ*BtdFOEvX~*Fb<8Ri8KRUZ6isNB5Be}G9*jdNIU5uourFw2a4-~(b++INgwG4 zK;-`xy!`+B$ATB}TgAH>q&OoWb%!1`0*n|5eZUAf8$us60?vrgZyEt-O6WsIzfgf4vE2tXesQf>sG6cV{)1fUrb z`H2yb>qUNQ1fU}l`41xiMUmJ)8UbjF#HWk^R7T=6MgV#v@h6M`lty<`;nL*a8i~w_ltOtw$vxTfz8v*7G zSq~ZkW)NAA7y;%IS&te4x!!ur2r$3Mdcp`W)5v;_5n#@d^|TRS_L23B5nvvY^{f$K zMw0dIMu53V)_aUV@V%T7V7`*|9Y!EnN1qW0*0IkBFq_HxK_kGtChLcc05hDdj~fBz zI$57E0?c}{ewz^pwm)eE-~?oS$_NBuIcfxgupBc2L0G1Z033s?&lrIqT(d?1E<*p^ z#seV(gkIXg14;pUX_^N@h9I8dfskQ{zr+I}J0bpK9thb5@mF{tWH-d$oJZXO75Z2A)~4}=_mIKcyG8xTLt10e?? zKFb4W9T5Kp4}=_s_{%&HG6wM<^FYWr#9!k9)C!1S=7Er#A^r{z1f&7|$@h35!!&76~7kjVk9u`>d*P_L(tNAgOlu0?Gn;SK0vi3eM&}AsnszHZp|!NeD1Zfvx`*%r z8-(`Da$X7KB^?3|%$6uTn)T@}LGsnd6giyOY_Qmt@O!tI16tvG(2mjK$Fcs8o9A!Q zG+JBuuBPF0Xk9a!D)#jw#lF&CsjogC?<@1_c4$6PY`z-1`bgoswASbqGyp9_UvJge zrvakx@}x#T!Mo4VP;CF7ps%$?U#%PfMoW$9KHgVTu^o<5Q?W7O_X!ReZk8v#FAZ4JcSqb5VgN=}St0=%O@UFzS z(@;2`ZB1uVA-G^Kgmq2bAet&G&q>nrl3f#sVxc^>fhkP|9oYsC|7c#(C*^Ppf*qR>eq z%Cb00L{T0ivM7&uJdtQD64h0yvYxi4<4OcBiAY#hJaF-ObZ<5V7hfuw$+qHU3wL18 zdTr;twjsMt&+%codh^^?zR@uZPtU;vD6ZSL-lVp06tbm1cGP5Z<)B3Y#Q@+iKny5` zv00C&HHs9&VGR`_480Ss!T}Bu{p^ikF@U(HbWd5ns*5HjCR~XGyb1w~#IUv4iduA=zA720kK4M3_YKW}Lh! zWut&qI)?ZiVI&d`1*^(EE=?hJW>+M=p8hg$L#-j9al_?La3~T6pjMXwXu(3y6do3I z1I`*>2~MYtB`vycDg5plxgORA(v@rHu!;byLcs=NqBMCuu%RF$iFmLf)NmDG^;ZB` z3frh2pvi8UZlb>c@|VLMp-@MEM=0F>?(jbuZtrgo^9%N4lYVv3OPfe8x7`Lno4~lH z41|+F1qS3K13}3!3eZK7f-n~)iO)!Bj7Xw1;_-UCk$41|3HU-#T!1 zlZE7rMB!of);pdPd~TvR+UzwXTtbR6 zn!Uxwpp5o;JWS7Q;S(0H zFY0qOKq|=ZP%#4f0CkOGo0N@E;`2HkicBojA|Y{vZH$k76Wglh(9a$yAxqrz2)%hL z!XDZG{-@u+pI-{EUV|c(4gklxU;&QNPFi!xB!FEGd>00r;>rgK6yc-#-)&n5%R*Dd%!w4C?HGs&)8SJa_} zHCs(ve_JM5r?WZQPy6SF?k_xpqW)>SRu?XRWGy`0-Q?CAa)XhzN0`*qU+1@o{+6K2 zYPHAf0!$7>ch%oIS9qDW&E5KI_ZKdJ+OgNJWioqXzjl`T>%tyAT2oHnU!;XnKSQ~I zbBq2V;5Y%6Jyu|wv{D2dOE-WVI|QQJd_&+6?)Tid@t+`EXeVD;5u1gbU>Uo>a=eGU zK>jcCWbTQ#{*sBd+izu(`s&4HfkLfj;{D$8#{-IvSbG9=o5J1!d@; z-e9(Y2dKGUqpC?VsS->@rZ8Dq1U*GG*~Cd=Qi*AlNGL}ope7~*%dtR56@e;~L@=9$ zQ5aG47%>axk$?EXH@^PqPyNQ(#f9mkN5<31`Z~9+>u#5w4{JOu>)vEWO2=)~hbaNG zfcP>B%xcgP6t55P0z}vhY52v7-kOLfkQU;t=`76ecr$IHIQc=n$i@?K%uInUk;%d@ z@&ZsRd|6QUydIs`SWSVLJvvn9#cKrX4kv6>F{*?rpf-3JZlKB(Fq5ngD(4j-JkG7} z#uNPAU-4CXY4r3c{L#-gv^CJWjs{wczo&|aWsAF76fOM@Dd+LZifBC{YgV_fSG3A| zMJcLUm4lM1N{1A)QBITPoZBxe0v4oDa))G<_KAL{YLySlGMzmjYn7}YxJi}SVpbXi z+AmaT%7FulRwbkzRIF2-&Pt!i`dFn2vWunbR9;&Ag@x%vC-!6X2UQKMrn;)Gj*Y{m zv###j#{m|b+gA~jEuynmOq%7c3abhLS(2i-+b&6JgT)W(xvHFyHcLtlD5~B!YMd)d_%#QY+o5D2k?NZZJ1wFpXMMPWUxZPpI|c06GB9ME z@M}VypWX4|<%?+YvpY7zvv(}l2?7>m z?~H{a9f5TU0GK7&JgHfkL_jF3lYHxnBGUnuv>)1MhZL~2*sh9Pm+>}T{I9$|o{LnL zG1AqZY2DV+R9};bhRV{FX)l;eW=#=^joEB``bE-lxPl1*c6(fk6e-r@4oA2i9*=PQ zBIGRQ14+kgORBj?Xq=cx_||+i^irbmFKcc~w?)7Fna`N@gun1ITF^dG4xTMI7Fx)1UnI-{i#7v2q;|N&$q@8L+QZ#AON@YQi zMK9A3^uBxgG z3oBgNv-iLuv+Oi%u8kj+M`Nj2th_uLO~+#NuZ&yzu}BpSR8DufwpE6)+(4VNFzaaV z?+AxG`r93U*B7s$#TpB{VrhJt-C@LqhmDxOp#@ zNS1WM7z~l!f{6(e< z4)pi+?#T6YZ|~~tXm87ATGOfIwwC6mMvz6dHHmmEiUO%RP*v%#@K=5aQT6(5-qq7#YtUGEySxe8q?HAVHo)>!G{?cge*5BINy0`xq#H6^c z_j9oYWRf4op*Po4N2$CmA_?5gmVtT8ba8V9i~uVKh7K$NI2x+&;ux}zkw{I(t4G4z z&c-?4YE1kp8Uf86_;(WcxP*&*Ai+S4B+^{z#S19B0m@$Cw)TRet*M&ylH`CuXYM_+ zasK#+=$>Bssndra4b`-Ej{1ft=!ju&t1oF-OnON^J$^6!;ECaT1OC&WI=VM9+F2iV zo_=TFK&Pmq1o{TOu~M!>$P$rcg0hL=vI2ImXsn1LUmwBlG3;Ke9*OBj_dq;_K}_l1 zP7sZ7NoKZ#A@Pg5SM1Z4UcPJhmQ|xy_EImOxMBB1KBv};a|-9u>D(zoG?PY5z@}71 zWy+!xtTxduQu`t?>X~Pc*?2TnUZcq)WG=hIm=(Xc=_VRw;$^+{j3S=8-H@~A{ztN z{6b+@&wbr%J!?F??eC^{6~2Mvr)~0R>?5vZ>ZFQhazu2WkTRpQiLmtbCT zaCcq@!8lJWX1m!k13bd*)@O)nrDlt2o`BbFqTMz@#4=C@MQH-+1e+C5!2DEj0=of5 z-~#HD#$6M$cnwx4L4=@2n#rd<_=EMC~sB-P!E|L?Y$ zTQr)3QT_j-z47r}uDMxNMIgE6WHWF?WQesjC2m-v3*dyHoLd15)vTFBMO0vVftK#9 zkUYQ&;Dg{W&WA{eW=xLH9Dp>?qf$i0%Ulq8gMOf+QF48xid=fI@$&*jg_7Zq6BA0==JI-}RKdB*YWSAVwO@h8C z^mf4POxD4Wh0B>FiU5(Jr)t2XKwkr`%tU0xgeD~sC2mm)pkPW8uF|1attx~4-Cdb< zQ$su&sPwpPX2q}iU1l5vuP@~E`T%BwS0$XN(mQppyVcOez(C|{y(Qi3-R^~ysuq4` zRpYcdfUCJ^4A3tHmo&9-2ALLp7_T=@vtb3SdU*ejH=gG&3im=(c-0#yOh>U0UOv1f zRa|4$ND*)IfH&j?K3qW~i@DoF6*>qfI^=`PAR#ttGd3C&CMb(`Y5~pJVw>2q(SX}Q zR-6PE40<92_XJV7 z1VQNbMcpBX3Ft=(Il28F$>Pr7mMu4TDj}6-W$WhDOnMcMu@3oJdI?SV*B{Z8!Wq87 zNgr0UbI(3Y17ME7i8JUshE0AOnBx}phYs(1=xo5Zejerzwa8I?r|^Mi-zq%Ji;V|8 zfC5Z?UQvH&&y@D6Vcc9WuadcDL1L);5YUPkI|+86$kzr?BckGnK+1i(+io+f#3i_7 z!`i#fsJq6NL&FV?GhdA`UozRuI{UEOQjO!Wv5zHvHPu#^+fo_>oag1B*Yp5)T+Q8K z0tVRATIbM+EUMiU%`=tC1KTOz&OUBm{e)^EJv}NWj+|_irqH^uxi}Z}~oEZEP zWuAe@E;2y&pq7Z3%x3Blm5OL$fJSM+MooZ1leh?&6yR^(0(vl*v>HdE36N-2%mPOr zPXGdCTniW(8tmR4i&j?b-Zi*qXix8s?E~Ed+ghSsv93*A+J8k{-oV&35G%aH#%1|; z!|2Apg|9Jl5w~IEQTeZeR-w^A=kd)4PWl8#^V@%Jl;8#~M=;Xq9N_l=Sg~ocoeYv& zb4SonM2*O50o}qXi*yK4Dhr~#2pYE_OY>&MB;Z0H?#o$*HF{Nc_jG4k8yot1y9av) zJK9^fXSQ!^X-GGws{(E$$g4!=Q4+0NXwKvIY+WI6!?PHo3DLE=9N;eHu(yijcJakc z%DcRYu*;R13O}B|dN)tq zPdM7AqVQfa`t}n>EF3pt17~^GDOiBNI)N_tkehR3CMqb~lP(ZzL*3ir0SVWg;DXz{ zpqk;lMv*a3(5YI&CB&03#i=60)K&yR86}E>i!F*Ua??m#wxQmwyZtUzDyz@pj!}SR z+<+>+UnG?_j+3izv{+h`mYIGs&2k?sbC7#=$_*=`A!Vi14lgAGAe*;2`h zF+E;PWGl<)T736#lRrSak8}t8WtA9LmIc}Z@tSg%jTsqLUS3>`vd4V^7Oo2hlincI z5%g9iZBGq({N8ZFZcA1+cC+64sunwaWy?+B|Fk(Zo9++S1#HQx#_sN-E`)NbnuI}5 zNWuJG$jwE-!mWb&nh5d*EL^8DNyLOA3d{iog|4QGFsoI<%qp8C#xfPCkYGWWQ3B%{ zXgWMvjWj`D$_t`8anSeavt9wc0b=OL)9@-D!9B35JFyDu8xO>o_)6PThBhbn14Osdy@vdEdE^(WbEF} zb?2u*+dSjV*g?pF{PLZ7maaYfmHeA1APc{B&YLOhVGpi@7%Y6WxIVk7YlF^D`TDQ8 zx&F&_!g)iB=97>Rzt?Fqg9L&3iXC%sQ>=4?vN<0N`xZgIOB&+aD@c z7XY+X$t8qr(f!?=D`!bBo&KB-x&`{dX<$qa5tE<^CT)>uRzb6ZG*cu=oHzs}wZIVC&0r^}3Rrt0A34jg4VVc*msBg+3AU*js@t(y-L>^tsfHD4zfwi6|4z7a z!#Ai2jK#(ObXDVEo5tJQqS1bYk4 zfK0*Mj5pJ`+fd3v&a8*8TO_mH6sCQ=9@JuI7Bl$9tSqD)-mBw$2`F&apGnFe$X`dg zEgU%i`SeJ=FV;lsA{C8)lKwz%UzM{u>|*yh(*BM6u9AV*5&tu%{0GY0dDa#5y!rMg zAMEVB)npmIx!0j}7G8Psan0SBbearZ`j5n@V20UR1rnwu*BB?b7B_^N*%B^W;ocEC z){R2MaNmZJkziSETe%DORoq4PM~hAn#mzumoC1o*Ozb$#r14S2$i7_H(ZFiDZ;zX8urk0`gc8$SEZLbsO<5;li{j0{=mb=0(C5&i^?s9zYIVj4`vQm ztyk6202Zv`nGPqs*NKk;Jh$lg@g?>O^icvn270G10mo<1N0^p`EsK=zNpz-=0 zpqQz+h6ys$SlHu^X<#mbQ9`cYa5i@LTH~$pcsz>EiiQK`)jht%b@y41VQ=BRulT&Q zCy4f!u{;X4xXt@r-M+DAJbTdQogU&zetmgM z`u`ZVdA&C7Son=iCqr~4$1@yPE(qfcy$nnH2#5{bJ@`cK$$Dy*JE;{EiE^h$P=HR& zVCeg(M$8t?JXvPf1<6K5t0YeNsfAdX#X9NcJMyDmlS=?Y0^|ajfGmb`kqIOH{khz> zmQb*=((l)G3C5v+sDEg1AlH}c>)p|wY3bS4QyUL9hng#^D{=O%&)DbXn5Ng=OHj@YNtZa|qE*&Awi5$^kw$ij5=(oB6z8x7xoaDv|MFb_^U zypH}Bv*VS{A9Yqrn$mA7+xxzx*?j2j4=0n=k|x;9Q8P7p#&&*8ylnO+M!$b=?U|Pc zcHA0iJsLF6y(e<}_P&lC?|qaWH#_L`fZ5?NxAZ&i6zN>y$XwEtkTs<)de=?PI@g0A z(K04k1`|grZ0xzeg8IuQ-0o=OrTzs+Sa*@f}n{vRVWMm>(bKo83F$N%cIP50R8Z&K|$cTG3q zJKZaGpUZat3l^%|b~`jp8M*K2BX+NDz3Y2V9aSN7uR~W)f2VM%xV{4Om-n#}WLiJ2 zuOz4>I)G4`s=T<(G(^zh5S23(EP7Q$UdD*TCS`$9MWLe@Q*;xi%1CP_7WX&kZWpev z#6Z2bQExZ(A!YE@6=cK#)JikiCK2**4HFb_pRsl0E~*5rMU{XC>bh!JLtE2V)E6F5 zEmTtu-6O+wSh2h&v`s(o)FH*JDJx$&EokbHVtHz!Z{y9riHSbu>zjC}s*cM}?*m_u zsYMyWWyX6CDw;((^wa}KI~X;qm?y4&WkuD@ta@X;cY;ptV1A5BYiAdVJboLw1=obb zU^`kw?(>QsMCgEyyHpC1ltrSb@HdZIlL%T9n)O6NCs8ccg_BI;Zie=JVn&`obk3E5c_X&r?!d88UuRx*6_l ziPmgumLr>`lDK)DhzqadD(>4|{OYh)JobUg-e@-fCn%Z9z_$L}?p_(LIg*Va?8@1J$V= z+iG`3EM*SsId4^Wdv%4oyh5{BeJUuHYF9;EFQYXcT?*FttNP>3HI5RlzsCJu(MP>A z*A}Z{qJ(pbyPO&ug1Gc`RgesW;O;rh?#N}RuRZs#S| zM!Y1DtFRa+LpE81p)SRJ#z7=tn#Ms2KFny1;W>(zr0=TUjbR)i_64u{U5QSr^4C<8 zrMOXP(bTWXn|{T>|Fgt{ZPBZ3?Z2v1R7FZ2LlHdAQ9R61Jj;PcHioeY>ANNm`+};` z4;5Q@NwOE)-0Ju3BT<+I!?^*p*kof^n24mlh?~%ag2AAGBCHrg!(EmoS(Zi#m?dL) z6otEgyM68mKaj!wzu|KAj0tz0y0Hs5dl0u??WN--^d-eI_AYMVyc_T*JtsNvgo(1C zZGU%P@T>jvgVmnI{<**ewNlVHhHxT_0+1ba4!X$u$Grv(F*|(Et%q0r$pfUGwB=g;cCc7{pklG1 zU%Jok@p)Q(x-q3n+w6w-fYV^tS*MTt5?s@hZ)+P`0D_i+XwJ|eZ--<`d;iv6+-Aoz zP}H2%w7CMGQq(_ZHYd%tYkkq_mBN+V=^qG9Ft0$@7rCy_9S&L1;Sd)|^k^i+_XL5g zoQ6i%iiTv#W$pJQ^O~m4t3cwa@>L-5uPdy_ymhX@+~em5AAz>^LtBwt&;oRTb_Lo# zlmH=+lYkxz+Zl~SjniG;qKh1Q$Q4)Dov9@KJyH3pY?rLBCN{u;o9qpC*o11EDsssKgsBHk82~nY61+KXCUq#V9 z@y165*d6k7vPF3wrv5yK8U9{+*V6-ZM3G@SK4kN-mN6BW-x-v;Aa}#u;KY8l@;YGBWHSJZ5XTid(1<~p z_&_9K|C@k8BbV@Id|c$)vii*NwZi$ zRfZ}Vh*_ut^aIVNxqvHBYQo-`Bvp5V4JR^5GmAihj8)0hFM>ua%Vv|y?=;&js#UdF z1w{cyQ^8mxlYJUxzG_c7v_=Kh;WpXLHgn8vv#OzpNf9l=f%nA{*e4rhiek38yb>fd zyJ|B_B4Acp!}$R3+RdWfku!M&%_P}PCQGHDdMN9cbcY6&X$mvhC9`6)NLH@`+W2c& z=eH1Hidbutt6kM*P(xIUYE}?pd$lOom|3<-lBxo%il&%VP+rZdP|Gw$5p4mF+v0LK zn9Nj*q{&u~CJ2fwYqHG>IuR8S5mc2Kv?WNAAc!y!lB!rOiY}morij~I4u=(*V-$}l z%1}&-Gtr|t6-73S0FK3pYX+K$3BYbEs+W(04Q*vX$PW8rh+8c6xt*TngsU>6PRcbt%7LPpeHaevQ^}7 z0!=6uSt;qfKL@>HjW|h|q{v{d&kQ5atRVCmu5;lj(nVav5RfOKS%CX{Oq6j+Lz1|v zgQvZyG~)9{b&uc6-L&EfT*HSci*_Ws#lORplt76UgHbdfGYwSqd4=-_?+<_Q)enM! zxchIZ`1gg+Z!r?-Uz+z6epdLa!q4`Y&3mXy<5b;arXBCy(b0GOL+sHxGzC{4dWi1a zY7BnM?f&(Te)QMfasB>}vX9@V7tcAdR|E^{Q6!cNBjmW0C(jb=$9M5V?&k49SzUBc^cQ3Eb|5UEmU)F5E`W;`jg^dg5&q_F6qFd;pqX@1m?Y@)Y!!D-+g(<4?r1Ob=w;c6JLGVoKZW7co<`U2Y%&YOQ?x}A>23)!K~5l_P6k9D zEm^e`hqaq|CEQ7fCy?iP(c%{{%4|DYV;XSmkyJ>g(kwzgF3-#BC14G5<6GDGO!`Hm! z)ar5UDcsz5_xdZ#nb%RSF>gHG)?3NW87E%~|1y3byXS?wcc!2E7?WwPeghk+%Lspo-FaU!@Q>dtFBJSG=z#k`Z|BJ|U zLIUgGWFq@9#?LL8h-oCZy{*+3PdVM4{LE}sy)V=nl2XnzKLVv}uH~W2m0^=8LeXK< zIHL@6qiDn=ibf2It=H*i3kT?>VT<%JsZtI23SaUDfUbfb`WyX9ux(M23DL!qS{8%$;!)TvvI*_=xSZIcdg67FM^ym!0 z9PmBQfq2#%9NLxI7*Flmm3lt4i=IjCI!zyjo(8>9e&S&R;isP{oWT;zk5|_&gP)1D z0I!oIU^I8-hN6c4C=(GF4*G2gOc5qk6Al^hvv;sDx2rd|y|b;gr7;vJ^STo5L}r_Y zc2yc(D?r2Y=-3UI7_m_6^<4zvE`b(iqwnaUVeNQ@zYlDj_ol5+n*;1NU()`xw(%hS zY|vZyU!~5UE8EL{RQ8O2e{AD?srSw4VLBg3n^n5o?RS3DYSPOc-?U60*@BNk^bZ2@ zBaz@Y1M#c)NF6D!z|Vx>H+i^U&;e2n{3b)TlO2Gao#Z!jkG4^FJGFLDhcHN(TX!=Z zPugocHJ}KqjsyszMoia)B>_^!buh4APRam;?CWz zFfGuk5G|&i*=!`Z)xSHtJ-fZD6WzO8nj7m9@nABNbfe!k%ojhHQc}nn^5A?a?YMik zP!AYbGzn9LZ>oE_{vAqZ(9b)D&JCef2~VbnJRv3GNpX+AJG!Ig7y0h`i{-IcIlH4Q z)?KhvSHn#z7Wen~;{{7Jy0%7NxO|zmZMZJ-vmmtn;@VmnOTkTflyAI;qvacWv4%C4 zLhpQdxvVl$uypsVU3_tE?Q%Cg)7{g}b^MBQ9_VAg1S$rHfRWfXM|ks=Q;ZNk#Zg zujQj!F1E2zzt?UE3jN*MChHS= zO}bEFw@9`=CO87pvm*6ue38j2J)qjaz>-ac&w|p|A*c#Hpx6W;Jq2?>38}6vDA5+$ z)esBYt%_s=m8#s+<&nK+lU485B|o%pwe@;L-DFYBPEFTbss_+WxtfC98>dct!ewJ| zt6OyzeX;QR{8hg!waDjwOZYs<<4RIX(z$J*D2X1p;Hn2@{D>HCRZkX|%!x(Z8K{az zs%itZdaX}JADcvmtN&XKolMp+nA0)P7t-A70s~C=^rf~0|YmtWj%^b>qud zPxr0~CiZf%09;Bu`fr3)_BSv$qqv6`^)Y5_vU7LZ$*b2&JwkylHJio)gg^6JR;!R?Xi za`rdZJmZOtduWxrEfm=vfxl3joAc*?5*7uWl!N}2AjfmlfeM!($(5jh;~Gqr0$>gj zP}L=_crpn;V!|lsuP{yMNfkP!$V8bmQ5j5;QHW$@+_E$htfnLysZInF9=G8Ot(izU zE!T=?5y6?*w6P21Pd$0-%tl%4EB-~)Ive&-F}{H2cR4Df^1lr{m_SI7XrrlM}X%5iQwJ_;275!7QxWL)gS}C1S}fvkRt7* zBv@VH*WC`ANhT2*QLghkDFKD9|<=V_uQko5HX}TZng7I*r2LW+-Pqr=N}9Dg}dy(a6A2%?V1}*>F{;}==XX@=@Zt92i|ky zgC9H*94s@LerJKz?GD+sDw~(Nf-bTAr-cV~eY@W2rT1n>|JobdJwZSC>Z43|$S!4K zt&5d4>RM@!=q7dr1i4PifTz4K2V=>kDz8lebF&QeJR+b+fH-9MrX+~OaJNx_t`)y? zL&-6jqSxwvh^TlN-Bx#324%=2XvK>r?4#KH`1l9{J>%vX?t?Rc!-yhVK)Pt$6 zAtqbI!k>w71(W%X^+NNT^rKatTi?9J<9X0q@)a^{1DT(F3BdU8&J73LE~gCg00|Sf zDi9aAR0v4npIZ{BBuvT_*H)oRn~SRsM`K+qTv_4J9lFz{fI^w|DUsGlD_>GX87|NS z^?=|muD!;t+Z+44gH_cTDk-MlG1(z}fHt2me1~32IUEP=O|~>Wvvo6U{a{sV@TaA+ zg)_9}eBssebTs8?fa3Oa=DOW4iR<}4EcUgXbdzDKmUnrU3pZFBSNfmAYJ@RcZ(u}WIqI;#pMv4wmwZ-xZ{S{vD{g)cbZQJ^a z$d4oZl6TOR2?o8tZ+q9arrLO*!t3T_X9BW|70E7+N)e2c+jG@`fr0VyW77%lc&(uO zv2kJpcU}Zen@W)~b^5QlgSl4fF_~U6xgbO*`U)*LV)WHWz$7RYs%EtmT4HIMiPBeN zX(_7uv*!yBpJz*{^L*qSf3)M^4xoY$mZ~Ux>2{+67)G1umMc|JNXLqG3@T8AO3yu2 zc=##Wls=!f+YdS#is#_Z^Kbk3a(eOnesS3&(wai1N^fYSoxjc^qgSpozlvx6%Ajr+ z=uv1da?ZDPJstE!F7^=fA{&WxL^7@XM0Uw;!jGkO(-e1fK~s>&hBim|y?kNV@i~1qB9v6Iz46Z}kUk z%_R+IK-|`q&>3#i^G!z2x3QuVUB#wzoAN6*pl9fp-H4!|^J87e4qDf|LOV=!0y4K&HPFGa)AL!pd zvMb$}?(OPmX{w2DcGvzZcGqpJT$DDqTcztZy05?gCFnV~^&}Jhts9?j`sFyJKPVk% zQpb%0PIx(YHMx0)hM!fd1}k|V`Sc6BdYR3R4x)I#G0V4Ik6ARP3b+Kj$Q+=U*lol< zMQm2HNdXl~wFwhM7DaiK$TA85Sp>F};U5e9Pro>xOHi_BWUzlnZhKdITWfk-OC$OO zhs(?G%)h3B7FSKHov5EhxDv(>{_@jen}>FcQ)HV5cklsbza!3W852C(!}6D16|T!= zu~=EGoPMr6RvwLxyR3zWt*&lYxqCD8n3RnlD<+e|+=_|4R&8^+Y}L{7p0e1+x4GG! zik0=0M>n=vT`nur3-uV&*RGHEU=`JPDSeabX5b}JGK9YUeKD{To2exGz%EnKLK`9` zRaQ;%q5`>0me?X5GLyMUU6jk9K1ixOi8otK>cN3{ES8DITlJ`hE1|l_#) zq!+AUTo>K^M3KAr4Kq-|&?BStrK4;sdO-277kP!<(H}ms?;~Bq=1Nd%FXKltZmOBi z?s_00`$fyVs@Zghk-L9+H)Q%G%M#e2(SLkm-$(H!Kl&Lx{>AS0VKaZ-TWP*2T1R(v zYi(8w{X#M4CgWZfizSQS{os3U6{I>>>7=xOi+3a=y31iF70mFC452aP)Qx?zYMS!E z4DLqv$R^6(+BjF$8MB(fa<@CIJ(p=4+(tXtYtfGC!o!hruiXMHlwQ6Z@2H|@0v$0@ z`gRPo?Im^S$q}|N+K*qm19cZP3()Vtnp;AZk&gf!!wn2NQtpdILe;*y^14Vk7FH!c zsPe7Fr5-%Nlj5sAVf@I#W-cCI;YZLezla|T?Ecb=-o(Y~jwnmL@rEyv@O|-*di?PO zotT&~PCH$^2!*1Z^s$7m@C{!AZhf@fALsb`7xowIeL!1*Tt&Fdp@@VPyEf>?0tcpMDxHpz1;FxO#85KmD|Q*^7y1p0U5PpuGtT zY}vcVo#B>TW58n(xGye|Q2Ua|q`=k6QGssRvj;fK_Q{=cU99%_e7eqckL%IqMbpA}t(!y2TxtH{eQ-%>+ADx0+I+2t z!xtQg!XMm+D6EDO8Wh;Q^}C#)8|6WMJBSIiqX@1Dn9-Et4u<%ZJygWOx*f%}1N_h+ z8}XIJjZcK86BO4gn1r0i1{QZrx3MOnTMRJv{g%SbBS*TI_a-;~j6SpbmILqKOWF7P zSDyOJZ!ZtB-qnxipFEwTlSg(HZb>HhuFTPAl6xQ7fAh^_Pp!b?(@*~4NAK#EcP)I< z@K5+z@m!0C1W5y0;0^WBNZ99e*sLm^)V7m>8j4@j=Xy{XMTX+VW7&zgFVn;nA7D`q zFiA1izcT5BJ3)P*BKvwM#QvI^NOsQSvf8WmFJUTA7B zycv4LcO*xB?WFWyBgoVB|N7b6>|H-0W?>z>_WD}FQ;MONb7G5dfZ!ME`Pob39sWNd zh}aCz|3hrq@?Rm0pINL)7{9W?UO{gx7^Y$j@`kX^D_4Yd2=JVTc_W_(xTmL~2?*@R zM&M=EjrYZ7{Ay&etkVeeGmv+O5qSM?mC9bZf`PaHRxy8kOI!0-VJf}HLuWC6+z7nQ zSGM$Fycj#Tq_>7rzpyW#xl(|zv9%9a4~Glieafhx!|)VX8!v3Z(*s5*l`Fx+pFg#w zj`17x&AA0{1}up4pYhQNlcVG#m%+i z_p7?!)8u)|bIF_be!;iukNZDT7BBmLd3X70`KK!U6%SSXs4`eNR{2WcscL`qEx}+g zA5udf3h#E_~s2z=pHgb@P7)tYF;kVqKo{^CVjS+JOtrtf;(D#O94CHNDGiZ zP)v)E-cwBD*BA~L(|Bz6XfdskdNN;3o59|A966MTkljvxx0t5HMcu_TBQ_cI6D%_L4=>swmBdu8tUiPd0DUu`hivaKz6^zPsi zWX+wNS_n?vxq4!07YISBBTR3(4cye`hHaNSov=|&L)*W14S-O4Z*lN>>)z#&W z=H{(!f&sQfmdV{@h0KxTvVa9xDKnBqBe{EZp7+Yi^{P{RVGS8nk9ojHf#iY?9Y zHi7_M6TtY+azk)E$;(c0NTxUYaEhFUHk15cyv%ZFS2%P*GI$-_LH^HRmVjJlpa-ka z(h2_7GU*`A@cVB4BxI8xYvjg1vv^>Hid3R9Rj5i$_+=_;p;nmrcIu!`>ca1`P!IK@ zz@cTdoL10Ee$up>25E?fX@o{;jK*n#*3ep7N9$<=ZKO@K8Fh#p=)X}L^GvaZ`77=8LgKA%yIW>3BOylX9mDRap zQws_L2(6fSj4jw^=b-*mcOC_J?_8KM9iLlmT%1`sJ|nHb?TQV{EG$h;H$pe=oVMJ# zeDy{;zB09ZLgf|QGq-Hw3B;gfdg)l>>dalMjdLeYi--*aKXb=VF0EWe7XGWNX=!=t z)ar}@#q`_?u!5zPyUhp%aDe5hl^F-7m+xFyfH&^AbLP~ld1YpKsd08`WqxK_#7KnZ zPAS+XG-u~EEiav!Sy^71JGm;ZP8~mGJG!(qzX)8*K%QE<)ut8zCO#y}sfD>|U}4J4 z-7}3#v$Mj=sZ(YMji>Io6QG!uPr<;<&j?4C?vnVRiTIX<6H$pe3?eI02hdqD$?jYh z`Dk)ND`rZ^7nY9B2+*8(=c$<$2`{JQ*@dO$<-0AjOA7#u0j;xmg9K{i$j27upp=N+ zkWaygA3I^6pSkZUj|J+~?w zEt^iaS22dMJaz2OQz#K+D0pmU z!Dd98I9Zz4mgYB+aTLLnR+p9*PH{O)uUx_ZM0DMc-}n^{T$#g=Ck??oIXE^j9t`gO z0Ia(14<;i%S^hNrggEsmmdmHn# zAs?KaZOpTV;B+wm<-K_^e&o3ts`U*V8`yvISSS*zI6D^1@7+5V%IC%_g84Q~wT+Jl zFBpZUrt>wBRlE!4Tkv@cmi+SGu^<3(b}EQV`je0o#Ah0&GMLItR!okMk5}Yr{rGq! zPxg+@jE^_wg@z#1BgUoxAgOQfSYC?s=H*B)fIpt6lZ|h_Sz}P^3daA!MZ)<>ppkP}1cH!%g zi1d!;A_dazy_q zd&e#y@}Rf9XJL4;*}6~!UMr<5jOX|Y&_3pjLr;bP{vpV{cBtNE051^YjsUj$@}&DY zN+};JcLTXV*udym-X7@<4&=>1lo~WV*&CdM=0E3fP+}v!y=Nycxa9i$N_|Bb(4<4( z-1UulPs0U@u@~@+v9IBRfU&>ff{1Zh!vzWB@`ejC#uW`06pSkyE~pq+HC!-Z9B3eU zYyE!#kZJ%V02KrQ5R5|r2*zOm1mg$*f^if8!8ithU>pZPFirp<7}o$G7}qugyEr}7 zH9)hD$zUIX(8qBObEFoDs=gs#SD&wg>Cym{Iuv{tbVsJzBFL+LVF{p@#(d-E7*KD% zp)OB7ExdD0Td{KOqvnQSD~GcM%Fuy#Ru0qWhK*uA@%|y_yZzmfwhPVF13lRW{RTj9 z3@1?SR9j;{+0f+cYRsp8Sy7;{V^BN|LqWW;U{i1iXC|O<=h?GEks+AMW5Bb4=fQMM z;pgh1{Z?QhUZ8&X<3;kOzWSN7O_5-*>nzljx%xQRWYm!tp-w0j%unKE&g~m}o&|+q z#q%sKl#ll!gHwT3MtJGSAWW^k>*vWNG8u!Dv%bmcNM7ihnuf=$Z>j>)lgMDMe`g9n z0bjhd^?H|^p%EY5@ql8T`Ub{XG0{|gjgE{uG=-^G>pUo(7v+_3`)#5nvr##yd1#gs~TqQR;sm_CFLUBB0oh%`W#tmp#Vh1knxi z(A|{Z26J)XUGfKk*HYb`PeOXAA)kh57_l}0cnuDMoGRgIX9JRBei)Lw8lEF$2PAew zf?{H%;W^54Zh{2Q*@IBVhqb*VjRn0;s}=MgT&2P1{1en8BE-YWiT;;WqKfS8 z6V1o)Cf^CEX`bqW)C{L5xY-Ujvkm#S&CeP|yL>_cN0 ugz5eZalHGYdOx9J?xAC#IzbUoj>n(3Flwp$0=@FT<;DMb0sjvh`F{Y^EQ(S9 diff --git a/kallithea/public/fontello/font/kallithea.woff b/kallithea/public/fontello/font/kallithea.woff index e21def1fbbdc223538f1ac7d1da3178d0113b14e..86486dc3d85c5bc465ab9f1902cbc9dad1c302be GIT binary patch literal 18512 zc${RHV{|4#w}s!>wr$(CZQHhOo0DYXWMbR4ZQGdm&iCE>@77v-b?v9mK2<-udUbm! zh>HV&0RM)hA^_n(SFgMO_5XiJsHh1806?1mrab?oN*F`tt)Rld{Ewyn^CJJG?k-|@ zWMXIJ_>Zjt03iGT07OkrJ?n^xyDK380EYRm2IZd!!B>BP%^fZ5{xRBrN(2C49HWyG zwJeNW{$-)N{?$PKpAaoMz#&ycNy$-g?`$bW3+Kayf#p|&&f{I{-% z=Kp00fuZ2w?Tzfr{;_{~pilq+c-@7HsnF5E#T5V${ru;b0RYfqWhvqVM`yEtS&5~8 zIq!c8KNh0t^2{|cG&MBbGiEfbGcj~_dW16Co0Os*H%T-$GztVH@-pWzQLykO1%Zr! zOwfh&xA)c2OS3j?Bl{b{p+#3Jno{ZhB|tG3x`A@C`@P#oA`?V z#l0~zGDH=MIqVggZHWsU#7cufOi%j*;ua!O77d4L!|@4*4ymqHf}_{&Xw+U1uU_B4 za|Rvonrpk(SnuHHyr8#C!EpOMwQp-`$*R$+U*7@|n)w&r*H$UC+ZFO}v;ul$bZ6nV%0E0L3QPRjB7E8tKD+`Uyds_O&4Z=z z_m%Juo$?H$yJc-W%srE}@)p8uyU1UUf4(+S1D<}GzH5G=U^sWg918J>-;0ecD*9qQ zh@u*V@lp-13h~IyLv5Hu!w7ZCtwU{iOe`l-l=EVxf=#Fp8R&U&Qxd2S3Q7IG05=P- z#7M=jY%ai6(u0>qjf)XlFVu&Z#&YAKbXcMYPL}ZFrwm!j2wsqEL`jv&{v!lcvJ5{# zU0ozpQQ}5R*{caH&Aft4n7Up zLSw02w=Lun5(h4as17!b+(L1rGK($r7{(St4u=Di&1K7L`Cb=Qz%@i3LXMmRoh@g} zo!HyTV5wi9C3wSxGsbrkT#A*0kZog2WI0ejT%a|Y9$bpggE$uOV>l-jNC)xIj0=5a z!-YGx+JNk8Y1u^@_|8x&* znEWlL$Z4sUSECtVh?Q@C}QShY4gNT-fiwT3eR&mZdc8Q>lv&P~;eHCBgaRQuf^7d|)#_Fr zi{hwwUQ)TCv}7=J)<#1^R(0a!w*7%nLJcN_db!nU1u>{R=RNmPyL$$YrW-D29RAw3 zI1HqTO{b38DMcQq)5}wvX2{yfYcQ8dsW}Y8ODp7YSG-W?;c}BozLY#ZL}taualX=kz*xeG_TX zKNzGU*_f8Os2N8H-&-n| zWy${9keV){f-6jQCHI`F1)&rul+w2|VT($WSmZPx2^A#KrU%R<}q$&4X5xpx0`oNjPS6HTkk`2pLi&PghuC~!i zA78FQuNYhM5Xn~Wsagb$cE-gR?TK~zGGJjz&qVIojaqCZq33hCmVsQv_04hP%U-P* zb_Q}X_mVHuO255i9en`#b)uEGdJZY0Q&vPPuw)fWwyMeB6YZtr3r2;Y-k*h-##UF zY)##+D%@$QYAuq7Y@eozI$IfFR-n)O5YAPHE}1cwZNM~>mLPuocLj~k0h>poul~Y; zApV8xUU?-ZOaSa>c}111+jx2~<zZ|I8Fk2z=T2flqdsWM;n+;n$ zAIy&DN|zs?oaEDVPwlc1UMIophAgB{$Y) zK%?Mr9|OG}e}R%4T~xvy$?u25{RK0!@Asn6E%Yv;jkpoJdZaA=)G0dRTMSTvU|5qF*Rqx#e$;nsNK92dtlvjVZuq*VQR;qEmaES;7uPr4>6(Wi?ymP%Yx( zMCrNv@Ct>?CfmM)0^i$Uv2wG2SeLf$#SVT!nH*#3*(eOIaB{dr@xqK%>b4C66CHEz zRxvv6=g<3^Zyt?W*t`?zuKZH#{HY=AC&F5Q#52g;tI3%&9R2KTHcGzz)4pw1O(Di* z*%=3;O?A6g2l&>UE64$nM0I@I1e|XfxRZBrJMKBrp2;@a0Z<=#;P4*Gc602B3ZUpM zmW#jdbjoPX6h4IRgmKM$2D=a51@nqIq95M{)3-m@Es!B=knrE#NG{ksMhbxE1TMG% zQ$+vjl+hiW%MFO{BrZ6U3nuB5QC;o%3gZ-={+wPxi;!9Yh>C*d*5HAnirLtAJVy9e zx6ssgKVj*2`T0xYI|>8rvqebedyJ6mm)hblqGt|$%!^xare}nIP_`Fy(hR&e);9wh zB2~|p|MWKM6=8E&u>Ie6D$vgl0Kqf2+ZW0ccht>X?U`$v&%yx2&^)l+iNNLHzz{MR zR8p8#EVxV*GKp#f6--ZEbQq~A`fN7;{5iVCWHgC{$Cy|v-ej}^b@E$yV|=8kMC~dr zS2P)g?2WzNL(U7&48g7kQzrJM`vMEG7@p?M9Yca(d3jr{R=@kTwauXl8rA21 z^JsNwdN*2kmqT&BQi6H6jqSfdH3aj>*k4uR2^{`Hi}8JE8zPF**r`tz+K|>}ZIm&*I=cgX$q9$%cB%gXW6*rHh9iJmqLaeBR zl|uz{2Y#nlmeLiquHy@3Y9OF$9GuFk!D>XUC}ObDX-FP|b6{^-ic+!c?CVV46iunn zZPu+sO{weGhs0oWi?gh(;-!*OkP?z3j23#E$Hup+6l?QDhX%eSR4y1*N2_#|=^0EZ=o&_kq?A4k zMjZVhL>%+bWmm?s?mD7eqDerP;Vg~K{^lyJZoAgja;zFt=M)nr-5i?(w-Cg413JSQ zv|b=KduP<{`*0-Q&cqL)G1~`LZV$$hhsq&|+VERI2$|&Gn+FNf5tbDfJQ8S>(S53A z66*+aXT`KJY@DOzPklyfr2qN!#sS+wbSn(wC_h6kBJJKg<~aq=rAz2vN?9vY=rpJc zW?0C3r1e%(C2D1I#TH3bF(r)1N@|FxLh47MB98nES2_~(*syzwVwr0{R=cw6LOoiH zNvjR8xR$|ml~D1F!IIoQFFuHfK5DSh(%R}ff=u}`oU-j3-_&mG>El^ zZR2bGw3O`|?V&#h?zM54=9FX59d=lzA_2k0D1VEz8O8}EK%*dK#&%*GIZAAS%B2yA z{Z6r@%98c&-FXVBNXLSsO`qrUSGP>Ls9>wa3cYrsyH*tghHNYc3n*~Pz$R@hS~smN zIQyW(&9LHjwTLuYoAYH?Mm=@JEdL0L5i==icXZT`(~Cc}*L<7)9E1P4E$COK7OV!P zTe7rD?2((ymy4rFIb=B;Us}^?{n=kyo6?MSs3W-iv`HexB7J@@1+Z>NU^QW;rU-(8 zUy*`{j59*di6tRtCM6G96uTx$7P30S zk<2cxvOY_xEiR$SjhAl>^AUV+Nw_zLA^7cwd<1xb{4_3A7T#lH6g+sm`g;al``@+V zhh`J(_zdeFaYy8tG6Zg=%crL{ylD6iPpMJMKq&qq0KOUm_{mvgk&cP{DG-QU|bp_H1#=DcC2XfLoFHJ=+_i zrFsa;K!4T)Cct;4)_KWlP~fSUnaYWXT#A8X6TS#HAzjWgURol_ZoCuqTayeCZr;X< z2-XKV;!bM`k*pysN5%R9QB2|!&%!|2+wjg9;5eoX`_N)-YQX5^2f$aN&WNCmk|&)$ zJa(JuO6;lNVS#~+U@wKnzfWqkp;wO;K~41ONHcX%bQS3=irS@(8u+uItf=Vb__$fL zsh+g2IDh?S8MU}|;0>?*o-bI*u?}z~W7EK4t^R&*d7223#m+sC!!~wpqd9nmaOs93 zr(ouJkH>Z3m61pwcsu^UF#uYt=P6gC?riM+G{U}?TURgb{N-Of4pZ$i!*IJgD|hOzKn zs1WA;GvIrlW%q61^yfMv!-32Da9^ZE*r3)*D;*2!!Dza~bdpN7Seaf>j~BTPGPAa@ zuL?Z2fRla>EYlG(ejkIvn=5~kgyCqSgnH_B3lXoF^9@K})#VKr9UVwUwel{e0bm%W z1J-uBh8|!{0cPGp=b0O_$;!`@hM+j?L&^)B2hK4F#oGWmP<$~k_y$tPw;%U<^6FYL)t@m6$#^0-z(oD6t zK|xu~s<+VRnN_PMM@b8*jyNnkhpgAN8WZl1zgIr(qKS_g-H5qh_K=&1#yc1{$q<{_ zt-e?cObH^I&$1)uNwh6Y%v(X5R;R{s^KfgmECxj#0gOQGYvav~rvn2IXin75&TTiu z1~TJze3fnFzEyp}WD1@?8n!8_sFQ_a@{&IZ^qsES4o&rHs<5Jp3dN?EoFAx7wDZ7= zM<%!mPC&?X5D6qSJx53nM_El#w)eCMszITBOkivGw=S@R2%AP*}`s_cr$LUJ`y zjBXGGA~)g>)P`CGusHY_?Ws-}Nt$^(kMnW~^n+Wlci4b#Nht@k~HIz3jJ$nFipk1|-@oZ!Re}G|5EP#iVHdw$AkrxG&-^MJmS>F9 zElF8_`s3%~=jZa#`ubvDX720zQj>M#@oL9+kzYL`59&|lt_IW%>h=cb;wO;P?xMr? zEz^riL%Dggk&T}4qNkLYytBPDUHc;&>4;NQmPcYp;q-Xz&PWTm4^&41tyuU22aMnXl#K+s#u;o8B=*LWm%zhiG5!4_-`4R? z)n|*wXKyrl1~<+ryG~sXvmQBljTa;CfX|jGsgkhYK4&PdwjnN23Jir_cT5$JNb2N& z19gyI%4FwDfu=S@GlOpg3qy!5;Cl*e)&^D&ySpw?ba$RV^q#zkJiAuKC5_ihdzpIH z)$-&^wWJx7LCBKpsfZ#Q1_AQ@&z0d@421)?^HLV%;+v;cvk&idvo|ru9UE~qxmOp1 zPg)r3+A=*fw(Q@vd+rlxN|jiumKpq&S|8>|8Wp+IJv6p&T;9a%@2jk;u*vmA8w>BR ztXVZKS!EXs?9z9@Uh+EK!}Er|q*+&^O2OADdnLv=*M(2UE8f52M2~De0f8=%8Le?hTHKkPVEzZsyK~ zngymGTT`DaZ|_S(>Em>S38OKGUw+%|p0Jp5ge0z{LsH~4?X1$*zHpFCV`Q0!;j71( zvLbyD!@_QQfn|mb07}sM9bQcaBagt;wC9b|`@x!P?-e!P8!gR>wWXWx4>zu>bzK_) zt69^Sbz2`Fa+L}5a|5rkCzf+gxuJM@adBg+s#Z7FElzao94v*B5sMMwfL5|qxf})C ztFiPubN7f=huoJJ!Ar&&r2UjJ5l~whV`Pj(3hf221&EDC$x2h;5ySK=(%q{37^M{< zFai|x&5GK%$_@p+Smo^!?B!-L2th2cFiG^rr3pnA;-kYkKNdOmaE)3G3zGpa{Jj~s8d?V*fBw+;)c$RMn%GeXt9+eH;j=;E z3v9SKd(%bW^P!^F?Q#{)?0K3F%ZuyfP_ad~KWiXy$M*YK5K1GjQzy5ZrLuR_zy4SY4j&Dg@mx(0#r$Xk)Sa2-RVe?f-oPLLld!L4m&2 zF2;SkzIg!#_eTojs1spZM&Ns=-3Mj9Qy}2*=4n9GfZF#J=L0;mFa!Av=V?TND?E{m zcpTIXMW_|nz1FHKlK3^j@D4${gVy zDbe7cLK0DK(eth@2>3K+W$`)Nze89%!{jXhW0@Z!%uqaW~im8%iqs%oI= zIMlE~qM|`-i`&WJbUgqm$h|FuX+^hb3hF}OMHofzHjxG);^J%TM+2adF>)nB@I{Ctd_aHCm$k2T?JDo5mb}UpbF{Ovi8aoAVuwQu8i(KO@PgATqe%yNnK1i=hqPlM z^Efa<&|C$yF?a&EO}12O+LnEr&kkm6-HFZ@S|SMYv~{cK=;ir7?~EI(pZ=VlPa+7w zhB+SZN1SW^@j6wU=-c8OVlqi}O;KW&*wHfp?xK`U7`&o=8b~bJ$RdrNBSt8*CM*Kf z0#QFAY2E*pk`j&5Nd*STN(nRI6(jfS!N zG*A?50KUvu?XovGql9DfMy_)R z8o9u#yxV?uYx#y9P;bKY4!tPmIkWqv+uoMKi%JvFLW3k)Q3N?s!RWo`#+<)SOe4T1 zqGmek*2N_Q!Mg-Q20+cYB;f>S#0{N93V;TM{Bu$H^E>j(spn>IS6@-|UM~UQih~j+ z^O`<578mK>2u?;GT|t3 z=di_^kbk>T6(FOl>&53P9E<8 zKk|nr2?a``Bs-uJ5!A9^x%H;cpt>s8W?e_FyK-Rb3SipN$d56fNr_5{!c#s3;GpcY zg4P5h4&s_nj8G0MA{OF1yGJ3yL=km_ik@?2F=svk`A$kUvhOYXgNe0;=*$x1Rl!Cx zd8yL4N7-^3@rmpQC-)bFU@3J(3V*M-4DEXAFkuli^RRXg_PxgNHE*gbs%idyxv-NlUZ}2(8yS zsMQGiJl=2QXeMs4#8k4lLb6T(4^T---wDU637(F{g-gyU`DjGMLsrd9yelova`sbGfx!fK%T^{!)yFHAa1;D=T$sRZqgC;t27aPnkh-+%=!uDhYB?Qo| z!sh!Ud?66r#x$q1^C>%S2jenJUif$v)c3w!a{?2FnNA|0BGtw2BSb{bqiHal-t!-z1`|n&G~dr%SuZ;tOa>v z%4HL5kBD|p)W83Kbb->i`NuXsZauvz4iuH7P4CbufNBMP_EeJ*yeDB-* z?{gm!6P+9j1h((}q2orBC0|O`7Z|Lz+Qjy!#8!-*!)v~5zJ790kRuz+zs?x#HU4uF zU}h>rz}9vx?8!2cXCA?D;a))5`(5H`PQaYngvcF;4q;UCXjr8!#E=ufN~o?almnk^ zk44Mh{EN&*NNU!Xe~gDH`>Dwjqeo+k)%VJ+?*)^P3!D;bqtObuTphz9ta?;I1Yt7< z)2!u$HDDKRZ8ZWgV&FzKT@-c~dCNyO&ZO;6w+vZ@Y$9x;EOlUC>sy8_iC4Grp%`lk zZ|*LP!@sg~3@dhOYJwNRX3v}t!um)W-It_}LxO~D3r0#m4hDtZx586K0^mZM1JUH3 z$$`WE3RbTS373~~OF=sdBb~g`Js(=tIUX_^JnC%)h51wGi~5!q_Tefjo?BN!Hfoc} zYOEvQZ>a)^`h(|`K#CBWR11q)wX$_uY+yJ|Vr{pee5CRn(VS z#(DFfOEXEvs8V%6{+)M=qwj-;D{E)rq2(QSn>8Cg4i$vrI;)u>vmglQy2nWn==mIq zfqF&DcGSEfQ#8HWaqE2~31nB`P9vn`nlrc=A3dKq4EP+PDJR6~bsDK)b+1>!5Q1ap z-+r2{F|q6WO#KKLcKcx%4W-~kou(inQlh|}6AJ0`9gYw8vQ%t9u^p)WMhv{t zDB!|zVx%GJ`ARxS5DZ}t))gKDzjAP{&?Q@ZI@6%*L(haL3u5Au@eL;b+hkVw1~!eb zA)7?{Mt%nMK9n9Q0Q$b|(1!@_R)?YrR>hZ;kjsPtFcOCExA`>XSu5q{wSRm+tnrP{ zxBg3bjmJm%5YVXi+|J>Jj2Sceb0C2SyvfSJo;~jBDjT05pCD&ZiRHS9_TJW6L$aO3 z?xNm~EFRz!yrBV0P)C)S(@vDl!l#%Ht6_K3O8M_qRq9uRVCd8q4aUnz12dfH;+1Ov z0>5={k^Erx#xvF$*KN_Oo_*`m7}CVC&2&c~Ly)tBjNnm9eAS~!)#1Kt#_lNGE&wxW zpickqN$X?zw2cc1$Era%f_y(P zN6Oj`x2K84Gcw)=zQP=_!_2z1zQnRiFw`BkjTYFD4YmXandbt-jSE|I(x%!kY0~K0 z;Mtk&u;FT%weGr*)r{l05_R}Y`!q27_+pJ_)1MU!a;M#QMi0hocz(~9NxFz1TvtO(Q@*0GE%XvkttA~QX7n_d|| zEf{ZjNJ!e9(s?N=^e8nMR?2dTe6T4c8*}&QArj)k2__lmI>fqUOukyLAZkDXZIF@f zLbORR;#uLxwD}`0@=z33;A3S&9vkbONGD|}w3*%5oyz#AOn{B7WYRPM+9DZa^7!dRk>D`TMdP5V zdI!+GxCmfM^~orB<_Xt_mkDl4j8S@Q8OVa6Lt`e*rCk?11+5!&YLcnvQ|(l3v$6GV z%TC{670#19Z*DFf&OdSIeDIkO%cluUk--#Bbr~QlF%$g#^!L zuMGwKOBlhKm|exEdr7gw%d8}+e0FAr&7uDQ!@|PK*xvqn;EI-Kx#L>MQ}pmw=hX=R zqDo_WQD+yKzM-}cvMB{SiwI&Y=v}x1q-v;}c`T1l2h*&x%;&){ZG0>unQ}XvR*F#} z0a!mpXb$EsV&X-8;IR#|)QQMtcJ`JPVv|{27pOk18h*jLf|>@N1HlwW#XoTwv1OeZ zrf};Zi*xDcS^hTo%^rx;?s9Zuh_y~)Y!g`D=&Y)6NqrCJ-b zeA~6ye4uZc5e^5%O{p?j#JL zq5*<(DVi=8L#4y>4-lk53{?29mENo}E$aw(5CKXFfe#H22wEP=fHdpf-qSO{j!GxX znKu9ZRv*#HU{ZK0J5&PaXlUa}jh{r%1Z@>nlzz+ZPREfER&D!J_$GZ*o~O zCa^eGEDxr6Hd&@)ep?C z5lVvipJ>sv4iwxjTTyZd!w85VT56y_8V9Hza6r0X6W0o zuQw{JBI`e6ARO^5m47tJcb-Q*Dzj&}SLx*$7D}dRqdU`YuW0131cYlO@*SaVB}9(6 zYBPmGq0TT%lp~92QN+S}Q6jTN1?4PPP@qx_)wE8cmd=8ekKYs{6Te_qr&eu-g)K>0 z7kmCo8 z4+DeOK634gJss$0A8jV~9;Oh)$XQs=aSBxoA(OB?|KgE98A(~G_@V9ihW}I6YhhT* zU-w5QjS>&$!*m`y>wM;l20qhONku1qFLqs>Zp&3%gVx88yaX((skO1qtJp$f!xH9g zmh*l?(;{Mh=QozW2AE-my!%lV`-Yv4vW5pMe+te8e6!`3UEXUn*9FS+ylrk2@(fj; z^92~_{Ii=@5;FdyXcSoiFkJ=<7{k9K$Bg|Kp5>!)pT;kRZd=RlLfRc9qlNZD!m1N1 z_3#g6N|K_-xZA>v-R4u~(#SF$EDtxue;P!X*rZrOs&CJNEo>(DE;eJC!03^-M++C`fRC);*u=%)g+O3iDq zD+5qjMFFrOrWh10)WGWkmpQQ=fjqXeiuqxV^L(2VS%-cpn`&7Ux;tEtsbAiI;2+}s za(p6sr&lL%|2g`~X@9CqKDFJ-h>XW^l;VWgmC1QRObmX486%5p9V(k%nsb_L zZ(%TWjWh?Km;ebQmG_Z$aF>L=_kM_dJ)b?jbMFiw-#~Y;4gORBNuo{=FZgDjlttIF zo;-^fJj+q`&a-2^V1R~d4;e(sZJ@bT586x5WC|Pw0g*$l!Q=Dw4v!IS`Iu)RK7EOx zMNZ@lyI9E%ZfErCMxjUu-}bL4OK?LR)|rUnI(m+p^Y;W5Sq0z665uQNH>q{Syx@v} z;8v_}`mW;(Anw{RM!ftduIV92?r-!-DAJx01eX(k=toN7MOPG9Yv|{+WAAenU0_w3 z@{O)t>xx(s4e=ktXb|!&n-=G&TT=;f5P17O*L!8KJmA$m(y}ojU*y@tkq8ZEGzB+x zT(FygjE6;Qu=C)4+_oL4a2yBeL}J4rl~r(i(C4gykv%z23A9RT!`Zt?VIV|$bXGUo zn>2umw!JLai3eCS{n<7u2WP#3**9z^>oRnc*x2s~ctj>j6bx15mjFaiR%xg*Y7VQU z0r>}hQbGNWHvE&dAipr<`nub``kT~BNFt?X;AqP6O7JV<4PY=8U8@vOsb?t`BQ0p^ zv$p4$2Fm(Gc=I%B8Q4Tz&54HH)76UK8|r4Z*aXu8^L?a1gr-1rpbEhX z1fSCs)k#nsdDG<5n7*LcVKZzrAf(BLn;6kS?>WUU>plibXvl2%5%A0_>(usN?mS&_ z(AHy5V9$YhY#{z@Sua$DL|0#i>BDemsgrLS%g4PO1qJi ziT(qwq6~~k<8C$=SoNeb?-ttlaiie(`IZn8)b=Q#bbpIuuxUuT(7WWp_T7H35f`vi za@kof?V`F}vUrbRi@*Djr%;!GFQIZbgWwlwziSEWzseeLyqN!u#$vJkWA(EBQFX#i z@sevu7*D+J4XqPj!<)1-((UcL%~o^EyzRJl{FixCG_@o*M1VgW&H0M2kE=FDF-5T|h(5%=ED}%*QzaUe|38#f`-) zGI8(s`z1$=NP)*dpfGtK{HB6EVe7Jkmj*x*{zCAzf?rP$UTF%$gd(_4vyYAf^`Zno zkArQ4^-TQv3sMolgjt{kt&&Na`FMrV%7D-1Yxy&fx6R{Wo4?J>r-nmd(^%bNy&)S; zoT;!+)||ok+^JnYaK~zwIEwvetS5 zgOG5GTfSIreCx`bfwoq`r-MD8wXMo3tY_#nmet?By}98nY;DcDiUvK`e9MZlm3wmZ z_Vv0**WCZhBmyGTmYr*n&iI$!)+p{u@ZZ4u_;g=ya!WivV`X^d!!eQ4pyRfdkp)ROq7Rs*B0ZGr>d+B^b4o&zp zRF66P&MEn%R0SseJ(=P}2Lpmi4R4MpQZ`i14z^h)jvNX3E~~MkUAJWK(wdAx4omT@ zBoo^{d(Sy(U~Px(yI)yM4+-=v<>78-;}ahJD#?XX*` z;Myi%%}3s*6ad?YFts-^#X-JldPK zoV@TncP^}+10%Rig@8sUWScrldlDXAFY*^bpFvWDqV^*Gocp^XSy4pJ%vLf+F->JZ zPE*3!9m0{RF;~CEAxke$!YoS{VlNg0togYbY9nhfLfXv%`@W$u@<|O3q|{DON?O6) zIg!~7r_f%7s$Xu>-xANDo&9v61j{S(^9*iWaRRn(-?E$bFDWgfg+2{77CPMo)YJ1Q zQOPw6zsy-bDg5)7@!wGn&-US-EKPfI$MEDmzNCmfvharouknm(%No`4{nqE z>@d7WcJZ2JKfLhu1XlB=TN-&b8k)oB*P$qeZRxqurrBa;&CSC2yE~*MR*6sFv=O=8 z{mn|^(DsY@20?BsWIs0SeFvavjNSRSw$NobVmFp1-dt#C{;+vBu&W(n{#X#I_(OQ! zX+OXm!8a)Ox}yd%MhZY#hQpKw;h+V^pY0(E%H<0t(JNaakz?GIKY$yIR=48vbauE4W5 zQG=+0SW;@KkEx&CKEb{dG<3+s#TO8PwJ;K;CgNjMbiY8zs-Nq#0l?F*Y#uW!}aWMcbY-+fJV+WaE(gV`lw zs&LvA%bhq6uJPd^Z<2w>pQYILC&v3P6_Z|C)+#e!;dg9vqf84T($7c$=|VW1CvU}( zj7Xz$?}~F~itsi*q}k#_z9{@ZqiIZ|3dmFRL{M#leN=ir_#~*>+2eA^>6>iht(FYTq#G%J_DDv^V_G1kyf1~&t5IBm%^82 zAqlahGc17f-S7aK)ddHroZe|~ob)piswmLFD0@yv?JSiT#cW){j8P2TkfLZWz2vP% zUYhxQ##dv9y<69ET4KYhb451>as;(`+qgOQt!S89f{xJ8w@J3~GE2?_`0IECM1>}E zudA7)KceXV*2#`bGMJXW5~+&rHYdu16~A0gPN=$?nILK;ex#9&yCs-Qe)y{6#@8(SppXN?X8#`d+e5f=}@o(aC~I9adYd$2|aMwM--Mr40ks^~#*BG1? zIGFRPiPFZJ^MX2ha|R8}%YL6K(dYoV%4%|x<(=%gfg^JLiNX%amL2pm@BUq1&>Gj! zYsdL@DmI<-GQT}Q(#404MH+EIG*xyzBhkk=&;r%SlRtLNA4%Ye6h87A2!S{}i zk%0HEP0NQECpoQ4l@3s>|BfmHojxdh=Y23os|NwVY#!S%|H7ya9WK09@~(24!1o|8 zIDh4ac_IoJ1-bRU9ToWAsj;);-*wm>@b(}N(dON&lhhEk{V5xvn%ppz<9yn=7}(`p z{}uCeI2(|vMZ{G|TO-@h0wiNI99d&j8$#SFi8Gdpuwq1;h3Wweota}7_!t?81$0oA zk&{e;JZM=2(6jMB4Nvx%L~T@m?Te3wV6=0ykl=eA$v$e~Q0G-mKuo@h?)Y7xAjWG% zRq(iFjsJHSoG@LP6P8BRitKj56^qZ{joRb$OKM-$DSpRL()jQL)3Q`V_`ulYZ=qwH z+tC5i*$0&jRUWnc4D&i7P5}7;y6g!LJ$tzR@BH{p3H|n+76q-&Vt)z-ln#ok}>c3?!XOB}a!N+P*+3%smD4(#9c8#RVUzU>XV8imP*UpIRQKLcXnf7$uw_o%~$y?{Z0ka;_s zFkT(>c(z~WYrEl4oZqdFJX)L!Gc6%3hm=gH%`-$DeiE>KaEn`;##6g>>gPZj%_T&V z;RCJ3PF{5LRu~1#lZ)w&DD)~iqrg&>LeW<^0v{zg1SXkpnM9qZA?G-di$1en(mdg9 z?S22zS0z~Yj2X)y`ONiUOoIaVGoLISPwLOpEgWRx+I$PVZjfu4B%%yP&OMI8FwY7jbf>bnHhQcp&uE^Fq zk2#ZWNhXp%n_e7?U7cr_%RgyPlXpyl@ji0mmlFiTzvC@>n8V?N5NHG&S&FM7_B+*% z-y{cELGe6G0=tahcSuQNiJ_xGd2c)XH|dLyJXx@U-Zo@d}*fULtP);n(@&8B>=nvs_qpZz{y9pjy`wy;l8vy~ixBwn=6P*}S zn01+(s@-t9o7q4iB?7ZbhgaN1*CY=?^DVXCe@)HC75qR~ALzl#pDwM+bzLbCl}O$ZvM;$zW+&B98Rxt zeEDK85VWMTR77-v$+vO2ygB;8!5REnfl_~HK7vuW%`^`pB#%4*9;HU;?Ae^lq%MGQ z&k6%%f`X9#g(2Nr^@A3qWFw?S)B8%}>xQI96Ht7P@~!HK*o(5w;*ihH^FE zDBEbT**!G(VA^C~&eOuVmmu~xXM1;4Flh7cg&~-a%30y4r~%PRCTh&w>?MP7KR`?~ z#kgWdqifPSP%&GkV4zW)FpZ)+BxcFVS(599y%SPCCgWYVRCd_Ro;0Uf*Il2mJcDY! z0w8QtJ740Mfk9LmKE>1o6pq>Y55f{+nwvKDxT?~bfTR9+Cy`uDeV+Zc3Gj24PXH>{ z8%{9QUG!_}I1K8-MT2f;RrprakcE#5JHDq*)Thf9Lz0}oQ#GRBxofMT6Z)!4LwvY+6 zrHfOGf^LH`#3mD;OLF~>jl}_qRxfqaqcHkU*9P&TN|(r`x$E>*)D&!WF|BL{Ka8bG)jKBodU3dAIkj zUbFEE8o`sQb_I+VL%{D8_GRzH4)~9lJzmN)34$;)&<-MVglpTwZ}q;o%RQ#u=pCAB#P1x@ zn*g!Sb8-gTfJHfPVVX1UtLNbKKt6=MA48GPR{^j)Yh8!s;6a+%pY0LKo{ZWD%nvu? z!&Qb5{hkRl0@-HW7?QZs^%deuj2;Yp7`Bc;(YSopb1{cwP?LBNj9?+e>s_a+_-N3aP9Wpg|$DUkL|pE z??-l1_SZ9aKJvxix_uj)zU#A3JbZVZE*;*{xV})>edlrdSYh{rd#=0g;3Id!<+~sL z{ZHRhlXu+mIWIrqpPTDiY|=&g(E{)9%cN6oI27=!xKcYvwsuo8)5Jk-6a|Wd%d+!1 zw=&2S7pN#Fn520AuSzLz=BW!1*`1=Wk9K#btH>k+}Au#-?iHf7A}Rr@LsNN;BvHt_8W6GESc${NkWME(b;w3s;ug3G+d}ZKfegPC=xK^t! z3Zwu3_@BvQz#I(ZaxgG~L;+br3E$N%pv1`I$E6p#i0 zmMjK)c${sJyA{JQ2t{R+1vE(p@FdKjDoqB+BpSfAhwvn7qS`JT!bhA?q__u!_&k7? z5+Ggk&X#?*P}pCHpfUWf6pJhTo}MWQ^V`szX7#r_$NI?4#F*8QdB^8gv?{8yFji8|oY&99SI69-to> zA6y_HAh00_A(SFYBP1h&BiJNPB$g!TB`_tbCN3tVCz>b7C?F_yDJm)MDugP+D;z6k zE6gkeELJS2EeQYs009610A>L`01*HH0000208Rj20CNBU0MH9?00000c${^S%}xR_ z6opR(H9+D*6W85nBqjrlF)=QT2~l@0SirhK=LgD^bczWp-@F1+Gzl2wW#W2i`{uqreB$$AO!;#5`~dCwSuy zqTXOO!+T(XV{sCA4@crGaEq>bq6I*y~jEyFCF;~XqKGSNT)0I(fm+xSxU76cL_M+}i zd(wq=%IoQ-L-~@%-X}6~b|D|b-g4>eOiz52dB42vbiVgQ9~Mij;gBOm1`mk~s%?H_ zbkV~NY0L`A%57DS0t$wT!ip=hYNlj<&yg@IsA^Uia)b%vf>b(K4b#~;2W?`1PLqcWi$ zRk!1*-lD_zpL2czP$GvJc${rhX_wqI5S-evJ?G9Qfp9}0+yryqcSs0F0tq)ETpFqE z(Hq%PBzb2izaB~6+2sR%&+g;3x=YpN!QP;Mri1@~D(qp13^@vnFvbK^%rM737C68e zoW(iZhx>6J58y#Ogop769>rsL98cf^p2SnQh^O%kp2c%`9xvcUyo5`586{r9t9T8s z;|;utx9~RJ!Mk`5@8bh}h>!3wKEbE>443gauHY)Zz%_h{ukba#!FAlgxA+b>aSPw$ z2mFYi@H2kFulNnO@jLF|5B!P0@HhSe!x9_tMQ!DG0FSVg|)R|-_imE;{ z5qi@mFXLKJ=Ct)=I^rwV)-*S&b7kK}>^HJKjiy3YRmp@PF;A|gMjwW%6f`;*Nh0S; z^Yy;BGPF}v#<7c&DB+r&gq=ApjHu@QsFE7vx3d*7>w7;>{)p?kWXg{P^K8i+Wpzkr z5ptfO9$0en9+ih=z2r=dBET?Zl5Cu?sATBxx@ExIDVo&MmkrsPavMUsh&4(xQHE=D zV&0k4Ag?Vmt8r>@Pnt<`B7<|GdFkoMm$E&~A{#wFvTn6KC97pkpvN%hsYfBCCGNG| z&LRq~8^bJ}iN5KS3McM%Cv7&4x&K&Ou>~5 zRav}7;ljrG>R?UVm5%)P-G?F0lJMfEKO2NH3~UseKs{d-A;qOy^k#R>jD++>KXLY- z!NWlBc(>NEx6G|LYbVTFy$L_WCMdCKsP*TLZP=ybopVyRMJVK?7QH#)M6aiMeL}`E z!pyza$_)np0%)3TmjD0&c${PK-obDpC}JZcV_)P3#+@7t91O_?8yQ%gHZd?VXn`1; zxtJI^AS^xxFpJG;7t;ZtG$)YF?zD@+0m5cxaM`HB*bx}9!J#8!BXf$&Ml}#`7e@mF nBa1^va!3S7NhA<#=3!#w(b~cIzjXsk??xsD7XS=)BlG|OSHKla diff --git a/kallithea/public/fontello/font/kallithea.woff2 b/kallithea/public/fontello/font/kallithea.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..694212c59a1a67ba4f7bb60047358137247b6bb8 GIT binary patch literal 15424 zc$@)1Jio(tPew8T0RR9106ahd4*&oF0D15L06XOX0RR9100000000000000000000 z0000SR0dW6k1hxx36^jX2nvC;6oHsR0X7081A`a~fldGfAO(e42ZC z?|oENO(TQ_27R^kJtldq9n)+t$uOriKZ$)D+DT5igNQH)If#9<))qX`JPl^|k}$FT z{}bI~Z{8?LJVa_C57x|djMfU!^CKf50C?d4UcH(AHIx&O9FIoiVHS;P!2r$C)+^Rh zPXX7kH3mqxDt#j9loUvUBov`1lRyF(2$PUdY6=F3pa?{<5RpWV4Albb0b*GVWyQW? zMJx-!j-6F3Z58W!;_r*Qi(7&v6qJXzkB320q$|_^03rhksQrF>PvxT;qKHrTND741 z8Gdx@ix{VcI}mSO`&yl1c;qCtS=W-(jVvgddYNvumc2X z`4f>}y=;Mm+(VG()S3MBm;AYyBc$TxjN)3)P~UYLk7P@Yb`S)1*aY$+l>bxI{lfph zW-b*ao;eP-m z|Nj6fkd&iOx&d?{C^;tJ3NlSCM=4cyS}O$ULXgTupqL{2YH3^P%aUQsc*A(p*!H7J zPi61{Xmf;ButK>dWt2V(*){Q6D(AzP>+fOXx@ljFJT)amL_o#Sy7k9ChFi56(W_7q zslnaizuy)RPoxzj^nVLmu?AP_bO2ba2L(K3Pf8w`SzgfyKSgQ9 z`t-Ee&jZd4C=l6KUnHaHWx6BXDZFdn{UzrOYQs%_DSs|5>(bW4)_^bt#L19;bmWf7aZcqvwad&aBbklE%DoLX`j*gnp=4Ml9iX; z3hr=wT;kadpX4x*;f{(KNGNmA_d1dlPyUAn@_#fk@PZ}= zOK4`Wh870bXl3vWZ4ADmouN587+Ro{u^PG<>!O>nK6(g*UIL?!up%MsNC^ir!ik)4 zp`Y+!fCyla2x5o`VVDSGgot32pfN_oF-{~fL8LHAq%lR*F-%>lUZx`4k_F~8O5$piL4uM^WBkVyOoA4K~kG{z- z$N~D1GjK@hA~0|SS_%e^LC=CY0lfg`6!apPGtir0&Oz_u1zn(D65|q-3dR*E4UB70 zcQ9^1J;1mHrGs$?8U)5YXe*cp(C@%Jf^Gow1bQCKGw1~{FQAvfyn^9Fhc%sc2~ zFdv}r!F+=LADA!DPhh@5{{r&^`Y)JYP$yo{KlFEy`49RM7wXSf+Si72Is5wGB=16y z7qApZN&0XO)7%H*^=ss%3)1_1pmr%D-u%tNXHc_iJC$?58sKc$0ReOHAP^}JJQ&&& z|IT9B*X}W$akM*H`xc$Ks$CVcE73txCEC$&d!JMa=*=FF?aL`9%CiJzA@DDj0gmUN z2;Ec684_U=UBov*vp=WwQ-LBS17_oXN*)EI!UyHeo=|cn;uZ)CraKcXJrv9)yY`CL zK}@M;w1GU!XctY6HAuCxeq)sK(3|A88uLoktfgp)!^nEPB~^oDt=sY_fttMzaJOJp za#t*v06H{CeE=I+;>n|i3@p-f_uQnGw848h9Zu#U*_j5NdM+G=`>vz6phd?kIt7hT z7{FnkHEJKMdO>tj0{o6-+;?GMc)lL$)(opZF8Z<>4@sN^{$`E10|wNX_fS{Q`bBh= zxpd!oj3~HQ@Od-zm;fpz418Y}?(!BAZHk-cjO%*L5SH#Rbxuj6^L<9gtaewJESSfF z4;!&qJ4`n*c6R8o;=^kEu%4q;ZWXZiwxNKT+l)@SF{}cUNPt5;lqTd_6CRt|kY0(U z<4nv$+qbArmYkId$4bRR#gpO>IJE*#Y{wJEDE%~^-m6mpO*VuC!w#i5OrHUEOch{Z zBQmj|5w!&>1C>D;RwrwlX<5NzXos>f3hsN=jpT8lfW7B&q96)fJO*xF0X#efyu1?l zcop#TY7pQxAjoS6Lzv=(4kNfQ7vds_;3yDq3<#J80*(U#CxC#HK)@*=;4~1j8E9@Q zfvhdFR%%c`9k|Sp`mjl`G-IF|dNE3CnVa-dsOpTulr^+%9cZ)WtqhL9{rCJj}kJ;S2_Q$=6HHw#Op9xy%UQ|80c;C|i;DYim;$c?`d;9G( zCe5{K%9@9gs+V~|SrABz-6MH(vKo)%cJ{XFCfV$H3c-YiYH7h6Y2%FX6dBF}#YNl& zGw&G+HhYJ3VN=Bl z8vr-T%K7VPdW__0wLhv{f-=K8Huuug&ePFYU`NNGn$SSePIn>WWoJ6E7;DX$t1{sg zksaag*1}Vh-d$IvUK(@K%7X&!TjJ?zkFj4!e%&3ldEtJ{_h70W_CVvcsJT>^oF4W( z{k)f1nPMO~Hvg)Jpb-^XMxYsOt!Sh`OUEEPfnrTAJY;f(9g9ZRhNd~y_Ohy5H`6bg zfroMUn3zmFWIDQ}XmfVnIQmczxMUw;J0je6o*QsBm)j6&F2^g*BQw$A6uet5)Krp3 zU^&Hp0pz$qHP)p*^(~N{;2N1~jav)kMPjT!7Bwy&EaUwSU}wio@CZy&l)+OF0jBo{ z*u^v85t-#9kU1cbd2pNj0s>hC0$BnASq8VwuON_BAdod6kaci-{00Kq1OnLt0@(() z#qS`HT_BJ>Agtc+)9PY!kkIHwfkUoOkERkN+yETM+k)f-BIs#^K+k}l!1=-sxp)>q zFFgc$1q5)tuuE>9MbKLhf!+aOqx=4mcF=oQR3-G#bm+s%;cJQMrx+mkZKr@9xBY{$7?C_x>;93lcn!x?Ozx*p+biJc$`Y8mQ00V)h6lQEPyZfaF! zqDT^u)MpgQQ-v4)rj_b(JXmphOxtb0@*pOYeMipLX3aW|XwT+sd)6w1jvnLCs`By4 zjd|IEha^shrh-XzG=4!FZ(^1W#{K)=5TJW2?1uzfBHYtPmAR>9_Z=OKO2e|I9+B~( zcBHMLeXTsD`EzgAU8qq-X2EgR#so>5?Nd)Dq- zKb`GbQS^UTg>~0746bb?+H%$G1XG)tJdBCGLeArAz`<-Ad%cqPq_(X!2gA5Dy6F8YR z4i#2oMW%`$NUlcT1oexNk#>I@vkpko#jW>Y*4{EZS!4AV+}^)PA6z%Qg{@1pRk83} zS+nzpts@tlOUKyJi>raSh*}66M>(`QH&_@3K9JL+$j~N(+rxP~w>tNexSd~Z9|jKO zOj>w$E3&Y6_T=%?=l3UEp7VMa!{djw6Wm}K3wc#k@2%fans@YQ2sNUPywII!_b){c zIWn7zN?7tNv;(U)&n)X5?;U1dkc z43JIUt;oeatk|Xp^#QL^0i6o6Q+53}1ok89SZ3Q4aSRURUZ%-mxxJ2R$HdIY+Gcq8 zt&lD9chNl@KtrGhX3hWfX*&zy8fKAFLaP|nvnYxbp8dOYrb!w3I zQ-cuhFgbdhh6;)x%~6CtcObi!hJ8|ywa0KD%_{kkz++g=u-|1SN6}vqaO6M@r zA_AOF%>9v85OrI;t{uNX<9vxQHI6{NI+4}OjP00th%oFn7XY@JkDYGtleGeU#6rp< znqm=lY4iyLa_9L1vo6DS*X1pa8N6;65XUQiS3gCG7g68~lk~9>+{BLVG5|Ed@8*?k zj*PW=X(XGgbsx?Wf%9SV!ObG14iN6@#s?LxZtU86L@ZA_2H+@EyhJH*GXL?y6oZ)G$PZ^9CH1hlbDT7Skuw z?R{t?>%sVQY*OYe`Pcz$P;9oq@m*hu`i11t@|8)2Q-3y=W1s4|z6{WN_;D;bZ3d1B zJjW*M3Zqi7&n08UOdZNvyPIG6d$z4)t-YI{PN$vS({8?Z->|md5$OB%paWp zi^A~XIwHVfc(Z4GAdgm8nv`Amu6v@t(HhS+?a9Sf2vPfE*pU+pzHz~hte(oZ*<}R{ zxAEyn+I`Dd>8Q0kvbe}5P2E>gt25rk9~1c6r6G`}@>9E|LDnWebA0nSI0AmcQ5B7Y zYETPc8{wwo13wabTHAzzf{RZ0a&4?Qz7pR8v?X=nm}LP4doLB-q`mNV_Clb`Jo6Mg z0Ky#sHNq~a1%4mv_qs@DIqnHVv%=DmqxRARgZBtmAL9z2u>yUrY*>lSPX+-RqKJm( z3m4>lWolivuhKl3<+;OJSmNc;Bm(o_M0Nrs+{SIocqRWjui5k8c2D(`+PVyraCa=e6>U=G~^e98O+E zH;d(YYkM*}egSfCX}tO9{s(s>d)TaN;aW?R$KNO0E+X11E$5%0O`qB0W6CZpemr4 zhUC!ec>PB-OhSE68?gcL$LTg1)J@Yr5W&{0b`d3F+!HoOQW9l>OmNMoFW3MXS;U&B;&anRT7$VWA0b( zX#spnRnkHx6I|ua-j8I-Q(Q$6M2w9I?CPbo@We`(eH&bHxvQWZHEUinO> zs#rcWMajzDRn_W^fH&PF=XT3czoV*@lAOfpPvr?0^INiv*{1}aZcNlNJc^JW_)X>I zMCouf;VSzd&7eX_i6R<7HA5NGw&Kb^yf+FH5GHeoxDv~(M~D!!e(q-eExS&{otd7f zscKRK)FlRI%eTO4K+>vF49z1zf-r>A3lZUzi{o{(RwDS@Z~q~-ZvXt}-;MHmD?r5p zH;STTmmZQ1b>tB#XRYVaW+Y`k(2-rdnPER5A8{Tj0omAdnCyq>hh6=17aJasQ8f01 zAkLZYj_+jhlW01N9QjmHr%oiZ*7=7~sE?qg_QYY)A=NRxi;OsybsSYWlX_v4M8zc2 z1S>%uNX+6T(Kw^4SBCWYf)qWYle2@`x+4@^Tan!aNqpxG+H(UEAQce8Yz07aS!Ab{ z(+S-L;(g=J5h~WjG3s3jLpxe)jq6Rz^;UrWOtQRoB)5?3#XUr(^rV1L$GS)d4)(tB zq+Nt+6zxx=EM(4E#iO0qZVck{2=KLk!}OQuAI!qXO<&(k1YsV0B2!Dd(xM`GAFVO5 z`-mvbDuSiO(!7;MLj?_7{m2c|LFdJomDI29wi#I|QnfWMSL2Q#Hw#>I5=B4el}yo$ zm~VujrJ^T9U1RH70d{&T2xM`ELn9i-ZFy|5wG-;GOU?yWYq)*9Xa@n1WDd;m9OUWZ zp@yp!YjZicJCCF{jiZJ^a4Wc4KFHb`5DOIOfZZ>6%H(ArWn+fQe5c@6pqX{bTGb*r zU2D%fSAW07rt&-Fymdnmn5%kdUxK)uz70U2!s5iU(O$x0m6l&S8?1k zysV778t(0N`Gx`O%0uLu0W_Wwwb@ix9=~gTP@6F}--h{-)xVx%&mR}JUNb?l;7MK4 zJQ8T4AZWtgYZjTn)o^m9e0`6K^HGnKy2)u|#NyEO^$vS3@NT1Sgt& zZwTQTlF))6$#RBES5*w2g?8x}RfdjUoMW)Ei3BwRl%;pAT|8Q_9S{l^fU+KLLW=1c zSvJZ^)mR|j66m#_X(koqeXT0;2rBDE^y^qg^$bNzX}nrsOj!`LJS_D_d0}J=%*?$F zNk?n)&DI0mTF*-c;T-xvy5zf0J@Y=DY^guwSY9-A-TZd`VbAJ@k9{9$v&ofa?!DZb z`UHI-|K3A?TJiD5V`P&DHzikS4=Fj+%Zlf^GHTOSa1lOivv z9xi^|4i`EfXPO23If=z;WymqbC}&PF^-Q|C?iNu<0Lc_eM@0zpaKtp>J#`tN!8NiM|j<*B;PDsI{yWi(`H#Iq} zt(v{a4Ov-j$eo(D^;rjyYc;yo|Kv8ukvQLCnZiA=_zY*si}!SU`ups4s7v85`Pi@*}HwSA@p8VV}}s)I75;lx9B7NXsjGp6Qw8Ro(lO@OazZXaw_yk zs;*#3JjsOHh9hbND&zu?q{&L9U`499+N-5nVxko=VQUg~q=oxRghc0x-Ef*ef~^IM z!{!{e_madYhy-Q7yD?%IW4n>7CFJClMrF>*1?KmjC8KCi5E7d@+DGhLGB_Iv1^J=K zw|bZ70<*YX_!T|3TK1d!FA}r47J)cj7KKU*q@l=X|GOd=56d zr2+7tmpL^XpvRI|rl)GDi=;f5a{J$_B8<2F?`;aqTO`#|_0-ZC4v?$?3J@{;mC27m z%-vQ2$wH@`nQClNp)^LZlA7ehOJZ-_67lQ`l!YfghpIwCRC)`eK(7u7R_PJ=N6`IW zHY7DCE32X*cF^jQkktyG62X;ZWptH~VhQiwqSYZjJWs#-B}#$c=?c0ld-6T~YxZt4 z%=<~k1g?T{Uh!SoSeqFk5~&shz5L6$RuBwYQ&RgmSlYL5ezF zP1bO}Yi~OnK|Jy~yGNumQb&wM65}vCqAFPq$&6$~Vv$J9Bjym{o%#9hWt1~uhLs`t zG{Y>V&V_x6Jfe&!Bsx8Z4iP}YY-TA_!mu#RQY*8RF%!8tU}ovh5?>;pI1|kG$I2dF z6ET}0`?=dtQXwy9^O%i_My8T+zUwwq!Fp`OQZUcGk|kvYu(Yz7!i1XygsgdYo z33ak$uq+{nP*-?zQYNsDNJlIZ-^?PJEyT|~H;WToI(2MrrFqIhOowB5dM?FM;%DRo zJOfW8B*<*G1USKUl=(}y-|@jnWFh>x67#^>@-S41z+n#fHaUwFbx{GZ+)aQ)3R> z#+dDF6#eV+?lUlM4P-j?wsZgp0_Q6^nFsrtbNcfC$N0pDPqGKU{E{m(M<0VLrj88{ z1NXwsAMf|{EW3u>!;eM9bb4{Iay9s51eUjR*y&In%KTLJo<4z_eAw1!o>tuYs_Nwr zbXT?l_V(rb_wD0+ur?1fn%QrNEDbZ2@G7Fau%}O1-@N&zOB3GRHucj&qVI751M_Hw zkWoJ7LnJ?#w>v`Nc<1HOh-kfD93g`p!wv^5V^|oi=b6w`7GmaaAJbJ8Lgg)+?`%dH zv*p;77bkw@^DPl#eZM0j0UmY?J7y6&S5_U}SYdYdn{Zw=Wp+;Tn7#U?D1Nwrd|JV1 zh2_J2p5`5~ZkrsphHsh9F_n93?N0ZK+l$b-ip}ijn3csWP$u~%20XT38KJv2;mb3 ze>lu;#qUeG9dup5K=Y#ur=@tZY-ubwp)If9SZtZJ zv+F1$8;<$Q*SY4HO zu#FqYnuk~3BpS^WkenNBUXIjD393<5iz*fC0F;}@y9cV*DjP=)tHqn*RoyCE6GcO5 zr+~k=s}Y8PKFuL(gc$g;V-HH?#}kuPu<#>#t==Ivg=GF2vzQ36>Jzoi#*W2h1Xo{j zNr`gTr@IJI5EMmlU0;Pk#+u&mU4;W`HvkG;Tb~)NS^TwDL3&@vPF>UIZQF#bw`w=^ zgT3Hh#2QajW?sG8yN4lh8a;MtmTHQgF1F1{vCO*KtS}{(6edJK3l{vfEAK(c*h1^C zV2+s_O-mySNQC;6C+i909^^FYP%8yJ54SU|4o=(cZy+nF*<=k7XDxZuyW`1%YG52B zXHy{xauYDCdVJhUh~}*4*yC$h4)dc6UO?l?(~a0l2Tldpi*?wVTC5gl2h@P$J`Sae z*-_HixL}7=hb->LA9OLJFH}`uK$-FO>kK;JG|dI$YM%9Sx36req6k~7_WRdYMn=fe|qivmVSbX2J6F%O0KMNOPXC$P(=1x zuTFEDHZSpLNGP9e6zXT7PTbPbQ!y|8?fnXMlM!E52bNw2S9 zPqBabV&{fhm)|a7GBq51zS5bCOUph0uO?~uS^4U0|Q#(qT>Ur*Agp6^YLhS>Rpn4LaCfSeZNdE)CvSz zp?=K5{(ng;&%j$Qx%! zCg5M0{9}XMuL%s%$r#SpJv@TBo|>biscJ=TSR%%7vFXZQ>`-+^{9_{iZB^o%MEl@C z_O?<%m4L=mh?XN6A#y1WvqeCKw(bS7%3M#+Q5_1s zN}3pm!|D2)85YdJm#6D5n4etpTUg?SMD6irhof-C-y^AuU#4xnw2y!bsG`npeAD;r zM`h^U+ZFc;ba3 z0#G5QBi^9JYMbj5Sx|ZB=G(~5j>VU%yOL^tu^#hky;^<7+WhfNk6jrJfIZN{p6#x{ z-5K?OJpc*xX283XuPfq}d4gwxdi02onx$drx*wfat8S#ILgWEP9}S>uKR2%yK2Zas zk2cmHL^jt3q#6wdon~IOZu%dRoFHxg`1se`LN&nfQDl7$@?@=b5L?rnbT@QjJWT=_P+^Ig zRR8n$#5)V=Ym;@7P9-Nr^o!qrp5vit}0e0C9Q0+u;VRJWzqD6 z$pGqwLOp00AHukDz0d%TXXfa=7AIkEdgsRvyO?}2jPLhulQ4+yS(!t@$%kRt6#V%F zep0y{tWfOb)>2(|GA2eABazs=A(7%esabw}4`=CAE3HOqvWU0)lIZXCG)z*j)~78k z+q`*f>tQg_BgNcx_djN^p{%PlvNTRV`Z*CODrkf-c9cN>g;5B3@A|A0*v-x2tl zH`kQ@WwSxCnnO^WvbI*Q(QJQ4AN5XcG-e`9ot@*I9p%W`N{^1U?(23L;fgrg_S7&m z#csHPb8l+m#j92Gu|y&kj0gvDL=t_E@;R07-rXLbd@s7w#Ss-2zMCv85XEVmn#Ai~ zzSC;Qe8thTF@GJm?Ap~b6&7r4iHPj$TR#gsr!_oRm`kgjig*rM#BT=*K8_?LYPG-$ ziaa}8S}t8`p@j$I%a=e#BQ!1w)*H8pW?tz*>*kBZ@clkc-A@59}c?>_R)dd9>d7MF_9WNl@CpB^INdCCk z49;;pbH`zjr`ib=_6GX|5*OP-`|Hn}r^9#6`!FifEw!}o`C57O{){h~=0hX<&afcw z1eSsY9_jdGkORF%tc14AyG5drtQho^J>bH<{YVd}MV0}y03Jm3#a#PE16VYYzxB!IA2X#dXA`Z@g&$k4jD5Z@NP;Ya^8=+q z>Kpd*`WW_6&*S$jTWvryehzR?JRAsF{Ey|Bf z*|R%MkS|*y$jTC!!%chkqzVc(@A5vxh@66_`SYM1X7di^LF7*PifUyya!_usvi8nB zitSFRu1MG$!q~97hHo;hP`KZG$F9oJEoaZS+PF2A+5M4v$6l$?SNmKq-PrN*->EsC zSB2<0DT!v z$c&;SG&6~c(ILr1e?$}+dX8R&dd{NDWYZROpN!`EQ3Xm5eMH?yt%JE2wcYivE--n3 zt??J82(CD9oCNt!{ZAnd_RrsmBkp07hL=m7wwST@W5Blb>Rf$7*b`(GFzvzT5Mho zwaaETj^L=Lu+F>xpP;P!(HGwGA4V$U-+}-7(ATH=Nr4VD;#YqV#o!w&6!NnMd^Gj{ zPf^{SUv$nYxp>JwYDp4l^njJl20Nq7R7=n?fPyk>5J{N^u4|pK)^kVe>ED~HSNeZ^ z@%-xYaDRQRzONUAW}29~;qT3z1Xyabh)TZ%#&cCOlE+{wnkE~#P^dB_V%K?Kt^r~y z3Y9HqyOt+}IdQIc-F~cmq*J!xn@NQ&*qXLH&*tkzIdR-a(C0Q`&?62U+vV%(T^4FT z4}VWj*w-6+B%_2XLrEoSvg){(Qb1=bs+0gaNFOp&@mlW8AptAdI4FitqF2@F;25Jg zrMIFt7bLA*&Lo*Bi5e;lh*A-jsb1E=rPuZEde9;VdO$|C~)E@OvJ>tm4^MEjrlddE4yXBcnC&&*%jR!20 zT>DNgC>bM+ho>0nP?s_^ui2WYv*RkyUIkB;53Nv**=jbSa}J%}^8MRk54e>1&(9%mB9wi|b;*l)sCS`aT`gvT+kh>= zA^}?xHcd+2XxK<$y|-b!Mc^cyU2o*5ZJUd=08J)Ga~bAh7T1l4_9EvVAHBaj;&R^p zF+L_sqQG-3Lq^ZX{dT>aPi=EN?04JEdd0xDsx0zMa&bWv2EOgdbRCN`DN>C|GhFnK z>u$6F#`B`D#oDvl=@C)>H5CZwz-AH(tX9;fTV>0sNVSH}W&x3h5YbXRT-)J+QGt*) zib0lo0a4YWS6-gmP?6DjKLDyyp^TJMmNbs4&?d&o=%4}-O&eLrY7CI@RO1VSmcKRa zHF7nXz+}>0dvtAgSsWsqI33+P>`>cAue`|rEuZv!VV++ zC;XMqc-wq~tCZ@>Rh4VIDtDKpto$;)e__}nzwA_ZmDWH1WVAis)(9zWM%fH_cE8yR zGvv-iRoMwY8OWAU#o{&(g1V|=sVf|sSoaJiD>LlSPEKwrY(&`uRG_+_zv8d)UFuRF za6H&u3iN{`RPqZ8l;Qywxmiz9)~^t`Fb_5&l^DptTz?!+n+xSKSGFw|`}xiA-X7P> zT!ua)^E&N~_RPr@wR0Zzs7kP(1MnO=b^r&YZ#9j*1|6Di@sgj4(Gt_TOTM;pI?j7r zUpsYMOEnVJe%n{lb%-HP5*V{8{2B7E1evo}YU(zMsL2uwjgEod+`}?W9*9kX>BHdm z5QuA!h!oZ_0Ho^4wy~JL0Ah#WqVyVq3C=*=WT6hlB4e@U`3(*MF{iq!?23k1k|bEW zp}CY)7nm4iB)LU1V+gF3(57(*7A1ODXKbh&gOnTIX%X)>3p_?xeg{;3-9p?s1v#r_ z8neZQahfk7OuqnTa8O9lF25MN)I~JDoyfv9XJFR=R9BDtMI^SF-J1YbxRf4ig#M&%HQ&WYYJ3jEmFK zG|LP=4S~sOdC%?{@;X^Bz>#D)XH8v|HjG)$!Zg%k)UM&ndM}#a0_F(NTvS+gcg~+} zvs!*&ho48EyO-wCK6cyXadiwraywwvho-mprfSlk?eee>0~hw5)KtjV1vPlW6~0t{ ztHBiA_u{CgnMpe5q|?{Q_GwuYN^EoF`*n9l1L7D89*s5f`=9|7M_DK&^E3#mY}H^v z>MR4jdw6XwT6N7iaw*t30$#cc-w*)QX=JG`YNm;6&6^T9g%jg{lrj*?KEXetj44Y2 z7Ku<5_P8;x3j%@7^8aihu~HhRt1Q9RN=r4mTJ?KrsgrwrLC_*PxUWHz+h(vPwWP>t zA(lIj=Az?{ZvoKaQi*f=I1|?>Nu*nq{i;`w8QV2&t&{tgZVDf5_>V}9N%C@*((~@u z^ZU;G_(=ke-Bk6k zpl_+((OS2~JTz#fX@@C@)qOUrZK%wI5{uLMiOyMcdczY^*(R~?+cu?r1I{EK&N0G~ zcB4+aeeGUV9&eJ3ANl4$L~o2*w0k|X$~OC(da>ojx`$xj$cEsG!{lpMnPS9}yBTU`P*EE45Audv>~3b}!%>PNp<9q`hvF zpZy~-QQU0g6u7Mc%>*h>z!!+G(v)o=%V(JC= z-58iQCZP1y&XZ~!6%ss+CeP-$B&dlFB?3+iup$}|K+K|ZOb4vsdU0x!3=ey}Q)!vo zTzR5<#B|qaX8|$?i4wGgRZlOuWep0@3y^@agpf(O=hl>eT00YY5E6?j$)=r?_`##> zilvf4@yZD)jSPFq)I>2`ho_GQCMnbER18oNK2v@#NslIlEU}1S$^!~E5N%1BflW+h z1UiufuM*{tZSneCi{ym%ZrHjIyXTD3WA^oCEY?`GAtBkLfUhxh6;+5)p`D$UB7tAF z$dnW&_bh=B+XQYw(#YkukPTSMnESKHXkwWmY1BEqEuPFrG1|4eEZCcMRYsvLnH46( zYprwoAto)M(u=5=jttSHx+q|+hFHje?lf!Sb48!daY>oY*_Xu5)?LMDToqk25M%|o zv0H{=(cW@7V;U-U@hQ2~c^sf(vQ1g`M2qM$S8ZA~HkZg8wpp`fM_a-bgB41tdb_oD z`MtHiw!An$Td8xGICk{BUK~c9lYmIP`H`5;EkxSO#=d32Ea$F7%asilG_npFL~xM~ zK`FRe&jDp_qf9Rb=f=tp2D#Ot!Pts2N20V5Ouujpx#^6gC*B zBpr%VgruWC$kwLJ_hfK8H``SbI@~Ns(eB1f|0wacjW#dPz5#3MIc-vcwtgvTwS#i4 zd2qmu2^T)f7j2L?_$hyVi@mvF(l(PT_l`|!o5ctTYs##>0T77q*~R8!O}X4ZiMV9U zPLER;_4Ms#wW!;J-|8|+BZwdZvH9LP*9Pa;!s_w=EmjHbb&?b^k|xn5!i~NVq_Ct8 z8eU%>A8v0gFHOh-JGeF@m13y?)wUO~ml357XbnX~b}bBB;WOR@MNE4VR>a z1jQ_c3Y34TtMx)B0cSN;e1A6%L!PO698I!Pq+c0|@LXJ-<-5dHxXKsjFiCaRlxxqjMF$$s;>eH(Rn7Mxd5z1<8+H;Ey07z6Lz)tte5V);nQ-bFu@E|-`l1N1r&MF~zj{pXg(E;obl`x)`984c8OjQgd z6uEK9EBX|h%4bCVoSmi4<5GO{_Dg_X*=8T3wCxT-{Fu*^sqCwwP?E47f$b=zl=zBN zRt?)O#AhlrUNl=r*FfTtOHzArnB~gm^4p1&%d%#z1(fO#>NF~zHDrh1M4c+BYd0i#^(hcUnK;ZDa zj|=?#7Qe|| zbEgY!7Bd|-m#{~Ft8FR-SD{*ZBPqaFCPkhhgZt&&9CzDQDGjH!7qF(bv&#OIQ#dtz zt#b(!7td1B(fH+u1#m@2v8ispE`JG zkaCIif!|_>PoayW5VEP7pj%ob#4#vj^tEQOHe&^)PVt!X>7a1r$9WLbi>zrBh7=d+ z3Xk>y!zf01XvVTAWlt?NIhOEwCy2HN5Wx%pnG<9>=j0#0vFNg{YrB8T!1Fe{sZ4Mu z4LD<9%>f+u$p7;Hq2Z^CpZ;8=|NqZbn*9C=z~A7;QVM^3TGdR{G+@YtpCSA^f5t4& z0q>E=ut#oG6lwVXuWmpbrkd8#SpWu*Cqk)UiGXQ?7BK8BuOeTWliE^i~dovo=dFog#ZC7dlDS3Om7R1?bYCrIg0 zL=7}4To_aPV}UP)rN&V)5dE%DNS{wOOz>q%CY=F6O$^*jY4kra;EssJWH+i1aGE@v z12B|?45k@?1_;)cRu57+548lPIKgF$XB_6jRB=m$>5|K{;v{bjk6S}psHy&@L6MZg zBHTFj#3;8Sp0J++SLS_!=X!I%V9loqtvGKhF=sC{9u#v%Dy)MZH|DH{0F*aBSMs z`EtG8AJ13EupBRlk~}s(F*!9oGdnlGu(-6mvbwguvAMOqv%9x{aCmeq>);sr(097 z@KZp1)CzCiGsYnhhxKfdt4b64I^&m=XjA-nf0Et`A&Zn#J=^qHnthH7f><0F{A>d! z4`jOt1`{Z{lt-MobTG5=RZ#O6{S(D<0NNS{HPAgp%GqVk3#NUt)vFWkQ#M~v5)P6~ z$c6u{5kvHWxW`j(597(99dcf;Q{>>yW z^fEE81!V2G*e=NqK=z3J;cu&yBZ_YEgP!O4PgIY=oV@;b5R9XmcpvH|H&Urmq5KYh(jTHc}U+^ q{|RyK&%9`R^N$q#%WqSN`qw_&STf0z-}tEM=^~w@|Fzgp5y=6KHKcR^ diff --git a/kallithea/public/images/android-chrome-192x192.png b/kallithea/public/images/android-chrome-192x192.png new file mode 100644 index 0000000000000000000000000000000000000000..9de2088f130ab30aa1ea8a273390095dcdeac729 GIT binary patch literal 6850 zc${@tWmr^Qv_3O1#83kaB{g(+Ne|sAozkEPLrcjJD$OXMA`MFFpn`%D4hW*sAW{kg z2uO%Xmv9f?{dIrbXPz_rIqzAq_u6Z(z1}oSa|0UqB{%>8G)9KH*5F9Ecqqugf9vmo zPCa1YJIc$@+6(|<1OWh>0szM#g#85o5z+v#b`=0r9svLgrs$oO z8u)?C)5Jg*IKTLnwO8kY2qnhQF$@5%P+vR{v+-jD2$F{zndy=sPVsOYGDl{C}n9mU8e6g5=;8|5nAJc$%Rf6oVFsqZ+J ze^tY5bes}}qJ?hCi9;cywLz9i+JGY|2QU8~gJQBa7L7m{M!j?YakLmAukW^ft$lB{ zbuNLpGhcjV#bs?`#csU)fI>vzlG$_XY89-sc=U174GsSqb|LuNAJkT?A|6lBnWS$E zbpuI4X}0R}KGt^;ZFzpyD+fH&sEVF7sq?a6pJ+6I9+1n&cF7j!+V+-^G4Ww%{rqya z$*G>BrfcfYljg@#x9(8@=@F*X|K1&1@bDYr7|8yHsGmgRGU!Kt2jBWTzu5A;Or-%S zjeQBZ@vW9tMM75Me~nO`)oRPycHK&N->D;asXN**#H~^(rdVvltr8U+#5VU@Hv&(| zp#O8PF4;W86kZnV*c+*@Q%bYIQ6^JfoyU2vXn}nJIdMI~lvgrPuK2FaN(taWiu-)R zODUWGOS_@6+-UdQ51*JJ;CXi!FHVcxDqEil>Xhm)QoN<*w&&2D%1mIEwjqB(AN5wf z{oYwyo{I=iPvJTDi%|VdHl^V67Z)Dudie!+k^WS|ENF7hJL|9A(>pl{vvrG*P{Tp# zOUGPc?fWBj$!QQ*$Q!IRq@`Z+l7`IOd)97P9r;2jy_c5S?BZ+gDwX@G{*XY35A>JY zR7bV=PcE&|iWtNj!ahStPGR$Vyb6xum&h=)B`+{>z1073Aq28$ONVCr%5$WZw@8uhqv8ZOqiiAKu0KX>qR8N5SP_LAqsrh3tZwh8bgIVm2#6=_vg9H3z;ZEi;J?J zRs43le*EEyQ5c!hd17naH_1_4FGXiKzX3E$#?76=T^y?$no;;7I7zXFRxLpHzG|1s zFKNN$lTvM29?4P$u7P>?NzcLa8;DjtvEQ6Dr3KIqhF9l3L^*Hv(%DlC?DF<`MMf&gnD8tnMOoi|6WERkInr_)a! z5*#vP<~!n^Y=WCq3tk<~Rw3Q-3~e4oyd~+HJuMuS^_>-au*xBZD3<9_92uDD?foex zvfKNDfnN|C6*Y~a_#3ws)AIha=8LD%n_++Tgna6!l%3(x`lg$&&SLDT%19|SR!zjn zgzDGXA4Ptj-I+7u?Rv9}=canZom|fsn=tqH9=~TMr8-PhD-?>*Wg^5X^Ee6RM9vz9 z0!{;x>=?dxY<7o+b0bC{+2~y%#<)}E~3JRM=ms=hXZlpk{7y_*78{| z6<;anvVZF_iPgj~Mr13}A(m2AeyMk()VCip%v462Mu8^u@;ze7bU8N*pzHoQ5;mJZ z%-C}`Pqscb^)+COXa(+6L0VG|P+UQ5VMm3cWIBi824Mt4rjUn;CD43SBt#xReVqk$ z>f$h5e@*)FX<{rkajX1foF8z7XvcjiAyiqjgu%Aqj->OkNb<#nm}a+sw@w} zot=)f!P46PkUUxW<{RG4|Bi0js&Mi_BcXXysDTt*dOUQfbM|NNB_^U}HbeGUUM zNnejOkNy&|r1WILjtp}jOTe+XHS-MT-CdX}Nx2vfca59ajKu>2sjh$y_sioC(E~w*t^derzpyI4MS_>864sCKBB0raR=KOn&qC-{PgzW#`Lwv0;w0VsC|tV~SJYfw^kFSA1M1-p@BJHaz}(IZgr# z=c9+PM!Yqw7ftjyD?2rJN*?|_a4esiTM>OPV=P^XGzM;yq)R${k+#rV+yfbEl}f=D zW--8bTNWCYPwc6a$>TZi?#nxd!-TawW0U^g|2FXLoKt6dgX4V8QQdO?tPoGV`rxEwo52|RMpLTGPr;L%Cjc~I_G{!vw zsvZ~jRahhgla;6?KD=LVNIx8)axZ#&qf+Tu66g1E-op46gMA=nxfq&~K^@XU>}zp? z(~!S&ZTPocv$8EUIMXY?pEd^x;q+RtL*I>-z%uZQVrv&$A0)Mj2}VJ?qxE&pGt^7s z&%koO;X6%LaBqFjmvb{_KUq7}{w3_1IFhu3^Mufoa}nl{e5#*%3^E0W-EZ1c`Yx@O z&gC|9Lz!9Np^mQj&HOuw9SVO;Z`L-1jJvg_YIz~MCi{9zzkd>Pj`JQKyVv(A>wI9V z_1tWP32l4-`SK|fe&Q?);hr%SVQwr4$)(mI_Cez#_T*zK;|Vw@niqlQC09D2p=P!| zv7^7&iBMGF!P>mTQqvxXVc*+bF^5VPYj||_i7X+RE)JfkQr|8ml^gS+Q0{Q4C+z!- zpN6}U`p_=2hO~As@tVSl)B{UOx=d#+jfY~N7Uj-n6T+GRW85{qCdIJ=x^4Y&BLgC5 zCF+^TN#sAh2oz)lDy+3u46L)yYPxn+)-lp)X`##mrzX;xzB=1(@C5G4p&3lM;v?Q` zUY2IMsU5Km`9=PB+^%uwA$TdIf%$AXN)<0ZeVNh7|DiL!9Kh12m$&%vMuE3pmflccYS_lxI0DH zumT>?PPg%Pvh9gOPpe!_j0MxcpFW=cXah&}RTaCGXOp#fg!<9`lC@{h?}y4dnZ>gB z9mjF{dcxj@P9nMXBaNVfK}g-A#p8Z8QgQ=hkv`SrCSsrT`n(v|L?djNX|zpH6b+*S zgwLt`s;XlsLwPWkhBMdVdA8`jrUS30JJn@ehDvC|^)Y{o);LDdRAulG^;V`90ngc? z`awRLCZLXbqEU#Xnem3q3>k5vF3gBT0xR0Jx51aFn%05)eW@=zZ|}M}BM5fxZ5RIlQE9FnG=ez+OsVTr zC(r}vj6wJkNwrhe4%N7FZG|1FrGg2M%aCH?9H6QnE|4fEG4@s~!d$eL31XuM!>GrK z_Y@{nvwknWQDFX!J(fS48GV}=voC}_!Mb{34kY@*@wUZRn8CsexD3rQws22MkVUb8 z=GDiQeP9yU%*B{}E@beTx+g|yMz*-mW+hLc36RZPpQ;p|J&pZH++^qruMp3{8-r;2 z`c$iR(M|#{SrnD{SV5&qwRi;#rv(}=SePl1k!fiil`Sr)3;QDK1h9SB+u#(z_sp&N zp3Am?-A9=1N}dmBBxQYS=1SYqL00Dvy2RkRL6LQTh&Sm(V>9dlP@3KOV<@pve604X zT(EVe9Vu@0DFW|DSKU&#}OrPLAZ(pmcU8(c0Ljp-ljCJ|>cp2+j4xM6qDnd{h*op>9YJCdNdP^o+4* zr*{5eAUgDgUt19V&@uuwWSeMQ7b%&MQznZ#Ah{wjCbFJsGoV=s!|~$%Calz6K35=% zqJuntu=>ot*j@m{B`2U`URyiD(mk@pPHQ1J3MW8hKIRQg5m$1(P~ztYtEaXR=Hpmq zG#pG9UTG;Z`#x-?_!#Bbf&C7TKZGBQ_z6UlL|50oFOg4t>?otorH)<#OB$jcONwD1 zQI%Xy{2(z_n^wgXU@Zo2(eBjwy~~^R@*T zc_;DED(9-5pf56a7lQtDxsumtno{WVEa55ijVG-LDv5Dsyly&Q>^~hHID4@?v*P@- z3_8)7{MQx?k#G#QeChvGU2vt(ORGuihab%PMaW6k>B))PQF8*Lb1bBYj+tBZd-*wUn2{TH0WYxjXnFblM0#%H+WmAch5I|N~!w?AyULO zv_;M}6YXJ?kUUF~&#i$kCboP7)DfRdRd= zcqmo*EpU{omUj3@iTu;+)|``i7~{Q}U1H1fC;wxQs4K9fAzvkeeZho2s^Uac;3cC} z|Av>RVNV~4BR7AQ@%=q%9EIWD!mk#XJ3xfb6JEBogscGLA=EN|$K1|EjNEmP$_)6! zpsCnVkzuJ)&1(85l`#lKJ#_ErIH%P&n;T3L*o`t9fQ0={f)3cnzH=mBXhtzJog00n zQH#CcNk#lS-=Lpp(>0SmQz$)dqx#%wQIMtT?7PDAU`qLitSVjfm%#6iUFAp%0@do{ zV4)-NvWME<6}^t3iB4Mnoov*khOFGnHu$_Xz$Fi6B9vNZ|mu^=Y3^Ms>X zcbODCypvDK)rq&TU0#4jmlrVg%;%`!=xi@k% z;?a7R!%R3QBK-3~%Yt*=;YA_sYRtY5mkv3)Q%rG4u1y%|EeO*t)>jW0Ez-g%k#Q9z z(x=50)iXhU!7ZUWNa&n{b-KVkd;n=PH?D)3aM#idYH1CLHUtp#6|JDV3G*@tbGDyMY>U4yTZB~l@mH} ztc{6Hqu}t1KC)L_f|oHoHWa2OpgZZ})`}2u8ebHsx+nsraA`%^_F~YQ6lQJXDs(Vy z+dmbp9wBA$^KD$>?~{O0CZdk;L6wnDn4WH)4OZ@;^%mg3IlLj4vGaSZ%cY^WP=QT^ z7Vf{l7P4G)aR1Z$QJAIV%-fRoj5XAoq*qT7&=}~9VaUH9M^lM*Ir|!_v3a^@{JJTL zi((IrS%!YHb0@+YTIE{?%HmbM~7dg6&5cnyYlow@5nO{fy~FJ6_fJLmaAh zAY0l6n(xsOZO&SbFxHMYt6Ie0h^knV%(=JGvHRK$i#qnv@9HHlZN~im-65_<=^2=M zy{-B8i;pMwzqlF}q_t0$hp3S>Hc&_& zqi3b)#ZrhgB2z|$n?x$zsjE^gAFoAr+_RZwa)sQvsYVD6W>sm`%n<&8@cK&APf}52 z_=D8*6?W&II0B=w^+#9Lb)jKzFP#5z)cwILo|H@PX@5W*)?y-un-KwJO~~fVx2I;f z9b39CP2Tsa(M>!0_w8$Lf=gV4*u$i!Xj>-sHYyq5wG|Jv1C7s9&+4(y!kNwXh3(t3*gxrK}qZA!(>RS`^#DBM~TODcS$;=EDYCvoLAZ02JXy~ z6&t-Mtbw$Q?`>SM?bS@#h66gSZ}`v4WyvV#ic~tT2V9z{gF^r?!tBIRtgkXr2=ABR z9C7Mh1`X_P6&b&b9;R%t>cDpvZ)O=%fWZz z$okXN6A@FMWv2nxIa9fz^mE!5%6LB|NQQ7n64jS+LNj^*P^H__rDVJBO4`kg=Y5?3_JDxMcLvXHd?)Yz zj1&tT&eA^{mPvPyzwyuc#9^^m)po@uVhAW)jClh&r8sn=*y+W3iI0i2CYP^I?U6b^ zg-e4qH2IwsytnJ&5a+kUps{;|;=JZR$B@2o!P@NDD|K(6f!;Mc3#$Y=?MK`cYGC;p zrQs9ZZW#V=8)Z2kZnK>GteLTV#R7o%*u4j^c-=F5Hy<4B#1tT4wpEC`t>ZtO^sgKs^(bxGMx{6$S-f zn65AoE5LF}vKgkXx~W+54k}zB2m`Jb3_c|^Yd^{cZY{;^=dpgM&4=TZuh{{>gVi{? z%NfLk#Ji9Tmm!ULoik_Kc*<-xSIDb7wl2|!3Q6Zoc=Di7b=B;rA6{ESnt)fSJ}R2z z9j03Y8)TT`^(l`MAw@lVK+hjS?NKl&g=M6eSdH%hakqvb-T&~wBp;P1V2rX^08_O- zHNg;M8UeFRVJ7&3nPBpA(eDxC(;=uf$G>VZtY{OULE0Do0O$q&+?6in>eBzuLLNc3 z_$gsTS5>^uCHy~KW^kzt;Ex zrZoOBJC?WmIh=sMj8*he%VMCj51O!SI{#ySoI~Y0Sew0*P3-}YR$(}|^08GzfPr&W z?#GgJOVFH!0#|md0!ANQm`|X8u} zV)k8#r&!;FikmwPR-6gS|H+#rf_x0tPwW4N>~g}gJZ%x%gz|_<76$M*WKaz*!^08ExK`N17w@8VF zLa_@s0C>MrY8MM>$a{mA8Oyn#e8z>m%LOwc+mcKALARc0*B8!Z#TIJ=dPsZ)(uPR( z9-o1w&9$V3`OdLB=0o-V7hmpQ5DIUi;+MHGs-DF~KZmNYob*SF`c$Y}qMjlkX}No4 zV~gvFPCVptK#g*wE!eoySU(5-b3&VWj3`~K{0DCmzD65V-{jX%-TmDh-Q;~(!!lz@V2y=7d|O)~A9Mj2>6z=| IwXY`q54fvBhyVZp diff --git a/kallithea/public/images/android-chrome-512x512.png b/kallithea/public/images/android-chrome-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..a608e78da3d505230b1a5be3d8345c991b67b537 GIT binary patch literal 17589 zc${^6eLR!<|NpfObJyZXOKqY~GHHacB^2c*ccF3xz|~`F{9(AmNum*;`hGBIeor={2u4g!{c19_v`(B-M^l%>w52mn~U87#ifc6 z1TAo|w{?dgG=%(};V~?L>dWVq*% zASGK*Yn28j?)nlH_U1*~m6p87yOt{Rh>5kYY#1}yy$H#`qrKFV?6ms@1b3-zIS7^SFBj!exZnqNlQz!pYVii zZEf|cPST-@3$YAyo;GhO&vB}62mZTQ5AK3D!u#RT?&%4#Fj43u9ylx-US)Kh)8GIf z;8U30_36>oIBmKc>bh-nfVXfA-a6X;#A9Z-dh2w|Lwp=dx@0p2x!hPZaXa22Y zPfd2p@+)wUMrIdp2`NMyUVV+3DTYJfEcgpEcthf3Ff%18#s9v2xrn92OlNJYOHbh? zm)SD0Tujw?wtjBsrTv==30ZPiaFH%?9kaV=!J^&WjNc`%zp*(D>)}gbv)Z=!ESr^Gh* z+Y1+o2Y&J&1?}ayLvxCixq-u(smxskechfJLsjrq5_=`HJrOUi#I35|<%sH#v8EPa zwgtH3TxD@`2R5x)Pj34G{{bKJz}cai4&lXjz`7k^UFhxjt~x?UUNT7%c0Nie=gVcFle1!b-cnDFyO3U< z8`+i}zf~4?YYqq%>Irj47N&TbqREbw!|MhmuKa*PGskRbBo0Vrc8SGl_yMmb1%5f> zP`!bd)Z9-KdI%b2`K-dQqD4?HInu6b1Lh`Y)r@Y`DIMU)r zlC|E`TxhHZ5gjNNnv>+1CA@3&E6o;alTpq6R_?g_Pc|2O%$oq+0S+U>r&*!ip`|@W za6kO=%?|Y~#d<|h7+NcLJ8DS*r{Ob+J&S(eWM%dt+x87)pl+ekySvOCTIQ!aBQDtAjrl}YQ@C4Kf3ZUAv> zODSYe_k_0U4@z`|YfP5)*njs&@4g)C)kICZ2qYL;B;Ed~J5G$TJm&xM!9i-PAKI0N zTM+`nEC;d=jn7{S*7NB7zOAaT{6~qwBu?|Xh>_2ryN6-5JdV$reB!tBk|Vj z9rX|a5#o>x4J%SHI`AA73Zf{0X#1qRP-?l&va~FBoE`dBb(?msx4OB(Adf{?(YSe5 zk*Nc9DX25O?J0E_^A0LIK5D=4l8=7awey~cO(EFo`@ZLg#K#n0IxL+<}d3fL=ys>A_kV>WT z;fA`nsk#3Ze1=ac^g1nLnHSqZ*FJakKmC@Do)_%7<}JT9Naqb&d>f~|a=W`U@UEf_ z>jPO|%WUio4!ilvyUOgB`~C0jC@)a?4$*dr2wlsbqnk$fuwYF%8aN@hgUw$=VyiO? z%Hr(Bk%}J!iJOnRgRMwX2~%Z-W5ClFaIO^Ye&XgK?z{leRXdvlY^vI3`!+(;i|;Dj z#oVp`DNcg*M%!zz3v!CC?Fl5>4i)|@ws5&6Nn1az zE`4IbkA;N#3EsnGAHaDWb;25gmmTZ zQ?jm&_2sp#+dGVL9V2TReLR-rH%6XG8@kUlL)Ul>Yg}!D4*9S%Ss>m$2}NpuFNSD% z+Dehi%Gl)+Q}F;_&=|pOXvs?WgOxDGps5Kr@DFYs$(QDPkk-5%*W;NE-@nZ+6CM;a zp7zCRWF?GE!09Y`eO{X}+7#*Es<*?s$wD3E8tE^JlVG6^!RrqifDCjPp zyP&YBpQ5;i8S4!zZXHP&^T~05#oS8e{vD%#o^vk;?#;8xE416E4<*f*9=Mz^R?pYI zKjc@(3b}Rs61TFYbE(Oi<&O8}%gzlwX!Ju|J20``9@%fzxPZpmNh_0OO1%NO!5QCf z}xq_>q@xgK3{u?CjPeB z{5w09SrHv>Ay?~-&1{_SEZ0k+$Y3H3m+^&sC5m{>M9}yhE+3D+njcz3;8)?ajsIs| z6p@w{B?CaiHBUifA4*)&wr<;(u&8j3(Rpc)aq-*^k}3jfuL1=qF!^U-d_?$Ww`;)DTYGCVsq5Gx+2DYF^(%=@!@8;Gr{ zxt6wipDqNXGgPwk#g5$k=EGd>J-npj2Z{YR*XF6sTu*g*;Rc!B#u?^6ghGAUBlp_9 zu@{d$s56LgcbqS-ZW$i+=@Z_7*3JCR*Oq&6VItUh{s5i(P}MSM<0EPl(=vjXFRn{B z!|bVPTc@SY{Cpj<-vQ{*X-rlPZXMI=Ad(5|wA(6ih6ouPAFpUlUH4u#-(dOe3trfZ zT1f}jPJI?|9Z2)t!dioT2WLpCOP|HOrR4@f%Zdp@-t0^)Y0jM&$I-kBIurGE&^Kbw zc>mYksthh&{$S?3Z5#|BkvDb;OcXTk@nv5$wBi9RE$giQ)eM|WTP1=pcVAOsnfuLD znE698!#!b&IeWt?5jE1VFCvNJ_0?gIf47vWS;ks+j%f#AnmkWuI=u6n#>BAc8L098 zpWf%du`VcJl6q*oe;J?7N9lMj_kTHmASmQjbh+%q=lr1`k_DmzB1rAV!dnr`1$pa9 z#ZW$p8Bg1*WPRxLS3N#Ou7kauzWi%H{co9keNce>uv&p;6|&4BVITY0&L0xz>eD|Y z_xGXQ7OO+0&A;QB4-VJf@20{>KQxG5UziA63lf(q3wWN%3N?YO9~wfoB)wq2tTqsL z`f#LOzv9wA=$K20?fR+5EdPfu2YTA$9Ep;U+pwRi+tx8H3DCfM|K4{*kZZKWR?rYdz-IU^zRB&tivdil;&57d(S2X)0sj1>M{ zcRkq)cznw+%EIlVPkpuyllUmP7wm~p=YRD`L`^OS`d`G>!PLh`4}!B%`ZCF&scZhv z1~+=lUCCwF0%QAb|;F(GpcQSJ)a8ej}In!pOfM_qXX*~ zF)ec=l2Yl+2aXgA<(^j{0YAwkM+4Qa&8g3$xpD6>p@=cDF~lH(^&S;3%YO{-6qf||e6L0Zl#JW#sbk4WqX zZ`(pf-Dn#{DwQ#%ZL|2B^YW_8!nKoYgmU0)o{{7akxJ1viiHN_5j#Pz!@fe(>1&{BfGpBoYpqaIq#R>Knwlq z7MizGn+Rpl<@2$OV!F!8CX@jvrFKf4lMffp2l-%>n++{SQYb zTuxj7<+c*1{oj7~!G6=0KLzPYYlUZ*x?sVuF8cub7?B%npG3}Gza5o%1KGV)Q&-??#w)|yHp`<=9ZKUgM6i~lTr0r( z326Bpuzby2%Iyk9g(WSz`-b{BtxjbU1n_fiYRiu1fL2b!GdMKN)Fww}bs~N?41lhk z^Xk1u)H9AbLeEf5G;bxb;yiH6yx1C^htAI~3nRC@ZJ@Txw_<0yK?FGd>suvjk*?4Z z0Kq#%$#YHv)&sY&5?5(Hnlsafv2>10X!xD-s&?`rfPp*zHMSpAm!1MyM&t%6XO+BK zD^4J>7Zwrzq}~N{Aeh&c?kZ2>MHYb)DCRDR{Pmzd|0xKH`CXEz^QGErfjm4zV!va# z`tG;86zi28vg%CKhDH&s4jx%5ln0Y(D9F zY4fAl1!Ij3>P*o2AIeyUMls(+wmW7`uml!e(5X zw0qx8u(N%>*fSNnrBG(9n?h!VJ8Fsbp^fkw0N6rRjg?q0_fe`F7+ zo?K5Tc&p^W_|h>bVCg$Qs&fhGZ0ECbOa}a>)p=W*1I&ag;rsk-ou|84H3#w47L_eo0H4^X zL4krs57sHx>8su7hWkr zG7?i^EBt|fPw}&#&_>XB3&j12FJU6cW6p+dyaRDpCkhD}=x?ZR=qo|F&!6_f-f+eJ z8+)FFC4prli^@)(SF~Qpz(>nwpfdpa!7vu^Hb~?}k%4zqCQT&=g}@;D`K+LUjcp)E z?(2Gi_{x3cQ!RKMYcU&nmPevA;4;apRn>&N&_hx&r1w&rD`4!@^m$ z2iP%gz4qcxxtGcL<2eU6s?cdrTZv)-N=mfx)jp%Y(ZINOV>h>+5dQ;uD?8zp=qZE ztveIzl|Ce#wH4`Cjzcl`K)*b!2YvmpPZ4=12(YH|U1o?#^nlV^%c!3x0wGSk`1C2k zQeq;~j~mb9qmVbi(#K$kQJ<8P=p)b9iw9iGZ0w0Z$s)9t+NwbSVCg~%fQTbIg{`2c zXwEYM5me2w3>H00n;`Ui@%bV0AtJF9dTI*>edu>#Bj5XYOh&?3H{c=9@d&mdubWYk z08YwlFskYDrKc6G>w(o@0-TB7BX_5|&FJVuw4fFsWtD$vHGl?{pasLx+4qHM(9Q!$R71=*2c!>mNf)gkSmE$K%Po^n^bi&{b6D)<=UZmJs*}qHWOjIrHo-BA_LfB7)6*8AfTsSQOZ+dpqhn z2<%0q!5B!Q4M;yssgv9K=bY2%K&ewVZw6bHLw7(i4F_BOfsl%rMYU zF|r^E&>Rq&0&~&IL5W(`QERtk(%~2 zAFx&D7c>D_tx-fcQ1I$)NqgRwU7dvK*}Y&_(;w4zs~Z3~b^=6{rRzg0b~);fggo;K z@J4?9zR>k}0a`1>9k&5p(jiW_y(Mc3WDNtHH7k|+Kd=P<-+H!u* z`Eexn1t=7H?hRegPltXFL0*(Zh4EhNEjEs>YA7WoKLpQamE5+<;ZgUJAkv6MXXEjy91H%ib!Nev`5gtzOdrq>?*~0Rv)|cKzSA$U89A2&A&z zfS4|rasTE3b)g7;=mpXiC1`Z@Vylo?bC%FT3Va-M*f&(eT|!QNOg(B(nv-c8C)NvP z52tf0mEXIG2m1NiwvN}NDeBEdJ}A6ot_37gBEB!0xVg||&UPTu!Ayyc3VeEh8X(yn!uJIOlII+WZBNl(a9EX*jZ_>F0DwS>XLC|4Jc|?~g2WNn zl&aeE5>VdHQD#g0xbM5+n`J=0Alh>Az-D02B4F%Y7i6uUqww5~lgpLr+NjSnT|n-I zvOvCCx&c?{K%W!rFjHRaC0)D1?|dEooV2zpLMn%fJ8rqGATl?wrv&wJ$gi#sxIIsr z;`y=2_ud-c;U!%M;Wc$q^g4b@YC%0vn3Nec^bBo3=;KGfIwV$>mr9x3N$d%T?FE>M z;0!_IAueE=OHe&dthvf06EGz$>v>cQ*nx1;II#|P$3S2?<$9OX@CkMppAx31^NuBqg&=%e0bdT}#N#xqVYYXRAC5(Y;bu~h z)H?BFx?ihdJL;kviJi;z7?}_yujSoK7~6`lIZBUH(;eh#NLKwwdOb)5(Y_q$>|`XB z(di;571IV~A%a+SfYMS4cAWF2;U=V=N1m)a4g%nqR!3=LgK$SS4`&nhE{o;@T?IS-7PBXt|i=qKOrQ&bQie;$B97QNDl@;x$f%q>F#e5X+ zmbl{#AWOTH3zPNdLbmm-K}b$gQ;oX;^aAo>5I~O3UKl56jP}KQ+p794(xT%P-@?C>*jt1IDGs|^j8$kRXnf@X!X?Q z>zK`!tv0gxF(md5R^`aBoRt#u(M_Z)R(N4}-n|BY|_Wknbvgoo0dd zRs*u+%)QPnOeup>8Af?z7~V;pe7R;YKd?!rLna^K$zbn3Dh!p&`Ge6Yovxx$&uQp_ zU&DzW$(r|`&eoB60I!mTTZPBJ4gUzAIaGi^iQ!dvjVF@Hz_Mc6Z!hPcim#>7HBll zMBC%tpVn2Zoi!i1WjVy&U7vJ$l=;pbx2uE0s;o=j<@-=`{oI)p$JuYQDDl7+zIIR) z$Pkofk7^IWt4+7rLU?bq{S1k{r!$g4*O4S4#qZ?}ojHRw-Qc4Zzxz#SC{i)nFdAOu z$Ev}!U!zQBg}nPV+zaQq<4Pblm@RJOc4GXVd7G`3-JPLchG`MD!=D6=<)#^DRqZK} z3e)oDvJBH;&1rl!&e{7ry}5rQ=oMUyGd0QZrL!6{mP;ej`XOMU}M z=(S)H;zc+2y9pm>)EL}4t|OJo?t~iiA$qkJJ98CiR(Y|LD`Hmtw48LUCdUvY>6``^ zet^!IUrPh)(-XkjY|#49IF#UM@3EwJch*U&ISmQn2QE*S)AJp!Dp>b=Le1L;WVF1o z$V!3yZcN?zXB#J7zgh@4kk|$#$frMJg}HFa=+c2|I(OUZ9CM)PgY%VR^m)hWnwVP1 z${u;eZr=yu8ekGakuyYod2H991BGi7=Q|WpR=MO2GzoerR-}~#HUd~UmSc*Vte`^& zL6PicF7ML6wzBoLMraXXrh#g|=ihzQnX}b6tyzE$DXob=PTy&BzgWa<@WAbHqHw;M zd0I&0o>Ne@Ar?%>nXwlEgffr>TPwY5iA)fFKJYA1BU4eT;yMtxD?Fi-)oc2b6c|=N zy`Htdu4FAQCYV;^y6|&eXDc$N^N@Qbjqn<7<#-1Oy?Qx+*(ujreV2f^*fG3SgdlNkM#R;*0T9FB=#WFnAzkLnoVmeB2*n2STW~2 zoHO*{D@pjBudVa;vx%=_#HvQpJVl+USVZ`S@{i6f_)P?bj$DINI+V6ceS~~l%tU6i ze0oN+g%aZwJB0e(UvpQ86Q zOjyR(cFYGp2N1X0JB*l*W?%E2(I*0I)J;9Q9+(9TOx<(Wnx4SRxN)9Q3xqV03STOn zR`>f4uQPp!tQj3g-k#>GAFA>5&pTz1TTTYhfvPrb>q=AWzY_wkBT-{rT%Z6?PM3ht z%G^~#xDrDA>rZmqjZ2D5Cp$IfI(teTdgM)Pl@e17^~sfEqry^VAm z#?)TT7;|13T?JrSy66VfvW?R6h5P~TT9^Z!Y)a;%>5dI4ATt7h9bPJ?yc(403(*|%lHM>z4ysb*Frt0pav71(tm#m z<4(dKHTOVW83bslmSMs}NwkGgqSg17Z1BeN5M!%D*%>aVlm4ZJ_#sFox|0mk1;039*2XToS zkVOY7s6Iz$Zh5O1IqX;0Jn*PK{R=CJS;^g#wk0wsq@lI4WfcgLHLk_MSMyz zm;qWp2xk*U*FHJ~Syd))D)vJ4yr$Y-m=E1vIrHo*7;YeO@1K}@(B;{Xge=$;C-_+$ zFk7bj`We;w!Y|$8{X>YfKcf%gt@aW3>LKsk-f-ibD*T$S=Ctcc)AMP(32I61+47l` z8ah+svf}h(s;#IWHs;#IgMkS&KqI0vv~_qLALX;>3-VFwar|o$%298%$QL{E=P&s| zX0FOv5XapJ5rT+&|ENpHLwN7uu#L@B>s|BmfPgQ$iF={d-q^77pARkD zFfT~FBF%(fiR;iCO`giWtn@aNcqBGC8u^ZjB<6@I{LG`->{$?zrXpzc4L4nNduOwF z|3_r=B4#im!&U|C*}Q}JlnCP9#ce#CwZ_95m;dp`_P=z$Pw`P9rAIfYJ5JWqH~-SF z;Ar&Om!OUnE#qRKo7D+1P8PqcbLzJT4l|Faa3ttjif;pRQ;m`n=A@e2cg$V{jdP(Y z$BXD`;BfMT$UHG< zPL+2PmgETE%|n(hE+NjpBz?D41abZ_BziRmET9F82%NFn{|qRVl^n9BfAiy4x>tE` z-y!c5Y?1204@T(*oQl>ssR(3}to{59nBhH%kJ5cN!B+s>bZ_WWRq|~k!(24jLI*Mk zYx#-!CI>^J9UFObxE!+n2-C2`8(!)h)CGa*VH(v1Fb|Ziv@Ed z9xjc^q^C7HP$K0&2Im(1U9*5Q1h8`yNX7MKd0b^DuoWrz@-&~*P*7&0zf~ry8rS)w zp3W@44%zS0j3Qdg6)V6ayQ7Ht)##Xu^tAVdge#bjdvgou1`->QiXXt!z84;*I72^d zz*dxQD!k|xI4z2}_Xg4vQ@n>S4!Dc=u79}(0k6-M+Gk$kMq=93zy0I?T{4%cY^k>|Ro1icR_(E^UZ+cD4F80EEuFU~N(eT=Bpo5R( zh6CUxLSF!IrJ#OAiauyWau4h%HB)OpqyPZw%^t}CVB%^+laH!-#}9?)zlEa>6M;Rv zPO38-SbItc-&`pA8*ikT5AqzE`z?gO2}}8|@$1^EaI{Ub*7yCtesDf^%U%Zr*yV(= z8rXmvr~fDs9)k@$aAE+plF756L=JKq+DPnfR$j;HUio$&juxOHg7%g_SAbwgSYiB~ z&DEVq%fd53gI1=k6t0Br+;LVV-w#ah&sqOD8dS>96SGa<+OB+kop&nyfaYO^)~Z_u z$+FWh^{A{mbnomZvwq~tSxv&2jA-?q%(LV_!LVqNAtyk`Cl3D1ywWv;;3a^E!%Q`D zj;dQO93$`aPNXYZx0xos1!IZia-e{S zQxgxMk-L#H%*y)oqL2Kr&9c_;fuABa3XfbRPFDSAHVkdJ6`axicJb;1n$}yKWUZMY zvk}j4(ss$UIZ*0aejHN)*+;HZs&C73x$#GT-j-5GepH<|6*$GJvS{5|0){N^AY z_ygdw0<_jbfD9JvzTaGT0TWt6*m)c0uHXz&LDZ{C5=8{H51VtsuOZ(qLm_TK>%rNnvQ&<}to7p1Xkh|hyO^OF6W$!KU!)c2 z*43Di1NBg3CUfX%3V*B-mPGB*UkDnZ@xIv@e;jBe!GAh4ql*ZdfyAIA;b>Z+A1A_9 z7|Qof{Dh+I5)a(srgDH27eB9^45V3!2Eht}~nA`evNs?X#rGM8z&fvTtF$gUKNR_aq3ca-6fUmcF2-Aaknc#DB&1dXSCu8xgcD~s6N?>JL!k9m8gK#z9 zdvOIdCb>BvLZqbz9I_cSMY%|&!+%k?^_QbfzalS13td4MqX`->vDWf>sSN5G6lqYR z2-a^_V;*7PmrKYG)O*+=6yJlqTbTAS^2}>6M}gqsRwc;Q$xLR@v$p7CFK5LvQh`kQ z3f8Q;^wk~HqrH*2MOt@@FdcFW9{|H&}HWD$j*d*Fb$r;8fw5I?%Cw zFK_oPnmk5d95{i#HAdDP@p~~v&j3=ny!JhR2isQDW_0RwApuv3>kQ0+7IAyGP9A(w zOY1lV4+$F2f%zv_k=c?BGB{`IeES`+*v1`a7qOwA(rI?%uY>sL3Gyc=;}cV*^eY)} zX z)>J}HzMgB@ED!YVr~}B*kL6KT>GW6uqR(y{B(CjjP?i?pu1DfHuK zACFO$=!*wFjjms4BnNJPIlHEQ~Fv%F1QdoxrFzSo)JDx=xMH^sn~8k~n1a zWw%i}x^JBPX^0lhI)Blo5;(-&eKa4^0Mqkp% zX;^kj^I_pa8)v9cX;uC3P2j~`fU8kG3-0z&pRdS5XE;+h4AI^TCa6q+B$s%gRMZ5G z2AJB8$nottD?M;*U$$YP0yBP-EPPRsd2x(%e3p-y?Uom-^h~K*>EDnyg5R=>G4? znJXChhq95fZ};T}FWmqQgR#CE*QJ_^{+GU&fxngi>dwS1qHQ@)=OjXje!YwX^%rd`nQ%`2=Kr7VUP?-Z@X59MaRPE#3zX+`^ zM^4w^jJD=L_IOZcL8aXCnd~oHCl9cCRyfzy1AQfu807SyVKVoEK85m^pXLMU`Lg6~ zl*oO=Amv~5YhV_z^FWtZfH+?tPF8-~LVcPRK4%-Sdm|Y1SVQsf4j_GnV(Z!?0_s!w zU*vkw^Uf5@Ot*mDv#<|xVtWG9QVRaB>*_%#IWe^O(HfAtff~XuB=%3B9CC|TcFz54 z1dR{7^cTk;0~)koEVERJP&)5*y@0OgnY_o} zRDAWn;CC_+4?KdWxN$AC1;QhohHczb{ms8v8G^EA!B_%A58;I z^#+(RT#@^##$GrE=+C5IE?FvQEMS>k#k@U>{ElGmB+tfL20@Y-pXp0b|9yV{(u{<$ zN>~&A$@f+)iv4{)YIcAItXQXbF*>)%dfro|kbQMsdMLC3GvO0TI{BaZ-I1RzFtMNR zw7IJ||95<%pz#Z9l)0g-a?vkcRN-0%iMKxH5L&#rdcXVzeasz!%*0dII z)_P}!$vq-{V)uUr3t9&jgJjzsky~W*pJHkHtb{RY&Tlc*^sJ0uf*FCh{AyByNe<5~ zN*%uO>$#SAAdiX1SXH+fZKY0b+ckgUk%Y0396CBVEH~IGerC`8Yja0tf#m4mE&;7o zKM?s*)RsB12@HHR<_?++HrWd#*)`;gy`GCa2Z*Tf)fUOL>U3Pu;VY^MjWC*B&C zfP-bk1HDXa8>j>T7QT2k;5Dz6J;)GNF3Xr(iDWH3vFcIa4QbKUK#2zq3wOY!eDC9h zXt$D*r4}J&m-egM047_|UNMKDJkUR7a?#hjGl*7#jqrND>-__I(2AA+`0a-3aOMK) zb3!=UEt}Jz1IrPuBEOL>X+PgaAkyp=G#(Q)nxXA{L$fi?(1$OvsZG<_U(YR8ht5=t zkv}aY1m^~3nMhwMl5!$;-T&6dZ};_mC46JEySC_tA z&ZVNQLI&_@4f1dj{{r^Qn%T|Qp|tpjJwmETCH<-bd~_RyE4y2s8?k7UY`zLmllYk| zP@KL*&uHwBp&cnA@bh2QeRy_!9l0`@Sa=l#=Q{DgG3(oH>oDp}h4Zmq3nq0W@eNDN zsx%5Az;24mZ~56lSEQjqSCM;wi`+*Ttn@+g2!JM6m;MsUmo($CAd$o;v;hLXM}i&Q?-zz%mZKy(uKDuNThh#j7@esvu^i(gWoe!+*Gi3I_$ z?uEa~R~*3pVd##yQ8}wT%z=uwuKTQH?h$Vy$jCq>PxE|-!@|)Wfh6`pSONK}T(uaQ zsuJz74*x}Zrj{nhWt3PcoIMvYmthPIS4Z&POKuB1~u&| zA2EmDQkxd7hNgVknXk6b$)>xzIlw^Z1=PQ+T=%T@`h-h6*p9PF4e|zEzT9NPhx4D4 zzZ*%Y;%fr4ji3#z@ObaL`>H$6py2x*zvkfsX#ZYv=-Q2*&C48YoAaY%WgRJz3opy* z2j&)ibrzl%G=ArA3i^at$*tLbmm2dgFgv3Ut9!Lkw~5?^!N_m_QlG}m8$|JJEJHO$ zhljW*fpsAf`5>{PVcv|oK)-vSz&rB2eXP)TzLEt2MBA+(PYaccE~5b&hDhvC)G+F% zS7`W8<(}8l3r`w|3$q>7AmF-^uH8X3_rcaX;4ILteXwUb-I1+5A>|?hAx4{53~0Al zYwOa@ya5dyOG-;U< zv3b*ucs2KTf@gN#K%NsJA5+SJI0nC5f&;lEOGayk0!!g@lxE6-uJ20b_U!;ZUKxg) zS>^+H7a$N^Nu<@a0AUV8y8&X334VHGC$QlG8bHgZ%TnzV=56>ye~?Fwv6Og<^vi0Q z$i0^u+=^cJIhl|z5qc(TrZ;v2R!y3ncwmsfsqhdIcDjR$KxGU(8|$TDj%OeW9j4(y zYV$WeKCZ}2b1G7RmlP6qLTzaOu-qcL74K%k*lv;5UOQQ9+hTXrk_rUT?_#Z$<_4I> zkRKmMmLjoK0_nIRzxXtvZ2&SIgC8EmyMpxiHZSnj-{&ry8Hw~gJ`Vd$pQOu^Qs+;U zmtHAD*ZPEJ59A6OUA@_vu}FMg<#<3jka8(aT)z_)Xy{fT%**=@f{bBaT*>Vzo~T^ z+mW+l#`B+`6H;A?=5l}sgIvY%xQzKYQ8HF>m&N6|UC zKS94cGvhWFp;4_f-yKqOv>fSxyR{^B#SJ%mZ=olAZ@tE>+BTz+Q8=LwaW z2F0jLR*6*Lg=H9y&LB^bXB<483=MThe)@t3=SP28On&j$)z-Gqlq##WVuial$Tih7 zia%41ZDw}oPkJgr5VR_Oi&uP5KzuMYFg6(cfs72-nXNT6UTb9LX=F@Yx1MTZw#Lwi zYG^3?;`zz{!>~U(C_Log|DPfLM4TaD&_EbGqC?^n0%C)qgoFfgcvM7OU_eYTIXX7< z(kF|hV9~BbPp^3QfCR0W*yxb($Y8DbgE7Hc;W6=n5X89r?z6J|A3Jq*n_Zu`I1IW& zn3YQ8Kqa-6YTM2&!l-H4GEEwSFe@uPwVwC9c>1{IG2t=xInzGhkqmvntHyucy#72m P0&>{mVq3nMcI5v7ozlv2 diff --git a/kallithea/public/images/apple-touch-icon.png b/kallithea/public/images/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dd671e245184fb12a28e0520349308dceed24567 GIT binary patch literal 3470 zc$@)_4RP{`P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0006m zP)t-s|NsC0|Ni~{{QCU&`u+F&{rTnb($wg-&E%=Y;GDkPkG9u=v(|mP+KR*9m&)U$ z(&w?=?Zx%_?y=Q*v(|k0`|{xK$;aWJzul48>bvmw<=^hdvDJF^`tZ-?tg_X6!QPeY z^xWU>$^QTS)#y6*n+avdeP>w{{H>p@66ZgyT#y}`TX?a@Xq`F z_{rj<h#;>@zMAD^2Fbow%CF5`RnEJ)AsuB(B`kb+l}V()b;u8 z-tET5;hyL6*7Er1vetXq>%Qpo*vR6cz}=G3=CIS}v&`eC#NV0t`}67Z+VS`1?DgKf z+l=@7@%;Vz$l;*x_T<9embTb}-|oo3-IMF|-R}0{^!e?~hs#p<*Ul$rMK9GyW5NJ_T%R9)7a{~^7!fF@Xy!jy7c+%=O5!_TjnNhW`Kl*6Fz1?8Ec;>f7tU`uz5~+K9p3l;`r-)#$g>=(W=4vf}T}!{3>{ z+>plLo$&YO(B`hf-k0X_)X(Lu$KjsZ>%Yt6rnuRL)#$dh*MPa%hwt~~x7dU6_~*Ra zi`eSD>GRph;-J>)xwO}Q-0Z@=+>X)aufg7w`TX|n_2B&e`p)F4wby^p<*v))rQGbq z-R;EF=d{}Ez~u1I-tEWDO2I-2k0LTaXg<^sv0qG72Rl1WjxkP4QT7L^dBMrxbUs_pgPg)wK|_uPAycP^Y6 z>od#Lwtn4W{xl^Y- zJbi}W*3%uXyugSbd30uugOxvPwyywlyq0qVLN1tB=p<|Y0v{nBgLXwhAWvRc?8r59 z5jn_WXcZ5DIb(^VRLRm(Vw7djDBU`8?D4sdPRq+^aaKT+Nw%5GD;$GzX_v@KXhHm# zDeH+Jbtj`I}ZD%}M3r>!z?rZGFt z7W1R`8E{j6n3PprLxpy>8iQ>EbG1$AXOr0GZm-y}b60J0UsG9U3iceBcUxqxPb6!Y z(>QjdY15v>V>?XIR)cr1Md*DZR`Y(``PCl~kJgwj)aSw5Vvl*fNVV#qcsM>!JpO_q z9Qxf}v9{uDA~3#Ui#e8uaI#gd z6Bt_0(gDUbwxH`U&O*Z1=Qx|S0iOiptG1wLV;tpIQ&fUnuW18zf^nHG=+`my8%kRj za?R5QoB_s@wxE|`XmuBj@5EEufE&QL-xl;y41HQ@J41d@H-d4xE$F=%Iz#2^#%nll zY6GG>`>ZYKwHSJq%5@IA^j}~Z7|+{+7QVynD%W|^@A0pCz-XT4q^e%bqne6dz@{VG zc;#R`VGX(s^C+HXZ(+}rG;O>l>H~c|+Ju1$J7ktLVd$|-A1@Bhx2-{^3(L{j-lk{1 zOwFJ`o@}ahXvWUwXqYR?sbQ9TZ7u`=%?jE|6vziiDa0{BS9LiEXvVJZks;@<^i!|` zse>EAK#yX7nvky;*f>nh<&Wux*EHK#yYXqm=1e|P`|M_m->RVF@Oj@25Sqbkx4?f> zG?c9f7Mee6{b#pdMOW5`!9w$ucHi0UBexK=y@{<<4en|EX17}g5wmkUSm@8)({}i4 z_DPlS+$jqdnok@3rQ~;uMNsyVTXN;Q=k=A6uWlEZzX+Jw>(%_!5uWQ3m=7HC(RM=g zrF-V%^d_BWMCPx8X7&mb=ye273#+fr_TZTrpAmdbZLmR{`CKjwo|)CUC$A^^3xw>s zlWnZOu^~Q?CsxKbHVDiOmJ9L}%5qOn8~fKiB{09-7z#7n;+}t)VlER`Fk3Cx5Guvj ztSOz^SNQ^SukYISi4re*d&X>?B+hisbcV(3)irH0I?Lw^%w6X~V`kG_hV>?6dY{1D zZnfyqpney^RAzFhR$yLYv*yvLT`q;8%;e5;fw_vbKxs|9sBMMT72hH-4_d5vr05%$ zLt7h@Ca&y^kOwN3#7i|7>zGdo%(tlH6l?m{C3#G3>Hbb&&hfK>$Bw>mQRb*Emqcb# zhi_L)T^4mU+xG%<-s@o#Gx!>RP#Lxfi^4VLo-+Xb=+fL)9B&jR-i5SejBQ`bBW}oQ$kVg3Ujoc z)ju7}t-W}+GsSJYMDb*~ymab1V!mk#wYwiGw5zf7rb6R@b((a!oacm42UJ02`%8 zQ6-;d;wEFVEi@$k$P8_}0CR{GsJ2*A* z?F~Phpp}!^0tA>pw&VQHPIPA)ds6@6SihK{l}`^;;hg35nkWaoW#XZEbosLhZ8K3W zb=>qUBdFtsQo3ss4}I4SEiVT|(7&o8z&Z}z9f9_fO#B!mLwl1WXl2e0lDERz0^~U+ z{!#sk8~HaAv}*MZHba#N6PPe z@|_BPKQu)PUlM8rtx0tTJ_%rHe|jg_nY6xwrdtQqAp)OnF}4V1 z|80raHG*?kkS={PhVh zU^)p03}wH8E{pxEv&^-?-G&_r)vwtyRQJwZ`TMoT0KxlSPoN^#& z+BURMpxI(nbg(prplPoz4F{V2jWWxb`{CbBq}Cj|HdttufnK?YMpActK?l5G(2dwpfVYnwpEcs2eIikQEv<;LDOC_&7u23fMzXK ziO{s+F^Aq41~i*}EdiR=EW~U2zN)(fXxeMjOZm-U_1zg7og2c?g`_qwa=X13GZ}QS z6+zdKns|Hv?}i1<-YW!X(w_o&$r}RrdwKta>S2J+A=vA^*A)M0e=4q24-|VBo83o7 zJog9TG2@EfTSo6**ed){h+i~RgE-EJ$-2AQ^RAGXZRr-dmgVz~` zwyjbQ-KF%Pt(8Lu!v+?i2UM2Hkhkcv`iB`(fF4pf(&07!*TUSQD248o8=7EuMpcL- zJ73Uo$mWH;-A@MHDmz>{Er+Wr^sRG|B1MW6DN>|J|5yD3$P}l?6F&u10000bbVXQn zWMOn=I%9HWVRU5xGB7bWEif}JGB;E*GdeLfIx{ybFfuwYFb@&Jl>h($C3HntbYx+4 zWjbwdWNBu305UK!H!UzTEiyM$GBY|cH99jlD=;!TFfe{hdMN+^09SfcSaechcOY6Cgx@ wG{a;ABePT>%h=S&#LUDT#0SfONT5nC0O}VJbn-$ql>h($07*qoM6N<$g7tSbH2?qr diff --git a/kallithea/public/images/browserconfig.xml b/kallithea/public/images/browserconfig.xml new file mode 100644 --- /dev/null +++ b/kallithea/public/images/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #da532c + + + diff --git a/kallithea/public/images/favicon-16x16.png b/kallithea/public/images/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..f41363142482b594391d9df473e71646491af460 GIT binary patch literal 961 zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>=yizsuOxmjdp-?lgKn;hY%T*A@`pZD~R|2iuaJ{_Ye*@Sr6+j29 zKi{ws=+rA9sf{rg^Z4@%x9mO zKD>Y7h2GO|%KJienGXNkBycqKG4Fv_FEt}JU$Wc5!?#TT9ncQOByV>Yh7ML)4FCj;-|t1lTPdKMg=bw*5krkVBEJGU9t{aM~G zI`H=6uRnE4Opd8XrK;MMQ{0ld8U*|&%=1}V?{H?qw6jm^_2yD9wgwv(bD`tHT+5746zfb|y;W$_&38}U-~V0z=3&JzyNlucozJ-o z_O4_oXY7C8-N7H`CwO&o`YuhN(^X4cBT7;dOH!?pi&B9UgOP!uxvqh+u910&k+GGb zsg;R=wt3oE!Zm>f=FR^A+8o3`J9_1rrFXY@!I3B_vFWK!9Lg5}ipwuz*Mf z8FAuRHp`+7S(J`;3Mg0?Vo|b@3Al_D?00J)nM27*GhmdFj zfFdFQlW71@>H%=&oW2|z2!O@in8*a0(P)%v5t*7V*Yaf=zFZ?vC`B@j0PZ2!b6+G= zBPec~rD~yEi*7!Cor5A2hv4u*xRL1ir<5$y6=GI{QX-?s94v>C5K*IHW<;tLz!<4o z&|%!QsEI%)3hhDjQK9C^)dHCokuGNJGMF+#iU#!w>76FGFhHTr*X|tN4l`*f)NsMkqI1 z)e5@|3$pMvXLv?y`0A&)anbRBTHVuv@H7H@rKv8X0vU8A2DYkBv;~jdrsA0&`Kd#u)j#kk` zwxvyFG_LL_F3ZLAOCG$<)9dwPH#2oF(g(kKeI|?bN-1&la-4_6__T6cu}G?au~e6!R+zxC7C>&DtcwzZP`*mUAVq(x~*ELFzx{!UR7 z@p*hz@E`257o01&`?OoTnv274$Behm*Kjmnmw#*7w&J<)hgj^%l5m}>VYRzhxkf@x zzFeBP{7BcivDED9w)1nob}5fTE=-G}#f_EIbUh{@r!c?LkXVEj96GRL?fZ^4j|bBY zhX~X8sn@pkmZTiHbYrZsCA6A9G(mRV*?yc%rO7F?ipQJCC6y;@M(o6-K?i*E-uk0q zK4~L?1s={8UJQr79@Vut#`|=5`fa(%opSo%#;mU+hlWeD&*)@j7iL+ize6fsS*^Su z(!I&{+0}@FA!&xsGoK3^ukV}4KyDMyCzFJIE3dsh>u}F;t?#(Kp>KXx-{bZkKZ3W< z&&}B#n)TR7>_xvt-#w)U!FyOA-s{s~Y2qsR42bIIM=fv-PUHF-{B zs`3v+Zj@LG;oGj~()MsO)45Cvqkst)KqC4D_!2k!k^&M)n<;+&6f$uGkwhU9dkbGK z`41r{FO$vU|35)Si0Xy}Hc$KvwR3z&e%;}O`o*@cXB4wH~qkR_fDbcaE^1qpk& zap^o9ry!5T-p|Bw`5Y#W&EYZtKu$lJv9r!k^!C2Bb3hq39tSXZTLQz@8SflX>wT|86E@;Dsu5n`N$n5D8AzhQIQo(v=kK)@re?AfQnFpM{Z~D%3TX3fM}$A zfkqMK5e{-UGn>SusF({uL&d~Ac4s!{kPX1qMG^$R2yrqtlbdS z?k02D8PI0bZL6Bv^_|2SR(SkSZ;Wc&KU#b>wAsPU;hIk23@d*8MsHmEers7bw0)BL zG(fKAbpU2)0Su2f<;T)*lIb&08h#zLe~SA3FIUztY&XuJ0`LDSwXAP$uD_+vm+rf@ zcnk0@Vz^{dHklXCK|`v zI}`1~I-RF>J?=Z=djjzPliR=S)v z@q7UT?%#nVV|EHZ$o1_U_CxUf9RV2dJo=&RnDe(Rc}=#gStNHy3!8>#w*xzj|4R=0 zo`G%p8-(9I`7!l;+<4cGEuRH@<~B!ndE;U|jQTiL>}CB*Zv0V@nK=RT^XwmxvDh(9 z<9-3RuVzi->eTRi_ST->EkmyeX~WwOKZ+U;&gY8-yxU>ThoRqpxMxRDwo<}hBU}q2 z+IaZO`pq%pE#h!KS}+HnhtKD4(_e*W7`KmREJp>q@EmTutPFm%@ni5e&pLP)U*vxS z+50WGkA5*z{8w+d`?)f9rJ#R)5{=(j7PePZ%UCV5Ub3aIYxSv~UN^okgC8*65`#a- z$7HF+d^Z$7@Z;8BiyIfuZD_kM1ph|d%W2@xZe99fP98(=c_0&uIsSXq%Fs*W#sjG$ENJU^>#uz|u08C#7s0u+ zPIwQGp&si5Ua<^pGtT7X{|hpGNI$L@=CJC9@xkY}8?RVkEzja);d9dcnBLmx*Xi0y zw42+BS1f4fd;E)^Nz&KRkDRSTHqBDkUh71GHGh-KJJc^5QGPI5d>M>U66WxSc3=%E zeHHDk-24ATD`ViD0d%kBvu#ZMinOr?m7F;|*R!XzkF`1u>9M1nEqhm*IK_hYAe`+F z0~X*coKpsd~PtF#GTU+@Fc?Tl$~4v*eMqv0rWv zo{Z;ZByRsc{5Q^5cKmEvzqg(E(Qg@obr;l%>iRl;)wol3e82n{i_^qTdj7ayM!=q} z487iMlPl@3#B~$q(13mN0V(`!Ke_MjFKOZ@e=KizmBP*$;Jw@@N0#w(86KcB2R;1S zJ!#_SWz(r8{j*_h`_18V1zj!`cYyu7gxmkWOAo!X{=PFZ>i&lB1=>8zwV#yXf%i)8 zEctbM=$*awH~*Rr&ke-^`#{(OJEeGVcjP4dUTSPp`>7xkg^0FS3HTqD;lb}4_{U~W(Q<|-L)gtjZZKH9Bm;%74L-vcW1ZT|-C1+;z8uLj?z zgf`=NUy;QBXtQ68kF=GNvx@H&_GSDTTq=H4c6|RHlaFyEnuDo-9mfB!1omf>#u-u1 za{D(?j4w&SxH#}y8;)HoWh=w)N;xhmMopk5~(cMHxh~CO*;|xaY=P_E#LJOp|d?62X z5@?3e(~(wd`8nN;y5H|0S|B=-XY@%Nr&`b0jCM2H=wj5KMf7H(Yl!Y9I+16zMzrqC zdxWTxacD#7CfeoD`W&K}Sq`n`7X;JH0%}L?PwQ%qm#6U^TFBR3{zx%Ts|V_b6fRFI z#i%9ua-Zn8jPrcYnJ@LPnD5YE(%+pPM}GlX-^OgL>GyTA-6k>C26n{T+RDFVd@|^F zwAWR3mp+L3D{1n^IlTF}D8E{wg}JkEX$!&dz64 zmW#84-7BJXl*)W#Q#0j_dRBGf=K68u>AwGL*|hw8|UpLz3ge{Uz=F?(-)95PvbQ5!m8exHENx?=Q{Y)XPw-;$4AT|1XJsoV*8& z6*0a?)Mjj4U*7`%I>znA=iK^#Mf{EO#gN~2jIF@DU+daSNpvFf)i`$0{bBrr;w2ap zR=GPX#>!MT2QYzuneLE*el(T&TF^$mQv8kXZYK!)GA{S+sU&ebiuK?ae+=NiIm*Vu zyOZkAdzk`x{EjSdEEuP8c$AIbPn#pzsTjw>_<2x&_TKS6V)Q2U17g8EBbxs-Kdf3Y zGVVPB?~Lv6_cOn|5)aDAXU=0T*%-}3>4-{UDJ+aR1v(u@mJt_#lXXHo4i z$DEV1hj8Df!JqU7zTey9+G0LAhhb3~{N1=8zIW&2b;WeD4mr6JmTP%4bFVDMzNYoPEmIDMCISQ`@dD+1)k;8;sjpZ4)*4I zqWY7)+EN^xFZljh-jkE-cOT}p$;9D6hK3y5NHShz*N@wFy$-dJx9fJsu0frEx)7++?O!ucr@p5XY-F$V-c_gVS{@O_1BJ`m*&9-LnqdZYUc^F?KH`^Y{- zeSfIWG~O&=+7;CoW!TY`?Ee`Da@Nwf`1@<)QT+S)27-|5do> z+_ty}(RUGMPda-P^t}7s{l6UMmPW0aTWD^N^Up938+DCLoRad5Owk_6R)%}v`B708 z_<}J7)${*91Mld=zTZu4H~O!F`ckgXF((F&el|;6iPhg<-y7z)rgv+*|B1l=puqS2 zLjV0yHV(d1C(niXi6_Mv3C4{?S>_9#F_Z&b#{YncwhZ2D(GC&&H4Z~PrYLo&C!kKj f?wER-XkJl{WuV>z6?WZPsH0GKKwSfMKh*yN`6#;- diff --git a/kallithea/public/images/favicon.png b/kallithea/public/images/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..e63f713ecca7df73bc4f7dbdf9e5be4dcdb68db4 GIT binary patch literal 1318 zc$@(y1=;$EP)&Lib=0qQ0W92$HvIG&mOmZHxJh&w6(D}%!goBLCp>)S)!-}_5y zv%(x;TBYIu*2ICa?Bv%~w8N`92AlvcdEq%mIs8egb9x!goXa6aH&+p$cVJtysBZPT zDP!zVBpjc2F+DT`WtTgwx78Wl=Bp?!fLd04%>Z?ly%MkiEQ^jctvk*EJhyOvc2zhY z1&+H#bfvGN<{c=W-iiPQ?#N$HY6u=HjESHKC%oRBzKVGV(ApgkxRAddPNyF%jHx23 zEbw~geHA?iOu8{Rkf9lm);O>k*C$>kR#Y^q;RTOmrtm|-~J+xy`AntW% z8_k_bI9NBsO$p-p||OB@aeX;uJLM$R|K#E z84o~8I*>dS+aU0+t0T#aBSY(IDGp`s3_vpVIrn6s2p}=AeGy{z1C|P(PiYLSi-h-Q zYbjn4z-nyB<;F6UazO0dZd3vwN2W9eB5gCfMknUFddyY-aDLV!B z$lu-+lvso+Q{5kPpj7dM6WeXjFA%mVyaw`Z@>FbdO#p$WN%@nl)EdYiIz_K&iGl5l z1hxWM5#5V$0H{NF^E2n=|DB{|0nQGcFSiKA129DqJJ;r=ytgXU^HL-f-w1L9Xv~WJ zP+@A>HE`>KKMbj9fZXDjqn1^)-$l6!prZG5X_poH{c4b5oep5DHC&im)`7M1Q4aJ6 zL6;_-==@SSr5v!(KHx7=md;O&rh>x_XK@d;pGXIeRt*4PS+dE^ldt-nS00`iS4@!u z?ctrjs;~~Y0&+ia7wDito@`&(HBu8mdvp9K$}&I<*5RZRU0xV3xdwpMq4=SO@$5{6 zpApg-8d}zbyN?&$U?l*6NK5=1W9bqg4U$Yc(Wmk;Rq=i1FMHsPYrr)Wvo_o{Rw}0| z0Dv{kJ>P*o1~Lrtp?EKyYHKxzj_7yrNz4d+^3;sNk1@T=Xl0X ztExBGa?RMq_8xRP=LzOhVB8W}(LT5P%uNSS)DalLxKF)&>pijcb_?AlFqpISg-CO} c%$GF$13ZMoe|D2jm;e9(07*qoM6N<$f=o+N5C8xG diff --git a/kallithea/public/images/kallithea-logo.png b/kallithea/public/images/kallithea-logo.png deleted file mode 100644 index 557355d3fb0c122182e85f7dca82806025b54d44..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 zVoOIv0RM-N%)bBt00(qQO+^Rc0~;3)E8{tsvj6}NXGugsRCwCuU1@X`MHc=lgd~I| z>`Pc=5e7Fvg)uq`gN!4hsNgb!3k=965JW|eq6~-x$dOG)mhpJ>j3Vk06z7Ns@!)s{ zl|jG-1`&v02#aA030cTX-ZwuGO?Owl?yl~B{W#vA)vxZo^}SowRk!ZFE#L!DAO#Ij z7j=+?3Y4Q5Wg_YaXNA0GxDdkFgx%tJ5VDdzs+x{YxExoa6Ee{NDG-RD97pgYw_^*w z!*Rg?wC;-+kz{D8#u&VtPykV&18%}VT!AJgWr2$U5T)3Sb$lP&M5XUqH#W(PB0UIr zw27TKle<|>dpgF~*qgO|m41&!a+D8*jmfX-)#qsLWYhsT=jb>Wv4f8q+{G%3j1ghu za!$FaR6)iq{CndK%;{hZ<4#8vk%_JJxI}z)C2!SHdB4kTK0zY34AlT z0*JTZ74*=S)daIKjeabq)v&%BJ-&}s5|bMZT0B&Opj^z+Cg(EwsCJc8?eli32Z*xD0^I0EF1Z6CzmWe_K@ z2YEP(YGj~2x*#(q=PZoj-#i>b;MTV&OMGEP%T4uwsZmagc5APW)5}(Ijo1u4b{-B7+&fy_w&D zmeTf0%*K0mokboV#XiNu0ouE2*%}niQG+SCR`KXVyyE0NB(`87s-%xD!v*&J9Rn27 zKBxsQm9`gSi70U><4wi;su{YS{{UT}m|&anxl zDO{Nw#Az2&{*5AOdq>Szy?mn>3P73CU!1`=uB7b40cm?H==p~dXOTudX=^DCxsp-45Ym9?sGCT8e?vBx`l(%`%s0DXgIDW&X`W)5d zU^gQUaw%R=9xEGR6z;@UZo)1cLp2(pBYGkWZDXzpAK+sTS|`#P1OUw7zi3a@tYA4K z4t`m{t32t`l;2u-?qo|ZJXPcfb#V%_u-^f%RHQku$x1w@+&nl$C}H+Nzd*DZGvUUE z7>nM(OCDoi6X>Y%E3LpB&7-A}KEO0l>XAnr*C5ACMFb1+oJ&WUmDVF$xbsHJNWPN} zZ;?JnOyg9ZaJ>)V-DpS7RHRYFXbja!3+Jq^JFU5T4bGM&mhLBeWNW-;0>sh?)D4A*Nj~fy zM3p#-6NaWUI3&F8nAGs}!bFMQRq#9M3V<&F0WfDz1h{Eq2jrr?sh8zC3>DfG<8L*k>ru=#l?{!l;w zF#~fkOrd1~CWsFM#KuqJRKvOG2YOH51i%J-QIY_D&Ov6IDUv|M#|+Bv_rtZy`dqBM zWjn&V!XC4`!Av%&|0COb=2(~WmGBgDNHB5r!2vYMFn|MI9q3HwJZ0d+G2VZk!2@uD zVF(4h&=a>hoUL@|9_L^6a}~n_=pn-(4%&xS#o(33naZf5lN@y(!UJ%OVHk($E=;&4 zr&K=8as@o6IL@yEDe(qql<6I#ndrn6KB2r)D&|C2!N-Y29AOyBPkMJ$tj#GbRlrli z$>%LR0EZi{f3zIvOy*=sHuG63kM0UBZe=p?Un*?%C9DB!8!GeO?5#S5Uj4Ts7i_Hxxb zOBpe8hB>Sg_UQZo=uX4A>6DuwO}6J}3V14+>q|+m@QH&A02T9U$35%ubp<>TE?_;U ze1amsb{59`8#gZ3`yqE+M6eWpbCrA^2>At&(W59_l>Qnk&1WscJS^}E56|Y-R-;Nk zsx}x4atsjKLgreFU@qqASAb<2y5LG&hPG&cB$VM0cVP>5h*RMKRBZyt>5(!6vUk*K zEYgLC8R(Cp$U;-YpG1^kJ6GWyaX^o+N8$|z2SqvmYZ+iD`V8M`=eDT*em8xdwCX<9rR0B@i6ciS%Ix zaxe$>fySvAjaS(@-T;}?Y@Mz_vN|q>?$;ltU@EfV>_{TeAB&yl2Kfh2&C6%!7E~nx zNGBs?7_wc}f9a1I&i3ej0YuHWn5?jX>l+JRfoX8J^a>2eU*ZXnd5SsZOYg6jFjFj!7R1Jq!WUIojPYW-hyZ|yiUQVO8OmNG0CMdqK0 zC|<)JOK;m8v#|F;GID1@nU+7}M@3=F1K46|Yi)N^8@2_>_B`$YvickgA*~TAswKq= z>)L4=_C83?%MDq}#MM?xx4Pz{c7I1u0O?h?J4@~?sL0aNMqUt%X_6JE$WBxLjvB`Q zJ$?Wku%tn?f!rI_4c45*{dV6$^A8{+HT1yC-4x4%ISC;N6L^V5!G?GY%}tHf*kQ*$ zn8Pa2!*LvsknnOt`LL!TT!I&j5V0v{!x|NP*uILIUjUVwN>X00T`SrpK%xw?Sn0la zo8#Gq8LZE?yaOvSMslqB40%3{-*!yt{Mh8$T+L<<`VElyr02Sn-BD7oizKU9z|H)E zdlg=4Peq>GL-eRALA;tP*~+%p%@TleT+4pa)#u>O(YtZIw`C^(Yf>P}HMH^5NCBGd zT6W7A-(FDBLH;3*@BjdBtn~eN&$LSLv|MTx`O94N5wtXn#r6g$*kDO%UlBV zjF$8}Sm+p@NX`x&m0sx!vWr-F2k9}MK zG(%f@7C%*H2c4t6yf@TnSvKNQ$!+OgO4GTe08RHGy*a0Hm$ESC5ia4yq33xpgU?GK z%I9FKYSO#;r#(p*Y|n@I0S}qD7IGFZPmoA!*5`c5z>n}gbDo71pr?G$pf>L{rNexp z7t9w(Vu&cgbS$vkkhZ{LjB@ZF`tbQ|5ka9p<#GbboDrpX2Dz4+d5w{aY}*%XFm-@5 zSDwI9i$oc6kb`nla|6u6RGYxwAU?pJcmM&S0=bxJ`S3(KreQ|RQ&2DfX;PrcY2pkP zV!FkJo{Gts8>2jSP*Y6Hh62vs6P0)Y(_jvstc|f)sC0)U)D#PRUmzk}iU@Mh$k1F1 z!;sF2QZN!~ip62$B&zrlDv@gnF%Y;LDcB%^Zd>{LGX z2cY(*V3(7K=&%W?P>9%wk@!~e&^PtBybw${fK{4^xn3x+RHV5ta)tnMM{0 zIbM$$XlK%a$ahi*iFMG)qJ0GWgdd+etwH|>GZ#XO1Y%=L0000bbVXQnWMOn=I%9HW zVRU5xGB7bWEif}JGB;E*GdeLfIy5sYFfuwYF!7u3p8x;=C3HntbYx+4WjbwdWNBu3 z05UK!H!UzTEiyM$GBY|cH99miD=;!TFff3|S0exb09SfcSaechcOY6Cgx@G{a;ABePT> o%h=S&#LUDT#0SfONT5nC0O}VJbn-$ql>h($07*qoM6N<$f;AgRJ^%m! diff --git a/kallithea/public/images/mstile-150x150.png b/kallithea/public/images/mstile-150x150.png new file mode 100644 index 0000000000000000000000000000000000000000..914b4fa54baaac3da918fd24be269f983fb46b9b GIT binary patch literal 4018 zc$}SAX*3j$*B)7hv2R%#RDMFp*vA+xmh42brU*%ju`eM@jKs(qHMSa+49!?#gbZVg zj4eZk88etHA%0|w*Z<@D;r;Ob?>YC}^W1x$=Q-z|b3fdt*KE!BLDC=q0KjiyZsGs{ zunGJpxjBwIBTX6?jtht16`Lyn06vTNz>D)3pY}F)umJ#K&H(@kPXK_u<5t2?03aL! z04#X|0I)&;Kmvhowuc`NPTa9FGXWeSvj)B#BVd??jVW-J{gi~DYMckZ5C9F6-=?=rykHJj7VIfek~>F??Iz#C%1H$POTo7-nKq=UxA#VPF7D(ILzH$%59 zBf|-&0FOuYH$LC1wyM6vCY~wOrEor-OQJnR!Hc}{OU@D<$!hZ{kXZOOx4)}Wr1xir z5E;KVxUouQGx;x~_Uk{bY$=^0j;{q{-iUbM1o(GEss>V%3OpfV>_a2XWgJ!-lzLKc z?R(#|&X%Lmk$}`PG3FvHbUT67u)03lyhMFh~xv17GkZzx-#7Z0~-Vn3tOIn}RL;K*o`}V&AH&e9 zOuJWjky5(6YFD%F_)=EYq=Ca?@e*!CVUeF3>CSYR`+RZd1bJ4fCG+F(6A)i}B2;?6 zBQ8EzvfJzG6aJr$#B5EtI(dFM=3=kc%KhqTBx`*dPEpgLUNG9#b0w(y9ATzR001oG z0Sk4juYbd%EX3|2(|UA(NB9$+OXY%T0T)Al#IaP^mZURbl=xOm$hdiEA2sNnD##pxP$P zMcJW-z4sG$jC|Fl1I5y1;fT4W)ljiYvP@jhWsX*3LMhYWkkjc{_SkDo5!LoaPCzgx z&wZA=hmnQXoztB_iWfgW`Lt_i0v`r$0}X_#%A|+>ctlTN z*BI8Q@fQDJ9AwNJ(%FZ3XksmSya!`A6S}NK{0B^Pf;r8?R+e`>*=7V*{e@X9t&~*`i5qs+n&|G}swm?G{G&o%Bmj zp(+^ddQYNrt>ho)guUu*Y!amnh{}G8ef5P=zCyl*^$A+-#>W<_6p|aVzh3H-eml`C zniDAM-xW$o+|@yxxxMgUd_7e66aJP?W0vFIQzwM>?>UUSi5p%~?#@k>s94fSR-;i( z(YtfgXJr&U6fpp6_L?g;Sk;$^Q?glwPG7#B)Z4sxj!U*{){L6$ZapDK)g6vQ-SNB2 zG>R2c_SahN61y%(xObFrW((ZaeE{@hGz|5P-+{$@wWZsyU!^4~tfUD|f}v@DLLR1# z4hcp%wN$zT1elg8lv2fM0R{<#@(q9W0{cppB}Xu0vjh)(tVVydY!?4VeVfT~_%YLh z`O>xLbCh`ok9$kSueD|U8rx=0nC%j|;hQFvh=g#Mc}hlfZI_6WVq%|g7G_GUXZxqy zKcUpL{az|6eyw|bA`=)~$ufvjsd5<#;0aueQrb_)EKdhJ&_ZK-9?)~prT;pM-(O$^ z;W$_Z-Nn_>S3+HC0j|#L<6wHY|#ox_1>9~8* zCA~4HCakB=4G|R-D1l{_5iJT++fW;_2zXhs)FcRnf?*HDM)3{ayP{1xpVh~D-4HnW zq~xAi-KMKeWMaiaKc`D%Fnd#~ zBy@G7I5O(mNO)e_#Ix@u9?_5M^^8K4XveaT;M$AQmOd+8&TxZGvi+?;J#qRpDQUTN z9A;Tj1E+XVV9fCuN82kie(an*vo{yGGv~n{hkBjZAuOpK zk@`p1Jne2SO3E~IZLFzq&6YR-Drxf0s z$=v_l=2{e%OUkaMC+M^{{iVO(Xbq|r)=L%S-|oUoCZG8^1%u)_x1x|)OyO9u7?Fp{ z@PZ9ta&#xy>C-EQc}?S>?uSV|bJr4h^SaC6>{V75f|oX*!na?GJDc4QiozlD1KYwE zkgs-;`AvL(m~^<-f#gcMe_{8-+`yMgwKCu<_x*r9jBA`u3`*frR6vEZR5!CmyKNlq zPE5o(tF#dY5{2v*>ck|NM)i-YzIkc~(oeG0s-Ab{{g3#$+lVLn(cnxK_9xwX-Hg}u z(?Q=H5rsp4^kX;EQ=`PvxlsT1F{)YBH%imV zH5PWXOX8ZTS^yD0DWD>GZ>xDzqyJWyDrt25^_7%j8qV8S4cc+*>mKJX{TTNniZta^ zorKGgbH(E2k_I~WROk+cTN)hEPq;lYJZF{v`jL#Q0IJ}cUcD~Q%kKEPxyuoeSl=%` zIN6k!R?%9=*IPe#Fr7`rPrwW&<&xuEw>s^|UpFV&)VE6cs6ks|%KUz6^TisuJ#2Wv?e`Ahr6v`9my2AI-b;N(7H9AeF2=j4d#s-9hFU(h+a#(k|FPWl!%gi#L=4xS67m!eEWN8(xBg+j9-6mn@t48GQ(!S0~{KPse%p_LvdqneK#FLVxtB zDGR#>`I=yG!kNRQXTPHdJE}GKMSm0ueR%$+^SZ2Tk$^z^5Imjtx5Z$`d1{&k&2~j3 z4rf=!$gOz{ml6~JK(c0I0|p}Pth;=ipw8+y5g52O%oG7wus|aPLr>;=Yrd_e3WHM6 zWX1W}VdW%t2$^wnStC)?y2Iw@!xSKIj7xSs{Y>msGj6(vXNh^9*XP;ZwD+hvM>z5pfY=snr?uRLtavTf1 zq(9Qtg8Cgr$P^D#p87D#3G|#H?X<9OgC;{Uhk)-q$?T8@D3HwBg$!Q!C9sCc$#lsL zvtcgg9m}LZCCJc=X_U~F%qt~FOTT?bw(`=NME!!_Y-wgTz~LeBt=Ps-12(jS#F2D) z!kDyS+qorPqsipa$--PpP)MQFE(3P!@o+OYl0o9^i5_`+z8k?j!an_LsV@<0Q+MhO{AvnteZ-f)rj`y zi@8~DRI+i!+SmT3Zdd?8dq>5pA}u&CyyhA?*$A`R@pQZ{JV4)-T_1m+;+q1%Gb@AJJ_z}#o7O{y$5i`^POm%&>l#jh0b zS7E%Y{I7+N{s~IC$X1D|pm%y@kh;enCcfSQzVeJ%q6@i4I`|Z+#lKC8(AQGX^G-Z= zxA||rum4~8gzjIe6MAc{b6Y&&`0G>%Gj$2`@e1>Wd58EO7l0;2Lr)E&rKYLpsHp|h z(1B@dt3Whi5QsK>SonVt9tQdN-;Msi38r5D)yD+q7)O^d2d~J}h>)PW{ttXlheacN zPx~Xnya9kHG;@QGJJ?A{>8oA;fW^E6fL)&Vf;X?Iyr@;K7`y0clLYNfA9ndV$J6~2 mW4)vS5|{++PcSdDyZ~5|5Dwcg(#b!z09csXn$#G1CjAeUABOk< diff --git a/kallithea/public/images/mstile-310x150.png b/kallithea/public/images/mstile-310x150.png new file mode 100644 index 0000000000000000000000000000000000000000..fff91040913fed0c52f96c40180b99050d100792 GIT binary patch literal 4343 zc$}?QX*ksH*Z-nSB_`Q^*|R2QP{V{~RJIsOLSpPqwu+buBTLrsLnt-eZfR_V+kZ=IlWw}D;0RX20 z0E-R)p!pU6guK$~Z(U{u*qu-Yy1-#nLT@w60$~kJ^gxpwB0^xu32Q_o0D#jBb+4NH zjs2bocq=gD*s=CQskC?l!^h@Nj411%?!XEf7a-ir5%}s3PDDwoG9aVh`*wODjn94S45J6H4Y;0@m^~!n z&zXNUvY(;hw(!3B?LTURsR8U)IQ(A|49_SLMt|9i=fwvFi@JM0WAx$eB^7ZzVP#tD ziS;P?5%a2qN93wU#dUPEc^o*XH6}Iz>D$nJf1xd<2u|0uHS_tsihzWpo~;ec{hO+$ zGrj1Zop8{dH*5vJ?CmxMC)MuEZ_J7Y=EVAtK^yuIDb`iA8pMZW%y z>%!+Iil=$qqe?P}N88m~3ouMF0X z3+)vAZjQLQ^@`-+bQjfry7OwXphkjRjg8lwzAiqZzH!L9uc%4yb`T@rWm`VL3Jez2 zU+{&af=-TPsS?4QD>C`aQrh#^M}^bzV%gF{EyU7e$$S442TEZ)HmzP3e)inbHD2qa zRFs{9&g<6x>QK>Z9%wK&`~rEoiSB(iaA2h6$R4HlH)Jr*NC?j3KJKBMQ0G#Uux(Vw zGnt6GQp+zi`BLKX)zVwU@G5u_#Egn+JWZuNYn8%Eq1T-QjKA4MYfsWt?T@SGB#TQe#Fl92|Qo%f^9KuOSbkN_^EA99qwZH8x&o`NYagb=kWhe4P!l)@9<8NGQ@BE7yed55teq^Jd z=pj{UAG7*cOw2Pu^dDk6FXyM_KIuRLJnvE*v$}bbhTHbf9*MBtk0miULLz-6Zmx$y zl{HpMzZ}lz2$QGJmGD$O)u9HkeY!E3m9co}<1uWd;9s}0?e?g+S-DGIS0DPL3lEl5 zOzY{db4UtW0^!p72BS66prmw%hr=JObL)1iXxw8Wl!?j2xuaMLg(n0N6~N>#Q4+bm z*U2$K_Ryfo&t`3pU>YYnPe>=X9IN)%Ykz%`9#$3i;D<@Q)P34Vh#D*c{nHGah&30@ zg*~C1p6|!m{vucy7M0Un??reioW2u|;?NENrR08BQ(6CF)R?lRFRd7kO01ol-HVJv zi_TyBN_p}2K>WG?C&YYoAuLdF(^|Izn-HOikr- z5L#;rs#@Bv)}lXJd7vD(Z}iy*`JPtIwsiG!TWq(~Pl?3`zfU%ci9nQhMt7|_OQY5t zn#~2-eTRps3qcpvt?jnwNi}?*ptH~HtOPj@%?(g__{R?_8>Uq6ddh~__Az%N$|Y-S zW}kd9Py6_XLPyHdA0BzZ23`#q2O38`Ce*g9V`cSbN-t1E6T?ZKwJ#)RGU=GR+K z*gD_Z>=l(;`L#t$Sj~p*HLKVg zJAsOgL#b~SG2>HO=$Pm?33~$BM?+*7+sZvHlVvhsPux#8+G##WQQ%_;qYLOf3uiX> zOgY}j_R<(Ca>~ZU<(-1e3pY#ZIVE-5sTF(=6K0HTsa8xEld%&WOSSXDU_Hf`t2ui0 z+Ron3vwbQ^gEgUt`B@u+Vud*{voK1oC1k{@QGnEgPj;9)i;f|Bhb}L-VlsCljm9?j zHwUK9?uN=OUgBOzLs#g0z)xt8wBq4jW81)z<#;PNIUW9Pu4#gL>AQ`Ni;bY)^_NZE zWAh8jei=0#cD>81B29z)gH_KF9CPRxnSIAwE1egVIVJKI%S(y}Zek0kRtk<|Ywx?i z2Y2E}GS`kJOC66wy}YR{3SA*CmX;h?*SHd(Lhe-liQkiVS43gLlV(Z^C4vRHtAAcp zb!qv418wdUGHtflO~?;vTJ-d=FH-0j+24-00%XvGX;0HL>3q69@^T9{<14AktbKc= zV8!Q_fsFC#ezxhe^_CobC1`NqZ9u@&%=&j=`J-Apo{o+#)vI+kDs7&2m!f@QKldCA~>cuK0x^1}rUm6d* z3^mLD$(q)Y<-)GT&l!NeZ-pw4Seg`DO`VF9L$8PVK-0;quCdZ$ak5XcAR-es=~=w3IpVi)3uRdvSX4$@b_w!8 z%U4FU=5iMr`$@cyuTgz7YCk+7zkKOiqSw3Eg(X=*GPf#~*2~<+j+TmegKsh-$r6l< z;sPHZz|c);SuV zPFbH9h6+(e?O#PPrJ8S3sh0L_txL~DyFCp~y<(%1El-3!F zR`dRK+RN&-XE>MU(G6U*pe4UvPI#-7jBahF@oEEfAQUR-x}+hb53SR$&Ahhy^8Nfb zsNhdC*l8*BsnZSF3KsHd4}Nt`VcObQV5d0J=A$U4v{W(58UruflcuapQ}rLE3QT5T^}7WD6#6T*uzoL;cSn`J!0OpMXbQ_*h^`(5VGu zoQ;2`yuC;keWFdeFar;niVpA5B)rYE{ArlwqEY?FbE1Tq0-TVNL*KY=>XCiNlH$(z z5pae2J=FGt%f5+ZhtXK(Y@g>f&{*d7a-kpTk%fKL8v#Tv>zTH^c-HeR_etB;Q*q~+ zV#g`(g+9g~2WeV^3e7Fe2eTbas5b2X?JwwmOG@c`+6|oVjq`?}D3&RU)w9ChbHrja zoxL$E1zb>3g+o*>LN36~FI?1ARnvs2DXLu1R8e_}8YBLngomE@-0u7T{|VEAPG?vN zckt#`STjdoNiT2D`)&^~l30H)jHH_v))@f&(x%r>9(!zg?p*iHo?gQlGk`;y3+l|p zC(Va?#m~VfsT%@oy~iP4VJ_J-O6hFtZ4+$+^@Lo{G=c()LcG}ZYidbQAdsg zveXTAwJiOZi{sAqCx;q#R+b^N?=!8<%=VOLcX+s4qX*kO>d$q|8Ao3s-fI@^mc1Z! z_(1!iU*?11vVXH{BlKpx68+FUcLmYQC^Joebg4%StImj`sR$_0v=%-|% z<1hjSAsn*ILXdm>o%@aBn1hHi(#Cg8fa?3SDAHCZ2@~P?!&+LOlz#Mc-?}lO(C9Hhv`^yS8`j&G$AtD|+RAOk8dFZ5tg>lzd$Zl_Q?=Q}PU^S&Np_ZIKYBo?=wAJG zF`lm~&4g|`cyr~X?~oMJP<2Fi!;HQqZ|Igivv)t5Q<0~}mi8=>RGlXPq3o^k&((c||l zFl?_F%8=rOy+@QA&t!tssEz8JK1OReT5lS0an{PbP?r>Q%ceXWaE2 znmB2S|~0T$~sY-irR3k^}J(s&;;#ChhnxrKFu{=Q?@wcl1FrVMlA@Ve}=#<8oK^op<`;cW#>GHH3I(wLLi#+Sp=Rl#wmn zK8=B`qA*fzF&2YfD5-dkeT@s?Ry%OS$JsIFFT>w4u=L5^@(C46boyU?pYkJ|hvE|~ z_Y-x@@5J($8?6m14o7?f90Mgjei?4kj2)4xQu0ZeDXW6LmAX)pxQI6GIGR*j74Ru{<}^r;gG#M(+_SSngphe(z+exduK>JDt(# zp8r}^0k)Xs6(B)MN1gD_Sl$4+3AN?K>ZBS+l6vrLv87Lv>h-e%9gQsE>~*7~@KIoI;~88Zh|axPc8$+vN7K~BPpA6% zaj=woS&zfZ$CgPiN8Nr$rxdTDjb|HCBvGrU|Dvru3>~lUew-CG7WNAFxuJ-*nvN-N zY83gVc`aQP&prjMh8zbMl0C{B<*0X#$yH8nal%gJ`W{xggkHy*iCa4nzAEM6UZ|{q zxAM-_5*=08$x3F54N*A$ISh6;>Yj#QzF%pSr;audzY=!}57u`dr9Ib*)x+0ZYsm#< z&x?ImzcwgWp0=Xv)kD>Xsq^_-zrMcbkw?_Otjqbtsx0-LboDf{@Rvp$+=qy_U zDiR5WF{y38Xn)5+ran_1rD;FFYD%5@T$Q_7nNVd1?M)f9K%pQkcX@t? zb;}u{Yd%6JKuNu0LQ;mn;XkcT4@j5Z1X8*-Zshj5tt;5_{^u?tWW&@cSK--Wij_Z+ zbZj;I=f8sEHbFD3iblwe49i}(t-fj}8|3!{JEm!#Tb1%);Om#0ICI@9OSxh+StIEJAP^hz=))__V5}i-j8&Pq zas9FW$>>ow2!eE}wFE42Dm7g86P_6V_KE*1T6}RD^%Er=*lm6t=v)A@jlK;q4}Og1 ztuuA5`}z_)CE&<$i2=3c3KS=us9U`x0a4fE zyZ1bg8zMvt1dj>b0UQgR<=~?~i@8LXAVv;g6=P`cPw}ahR__((OaCw)3cCZeK2O-X zCTUXeXa7kdInl-zI%9|l?%3P2NnYEouQ30YTLK+-8@>!|4>l*?)9D_4i7geYbS6RV z80hBM{iad>4zQC2iXWvOrI%Di)%vBBLq-va6#Y-kaWTcs3tHW~vD2y%8W#%qwTL2w znN({0GvP=@<9%ahyK$MeKK-%HFC>aa<7D$*E*JaP;aAGn>=4 z`Fs@`)&_fz^m|GSpdjVZGyX0?izU_TImQF9O&dOnHi(s@$DuKq+BaMRj)2$N6$g4I z$cA#Q&d>Lib``yMJ=~!@N?}^0yrg)BsL(q$%ZZra@2<7UL$;`)yMcqyS7U>>24ePX zA61v8t>GUB; zp9O(^qU4FzzKzP_ZP|+6W5C43=C$M(b5CMMhvJ@3RC!}#NE-{VfDso98TNK4r-z!R zd8gcelv!H2K?23!d)NvtHwHPYp0b-zs0SAT6HskTl`yIB={?)~rlSUkILZ*%|6ifMEuW5yP^?@|VK=1Pw{?A#eWE=v1b zP6cQ|v#z$aX^n4Dd-RJ6MdBg0gjAu5THKIWEc-C^iM~HW+Q%>KSdp{M!;r_$<-%Xc z&m<;Wvge9kw1RI|7Efg!LYh5)R!P7UA321KW&sfugnpPbw~i*epa@kys~4!ZdTbd& zuP(MZ@xJn?75u6IZ+Kjqtv+i5|5_n&K#*7dy%Vn?_c7sOM!aaQM_T*MUTUL(_R=NT zA6Rf}``g%l+~Ai0)4QLj9R}LHmtc=d-%UE0gt5JTH}&7t>2pLmpOs=H$y%B9=R?2a z3&7TI8NZhYF4{6gf#Eqai;@9K3SzvHSe|}7dB?buBi8YQINL2yd|^73#{7Pe6lKol|FpoKU#4a$!lb%sU01g_=>g^GEzEe(t*u_1gg@d z%Uo)<^sP8hgHV{+%R@=gy;(;-D>HWq?EM=yDio;8E+IMOaw0LRq@*vt3-EH)~{w*R5X7%pf~+j;RZe-MU zDKKd+NKDrd7R$JZw;{Rw)|43wvByM^08H&!el0N>AYp_tn&1bJ4DwlhQtWUwKugQ& z1BBzYlHSc&!uY4b!p&^*DOkpZ<6vlflxMjH)l$EmIiZkRdhY#A- z?yTEYnt9zWu9Y(mA0*5!A`_^hXoU*hY`i+noV_bX9!WBDW+kx%(DAucgQ+*Sff>fkQ2=aJHVHwX zfU~!<2{8zf)qcrz;J7@eQoe!g_qx|&{7n6F=S5)uX;>7t_<^V(I`|~j96h$$fAGM=UAMk6cCZDdgZF_7E5s-M*G1+k43}KsC>=%_ag}WYd1P@*4DN+ec2Hnm!4@CWQd& zyXZzA6GSK*&elOi#D%AYfbHf@q&p%t-)^EEK_KfFh|tv^=6nNk=#S>ORQS!>Aog zr}4MsUei_s!C_*4L;yhBM`Pn**YM}-#Fm8O}IWzt`LFG5u=RN3LI4hhlTz`oY`qyCC zo_?QZN4|FEfTdM7WOS@!7(r*5m6?Lx1-J)At$|d{fjLONr4lLHK*uKqobNX|Hb{e5 zg`gMj;sWmmu=j}N=hs5J1md!yvex~;hN=4La?mv;+0LVk5e=%ou$zGhZA2$*z6oE& zIcjE68RvPPN4RK4U=h_2|MxFEJC=c?cypV!(CN>p%x{N9gLV1A?flZnM|!_@Gz){W zT(FqB%KZ0DYuvgg;*$U$>a_ zRqWFby&6INLL$t3mgWq35%)ROYGRY^B~JXB{oGhtgFdWez%yxnTHJSz+6D(}OkTaz zlUfOe=!c!H|4bm%V&C2`p-BLdGg1c~5(X2$8^;4z?9>-6uiuZduOieN{Ik_VVGly* zyjOUWl)i|Mn9e?IlsU}^7Il4)=cCgO7|64d2FtT}$AmykT`8AXczks8*%w^9$uK5F z(R<8gD~xetoFbWgaNWYwL58f%0rwI?MqC*XPMNjw&0vqwN)Cz<5hSH}s&tiTDluCWg5GWRz_JiF|;~wSDW$k86ia z4vzL5mX|nC4Q=Po>XU_!A^4kK{iHS8aijCM*t+Tp&s7cRD( zmOl<|H|qf zaQLvZD8w=!pQFiC?#r$Z)dJ!cesp{eJT5rVPcdOiRrD*QF51NwY+glW6~<$j1|f+P z`zpgc&&RT`wd)(N`=^hp3pPlrBBlg~P@~pjxp>DPvb(|I5l-ji@PjdWFJI^0Q2Wpt zh&-nMa*jke@nv6S$S!*zyt2w)_vPz6>pxaAM0Rth=uxL11;_sdZ!#-R2@Xz`HoE28 z-N5+iJ{_)z@f;6(uLX{MREhk|leEOY%&20ep2DPvh=9jymvp{L3hRHks}R-zGWyHe zDdlI_7Ynu9j9!KIh>puXn=JV85A@}MEPD8kZ@Gp=VO)LDsQG5-p1azB%bW=zP)vBz zbDPBI^@s(DSf+%)E)tlC9bQ$etEg!dQTNYqs!GhtBWLv^;qvA3UssCk0fG3j*El10 zzb^L)@89yPDH-DE!$GyhRK1se>DO~~fMm*^YFff-?Fh)70h6WEm)(nS0ahL_j)p4; z&W@bu+O3igdp-|gMCpz>E0r##8qxAJ=m+>J$D!Y;xNjig z>f3#KLYqVrN+%Dc0dF*o{x0GVqM$?W0O6-Ss97I;_k?3Gb!90rz7NMz*49US{Q3^0 zOh=!d5LUX_o*mK$6gX{cvX82DgL?~p?p6HUI(|APeo!Zgb&Gw^-`~3`%!6hn!3i49 zz2n4nivpR2EK#2J!DVGzR%yF#)uKGI`|F2VkFI|#PTqb0Bp zFZ}TlXvtH%0=Pn^roO*B9j&+H+vAgd^bXpw8NB)C=jRX=XqiiF@?ge?tjFgXzGmAiWqVvAL^iyAu-`4RxSOA4oLqG4hCHrtLTsQc@mhbs22ha59&@?&g zk98i#FHPsk3j#&0K_kn0Jl=f$P zETppjV(t6#kAq+fZG!>XPqN6U#fHu^172ci^=_ML)0!ML@uEevqChNBNDSeDI9hPt zrxFzTN2}x=rUbX3tRL1buw~K}FuO3TqT1}@N*N^uS6zCC81ePg(&-CCqmwnmU0Q7H_8wH^fY#7H3`@e8Z;&=^k1ltjr@(* zto&4!2y#P0xQZ*5e9A#_e;!aq0#%ec;MuKC(MP|)7ZApyRXu8vf zdaH9KZk9JO&rPt`d6ULN7VYnf*_S1WDDYtupfQFAGXm-Dy%brAo0T817yFbqL%XZ@ zE@hJKeT*0K^c3>*pDj5j*)2bHx3osuB`xW^|wA zM^X2hp0)5KRcuoy;df{^_|2kgLy3nlv0(JWdc`zv;QX^$I6k{K@>hmg0-eG684{VE zmZLhYy`EM@9r4d^`-$pz#qtMx7Va&DR?pq)iB-5}z+lOp3{p&8JiFAUZ+{$orWBCE`LJaoy!qBWL@;{D*0NoF)-<=MG&ERv)&2p>M*-`1~LzCvYV<#Y1 zeY(N}f2qwXF%*{CO;FZif=noE$ZG&k%6lj{rjzKN(kHYkZ~C82-_vO2{w>*GO{gDz zej;5PaZxU{)4=!t(AXNpB+gH8%qX$`Lq`v;<~XQUyTGV=Ek z;cv3mJV`~fb_17`hO)o*I^=r{G^d?PXa7jIZyPPrI?DV2aVGC)cC>5%?;Tn z*5%@C!v8+_e*HgZ+(HBH%FUSy`QO@(H@o6=SdR%cAup* zo=1GjOBP|G8;cYp#nqXQ$`*9gx-Lyvep*SE=CHcEYy+I9bA%n;`Uw)MKvmtKEy ziHCcu(Qh3A93dj|u23yuP3v(qT0EgU*E`~;p~ahOe*^AG^VTu1m?0=!0Fy~-b(#{` zsh+-Q7I6#kw5O#14&-i>gF=F9<**www=Jk|=#K&>?2-)9?Jc5^tz^yz(46WQ3VMwG zEQeh|*c$+Y_!^R2%D6rew5Av>#Lh$yHs}Tmqr816t=9bD7Z}=ERH;zkWUXSPaPa{D zrb)!!iyUng<$brGa>(cJt9)USDplP*&vCqcLVGUQl6|pLUDf*}A5_Klkh$Y0SN(-1 z9eR&a;$+->qLdv25AUgL6~!iiq7NrAx?Xctty0C^&*%+e%Ee!B`1kkk8D*wb%a<`B z&1_0jgRpJcM>>c-bueS!_l2y^Gb^9EV9^xX*<0SwQ;Po8!nyj=3|pj{q|NN-Q|o2&+$K- z82H%htY^4izvkYZ>&exfRSaDyC+AT{;&@P4;jwSh$m6C3E+g<06er!xIDFAk-{zAH znNYrOyq~?waV}X^G4e_X=eam=Ux@Y4wHEG`{XD{Ac@a#htp3y6=1p?&)o4#GwR!z+ zz2w_ogF=SM`QG?2^zCk>4D#KDrsXUPNA^5qQNqk6^KtGMYS;Z(T^5gUTOtb^e}qPm z4ZHIqr=6;q7*6~n0~nG_tB5V7HS#|rvK)*ZZx={Q0-J6iVX=Z@{B7M#C#of*#>+WM z_cq}9s}c52)$@+|7vb6$@wFY-^NyY80nEz*%pOv*x)~i_by76H8+o0qD}4fR$50AM zN(T=F=^~?gs3u8NC);I>Km6cux!*4H*|bg9wpYVhY(hNx+Y8{P|E}ok88F-wm4mjt zTXDPCvYwa%}5W4nB{t5wO| z=2c;?<0B>AKTXT`A@loFGfggRi|$y)cq&$CoRv@Nvwl|~Ql-^)+}MQ7ahbXM)5do( zFOC1oP?76WD=CiW|Ms8E|BpUytvh>y%R;xgoi6+ama=%L4c^fn?*u`6IRP)OtCz2+ zf-Wn9uBuvIRfJqohA1grynGdM`LdE4jsJgRz~UTT??3!MGeGTKO8^FIe@h#@xxKHX zrx)(NtGkmV{-LLnq^l<$&Bf*Sc53x7&jTxY`7YD$Plhw*T>E7Bz-Yb`GACe(g8NQL z>ON6wb=)UIwv_B19_(!U)ONbJ5zzYz diff --git a/kallithea/public/images/mstile-70x70.png b/kallithea/public/images/mstile-70x70.png new file mode 100644 index 0000000000000000000000000000000000000000..98115fb03b07d2c1382446b9fd30a11a1b20a080 GIT binary patch literal 2742 zc${@sc{tRK7XA%`8H6#Gk!>Vvi7a81Fk=}Ekt|V`35hUKW~`GwhG8g_HA~8#eZHnF zNn`mek;+mDgC=XXGW5yyJ@>hP+~+>`k8|Ghp7Xxv{Ckqm*;yXqKgUy{u=u{d+S8E$DwVf8HI3MBx5x??e>PQ;HZ9@j&~ zKS;&ewL_Gm=kIWpF|+s|2_em|rSwq(lAm;nsav^stKEx!Z};h}6aQ$5QxD2nm*-G% znt@|Mc(2p}5LQ*tXMC6Eq{I>C4X3(37<;kd9Vc#bYO|r)(o7gei zr-$03R#&6GTtb?V0T34$BJ!VNZJ!rrsJJ+SgoKx2G$$#C?Vf)v}7uu^s4^l09PH!;;&)=f_ZzE%0l-t}9@HU>NH{AMe!`Uld6lW-~~qhPJn~7u@LSMkW3Vb9xEeOUwQ`_rhjc34$ zbgmfO@{{tQDTtlRi_VoQfcMi?(jqd&t^kj0s(hcVkV9 z;=YkXeNu)EX)!1zfIaQwMatKzDl0{nh!2ya)&22p3!eL7L8B;4=T{(m8ZjDSLzJ1* zPMZhH8id0PXhT+5n%&>I3m1QfF+3Y1I|JLD(XB-#!CRd{b5YR`FML+Wp~}?EUHr8(WW# z-%~}?{n%Qkyekx-#BE{L1MF-E<$Puyg>Pi`>8u&8lXM9!|IzJR5>%V5D zcAd*)``4VWjTI{nEIx5Y2b!{`rTw@}qE%XRcRdwwanZ;O6_(SRmpQf`86wt!Yj>Nr zBn~t`a!r^wQ%U{`2fa7}>VcWuZdo^I%<6u2PT80y9}{QZafv8;4g2AfsyGU&D-Ru( z0;REmH>QS(s<=-M>WeI!v$3%0VI6;OdO#aN#Ts+Hb)n}xzz6Hdb>;q%NRp&>-R8X8 z?mF5lMdbH%$opCB8l3~#HD-Wa$^3I_xG0C?;hTc(@D6WqsJi;yI^7GUuFE*Fm~=Mq zg?f{dH?pNb?J8ux-QIE|Pcc!cj(I}Gm}ROTI|S6MNYaN@+u7M78POYw9v276UbWGh5FNN5Ops`ZhR;azm(v{LgV41ShM4fHfYKHX&A-mS z)e6|qFkjKIUxI8?wV56JpJQuA$sul!C*5}vaRG@Etqi!WW7&Nuy3; zETu22Dxh#>Q~K_#htsZp$>%b`K;7THgx@d|e<6rv^o$nKp`S1>k&>fNuuTnp?eqaZ|?w~sGu@@;Z`~c018&j+ZHouRhXrG zHj&<`+9HvCPC-0?opZyw5L&FmS5YtNr8SZ|b?BUD$%AL_=+}n-y>&EvTmYFpP?lqn ze|%C(Gs}B9z-FGa30c> z22KsMrz#UWm^G3UTY(k6n*@Wt* zTi=wOco37gLEbWH(x&$0mgT(@sPTSUxe`58$mgSGqTNsPPH+pjfb1%%xyQTzNmcIM zbA@YCmwDbzOKKIhJSl1Gt1gAqo4uYDa^DSEYD>#EfR-H-zwB=C(V5JrcRFp>2(}P% zGJD|{Q1A*BkYw~h_-YQALwnG3x|Ysy?sBXBdf{>tU2ZLW)S7!w_$ADN%%^*%jKE)% zaa?oL&FqGG3|AKuY{-9&h%V%QtERSt!**&nK;6G&#!pPUy$;6L zk?vJV)8wtD1eD^cuIp1&1gnR3&eV|@lE`ezQBa@m)7821M4V3cFOI2!`u!Q}+G0$9 z*GIRE1zz2=SWn+tLO0lyfUFY ztT<4OkTh;3hwI?;QVKVB4Zq?Y?u)|T@I3%PTkE90hL(}@smNrUD z%Vl})*nb(Whg=EpBmIAaa)U?qfx#ux$u->3I|3PcBg8Kt$QKz-3iU+>gofh*fLJiQ zAqXKjtE%?d_YYv_9RY4dffINExFXypQ;Zvq#E^AgU*T44azgfxzwc!ZFlCs0{bZ|R a>l47DBrJTxOz-}|2>@$uhp9F5ivJfILE|U@ diff --git a/kallithea/public/images/safari-pinned-tab.svg b/kallithea/public/images/safari-pinned-tab.svg new file mode 100644 --- /dev/null +++ b/kallithea/public/images/safari-pinned-tab.svg @@ -0,0 +1,44 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + + diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js --- a/kallithea/public/js/base.js +++ b/kallithea/public/js/base.js @@ -335,12 +335,6 @@ var pyroutes = (function() { })(); -/** - * GLOBAL YUI Shortcuts - */ -var YUD = YAHOO.util.Dom; -var YUE = YAHOO.util.Event; - /* Invoke all functions in callbacks */ var _run_callbacks = function(callbacks){ if (callbacks !== undefined){ @@ -395,21 +389,22 @@ function asynchtml(url, $target, success .fail(function(jqXHR, textStatus, errorThrown) { if (textStatus == "abort") return; - $target.html('ERROR: {0}'.format(textStatus)); + $target.html('ERROR: {0}'.format(textStatus)); $target.css('opacity','1.0'); }) ; }; -var ajaxGET = function(url,success) { +var ajaxGET = function(url, success, failure) { + if(failure === undefined) { + failure = function(jqXHR, textStatus, errorThrown) { + if (textStatus != "abort") + alert("Ajax GET error: " + textStatus); + }; + } return $.ajax({url: url, headers: {'X-PARTIAL-XHR': '1'}, cache: false}) .done(success) - .fail(function(jqXHR, textStatus, errorThrown) { - if (textStatus == "abort") - return; - alert("Ajax GET error: " + textStatus); - }) - ; + .fail(failure); }; var ajaxPOST = function(url, postData, success, failure) { @@ -440,25 +435,6 @@ var show_more_event = function(){ }); }; -/** - * activate .lazy-cs mouseover for showing changeset tooltip - */ -var show_changeset_tooltip = function(){ - $('.lazy-cs').mouseover(function(e){ - var $target = $(e.currentTarget); - var rid = $target.attr('raw_id'); - var repo_name = $target.attr('repo_name'); - if(rid && !$target.hasClass('tooltip')){ - _show_tooltip(e, _TM['loading ...']); - var url = pyroutes.url('changeset_info', {"repo_name": repo_name, "revision": rid}); - ajaxGET(url, function(json){ - $target.addClass('tooltip'); - _show_tooltip(e, json['message']); - _activate_tooltip($target); - }); - } - }); -}; var _onSuccessFollow = function(target){ var $target = $(target); @@ -480,8 +456,8 @@ var _onSuccessFollow = function(target){ } } -var toggleFollowingRepo = function(target, follows_repo_id){ - var args = 'follows_repo_id=' + follows_repo_id; +var toggleFollowingRepo = function(target, follows_repository_id){ + var args = 'follows_repository_id=' + follows_repository_id; args += '&_authentication_token=' + _authentication_token; $.post(TOGGLE_FOLLOW_URL, args, function(data){ _onSuccessFollow(target); @@ -504,76 +480,57 @@ var showRepoSize = function(target, repo }; /** - * tooltips + * load tooltips dynamically based on data attributes, used for .lazy-cs changeset links */ - -var tooltip_activate = function(){ - $(document).ready(_init_tooltip); -}; - -var _activate_tooltip = function($tt){ - $tt.mouseover(_show_tooltip); - $tt.mousemove(_move_tooltip); - $tt.mouseout(_close_tooltip); -}; +var get_changeset_tooltip = function() { + var $target = $(this); + var tooltip = $target.data('tooltip'); + if (!tooltip) { + var raw_id = $target.data('raw_id'); + var repo_name = $target.data('repo_name'); + var url = pyroutes.url('changeset_info', {"repo_name": repo_name, "revision": raw_id}); -var _init_tooltip = function(){ - var $tipBox = $('#tip-box'); - if(!$tipBox.length){ - $tipBox = $('
    '); - $(document.body).append($tipBox); + $.ajax(url, { + async: false, + success: function(data) { + tooltip = data["message"]; + } + }); + $target.data('tooltip', tooltip); } - - $tipBox.hide(); - $tipBox.css('position', 'absolute'); - $tipBox.css('max-width', '600px'); - - _activate_tooltip($('.tooltip')); + return tooltip; }; -var _show_tooltip = function(e, tipText, safe){ - e.stopImmediatePropagation(); - var el = e.currentTarget; - var $el = $(el); - if(tipText){ - // just use it - } else if(el.tagName.toLowerCase() === 'img'){ - tipText = el.alt ? el.alt : ''; - } else { - tipText = el.title ? el.title : ''; - safe = safe || $el.hasClass("safe-html-title"); +/** + * activate tooltips and popups + */ +var tooltip_activate = function(){ + function placement(p, e){ + if(e.getBoundingClientRect().top > 2*$(window).height()/3){ + return 'top'; + }else{ + return 'bottom'; + } } - - if(tipText !== ''){ - // save org title - $el.attr('tt_title', tipText); - // reset title to not show org tooltips - $el.prop('title', ''); - - var $tipBox = $('#tip-box'); - if (safe) { - $tipBox.html(tipText); - } else { - $tipBox.text(tipText); - } - $tipBox.css('display', 'block'); - } + $(document).ready(function(){ + $('[data-toggle="tooltip"]').tooltip({ + container: 'body', + placement: placement + }); + $('[data-toggle="popover"]').popover({ + html: true, + container: 'body', + placement: placement, + trigger: 'hover', + template: '' + }); + $('.lazy-cs').tooltip({ + title: get_changeset_tooltip, + placement: placement + }); + }); }; -var _move_tooltip = function(e){ - e.stopImmediatePropagation(); - var $tipBox = $('#tip-box'); - $tipBox.css('top', (e.pageY + 15) + 'px'); - $tipBox.css('left', (e.pageX + 15) + 'px'); -}; - -var _close_tooltip = function(e){ - e.stopImmediatePropagation(); - var $tipBox = $('#tip-box'); - $tipBox.hide(); - var el = e.currentTarget; - $(el).prop('title', $(el).attr('tt_title')); -}; /** * Quick filter widget @@ -645,9 +602,13 @@ function move_comments($anchorcomments) var line_no = $anchorcomment.data('line_no'); if ($comment_div[0]) { $comment_div.append($anchorcomment.children()); - _comment_div_append_add($comment_div, f_path, line_no); + if (f_path && line_no) { + _comment_div_append_add($comment_div, f_path, line_no); + } else { + _comment_div_append_form($comment_div, f_path, line_no); + } } else { - $anchorcomment.before("Comment to {0} line {1} which is outside the diff context:".format(f_path || '?', line_no || '?')); + $anchorcomment.before("Comment to {0} line {1} which is outside the diff context:".format(f_path || '?', line_no || '?')); } }); linkInlineComments($('.firstlink'), $('.comment:first-child')); @@ -658,7 +619,7 @@ function show_comment_form($bubble) { var children = $bubble.closest('tr.line').children('[id]'); var line_td_id = children[children.length - 1].id; var $comment_div = _get_add_comment_div(line_td_id); - var f_path = $bubble.closest('div.full_f_path').data('f_path'); + var f_path = $bubble.closest('[data-f_path]').data('f_path'); var parts = line_td_id.split('_'); var line_no = parts[parts.length-1]; comment_div_state($comment_div, f_path, line_no, true); @@ -676,28 +637,29 @@ function _get_add_comment_div(target_id) return $comments_box; } -// set $comment_div state - showing or not showing form and Add button -function comment_div_state($comment_div, f_path, line_no, show_form) { +// Set $comment_div state - showing or not showing form and Add button. +// An Add button is shown on non-empty forms when no form is shown. +// The form is controlled by show_form_opt - if undefined, form is only shown for general comments. +function comment_div_state($comment_div, f_path, line_no, show_form_opt) { + var show_form = show_form_opt !== undefined ? show_form_opt : !f_path && !line_no; var $forms = $comment_div.children('.comment-inline-form'); var $buttonrow = $comment_div.children('.add-button-row'); - var $comments = $comment_div.children('.comment'); + var $comments = $comment_div.children('.comment:not(.submitting)'); + $forms.remove(); + $buttonrow.remove(); if (show_form) { - if (!$forms.length) { - _comment_div_append_form($comment_div, f_path, line_no); - } + _comment_div_append_form($comment_div, f_path, line_no); + } else if ($comments.length) { + _comment_div_append_add($comment_div, f_path, line_no); } else { - $forms.remove(); - } - $buttonrow.remove(); - if ($comments.length && !show_form) { - _comment_div_append_add($comment_div, f_path, line_no); + $comment_div.parent('tr').remove(); } } // append an Add button to $comment_div and hook it up to show form function _comment_div_append_add($comment_div, f_path, line_no) { var addlabel = TRANSLATION_MAP['Add Another Comment']; - var $add = $('
    {0}
    '.format(addlabel)); + var $add = $('
    {0}
    '.format(addlabel)); $comment_div.append($add); $add.children('.add-button').click(function(e) { comment_div_state($comment_div, f_path, line_no, true); @@ -706,78 +668,124 @@ function _comment_div_append_add($commen // append a comment form to $comment_div function _comment_div_append_form($comment_div, f_path, line_no) { - var $form_div = $($('#comment-inline-form-template').html().format(f_path, line_no)) + var $form_div = $('#comment-inline-form-template').children() + .clone() .addClass('comment-inline-form'); $comment_div.append($form_div); + var $preview = $comment_div.find("div.comment-preview"); var $form = $comment_div.find("form"); + var $textarea = $form.find('textarea'); $form.submit(function(e) { e.preventDefault(); - var text = $('#text_'+line_no).val(); - if (!text){ - return; + var text = $textarea.val(); + var review_status = $form.find('input:radio[name=changeset_status]:checked').val(); + var pr_close = $form.find('input:checkbox[name=save_close]:checked').length ? 'on' : ''; + var pr_delete = $form.find('input:checkbox[name=save_delete]:checked').length ? 'delete' : ''; + + if (!text && !review_status && !pr_close && !pr_delete) { + alert("Please provide a comment"); + return false; } - $form.find('.submitting-overlay').show(); + if (pr_delete) { + if (text || review_status || pr_close) { + alert('Cannot delete pull request while making other changes'); + return false; + } + if (!confirm('Confirm to delete this pull request')) { + return false; + } + var comments = $('.comment').size(); + if (comments > 0 && + !confirm('Confirm again to delete this pull request with {0} comments'.format(comments))) { + return false; + } + } - var success = function(json_data) { - $comment_div.append(json_data['rendered_text']); - comment_div_state($comment_div, f_path, line_no, false); - linkInlineComments($('.firstlink'), $('.comment:first-child')); - }; + if (review_status) { + var $review_status = $preview.find('.automatic-comment'); + var review_status_lbl = $("#comment-inline-form-template input.status_change_radio[value='" + review_status + "']").parent().text().strip(); + $review_status.find('.comment-status-label').text(review_status_lbl); + $review_status.show(); + } + $preview.find('.comment-text div').text(text); + $preview.show(); + $textarea.val(''); + if (f_path && line_no) { + $form.hide(); + } + var postData = { 'text': text, 'f_path': f_path, - 'line': line_no + 'line': line_no, + 'changeset_status': review_status, + 'save_close': pr_close, + 'save_delete': pr_delete + }; + var success = function(json_data) { + if (pr_delete) { + location = json_data['location']; + } else { + $comment_div.append(json_data['rendered_text']); + comment_div_state($comment_div, f_path, line_no); + linkInlineComments($('.firstlink'), $('.comment:first-child')); + if ((review_status || pr_close) && !f_path && !line_no) { + // Page changed a lot - reload it after closing the submitted form + comment_div_state($comment_div, f_path, line_no, false); + location.reload(true); + } + } }; - ajaxPOST(AJAX_COMMENT_URL, postData, success); + var failure = function(x, s, e) { + $preview.removeClass('submitting').addClass('failed'); + var $status = $preview.find('.comment-submission-status'); + $('', { + 'title': e, + text: _TM['Unable to post'] + }).replaceAll($status.contents()); + $('
    ', { + 'class': 'btn-group' + }).append( + $('